From d1a947fd487eb7674271f759e43507d10e932ab0 Mon Sep 17 00:00:00 2001 From: Narumol Prangnawarat Date: Mon, 7 Feb 2022 13:12:24 +0000 Subject: Revert "Revert "IVGCVSW-6700 Enable import aligned host memory in android-nn-driver"" 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 --- ArmnnPreparedModel_1_3.hpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'ArmnnPreparedModel_1_3.hpp') diff --git a/ArmnnPreparedModel_1_3.hpp b/ArmnnPreparedModel_1_3.hpp index cd5fc0ed..cb3c7684 100644 --- a/ArmnnPreparedModel_1_3.hpp +++ b/ArmnnPreparedModel_1_3.hpp @@ -55,7 +55,9 @@ public: const bool gpuProfilingEnabled, V1_3::Priority priority = V1_3::Priority::MEDIUM, const bool asyncModelExecutionEnabled = false, - const unsigned int numberOfThreads = 1); + const unsigned int numberOfThreads = 1, + const bool importEnabled = false, + const bool exportEnabled = true); ArmnnPreparedModel_1_3(armnn::NetworkId networkId, armnn::IRuntime* runtime, @@ -64,6 +66,8 @@ public: V1_3::Priority priority = V1_3::Priority::MEDIUM, const bool asyncModelExecutionEnabled = false, const unsigned int numberOfThreads = 1, + const bool importEnabled = false, + const bool exportEnabled = true, const bool preparedFromCache = false); virtual ~ArmnnPreparedModel_1_3(); @@ -201,6 +205,8 @@ private: static std::unique_ptr m_Threadpool; std::shared_ptr m_WorkingMemHandle; const bool m_AsyncModelExecutionEnabled; + const bool m_EnableImport; + const bool m_EnableExport; const bool m_PreparedFromCache; }; -- cgit v1.2.1