Revert "Revert "IVGCVSW-6700 Enable import aligned host memory in android-nn-driver""v22.02branches/android-nn-driver_22_02

This reverts commit 8069603dc44b7673b356f66517cd8b25af8080f0.

 * Reason for revert: Try reenable import aligned host memory in android-nn-driver
 * Added a check to ArmNNDriverImpl.cpp to not call ExecuteWithDummyInputs with GpuAcc
 * Added new android-nn-driver driver options to enable / disable Import and Export
 * Import is disabled by default for now due to conv2d issues
 * Export is enabled by default

!armnn:7147

Change-Id: I91110c58ebb3931d1c458e3774944e55c1250dd8
Signed-off-by: David Monahan <David.Monahan@arm.com>

1 files changed, 5 insertions, 1 deletions

diff --git a/ArmnnPreparedModel.hpp b/ArmnnPreparedModel.hpp
index 685d950e..0d19c077 100644
--- a/ArmnnPreparedModel.hpp
+++ b/ArmnnPreparedModel.hpp
@@ -41,7 +41,9 @@ public:
                        const std::string& requestInputsAndOutputsDumpDir,
                        const bool gpuProfilingEnabled,
                        const bool asyncModelExecutionEnabled = false,
-                       const unsigned int numberOfThreads = 1);
+                       const unsigned int numberOfThreads = 1,
+                       const bool importEnabled = false,
+                       const bool exportEnabled = true);
 
     virtual ~ArmnnPreparedModel();
 
@@ -111,6 +113,8 @@ private:
     static std::unique_ptr<armnn::Threadpool> m_Threadpool;
     std::shared_ptr<armnn::IWorkingMemHandle> m_WorkingMemHandle;
     const bool m_AsyncModelExecutionEnabled;
+    const bool m_EnableImport;
+    const bool m_EnableExport;
 };
 
 }