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 --- DriverOptions.cpp | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'DriverOptions.cpp') diff --git a/DriverOptions.cpp b/DriverOptions.cpp index 8fd5c477..0018d975 100644 --- a/DriverOptions.cpp +++ b/DriverOptions.cpp @@ -40,6 +40,8 @@ DriverOptions::DriverOptions(armnn::Compute computeDevice, bool fp16Enabled) , m_NumberOfThreads(0) , m_EnableAsyncModelExecution(false) , m_ArmnnNumberOfThreads(1) + , m_EnableImport(false) + , m_EnableExport(true) { } @@ -56,6 +58,8 @@ DriverOptions::DriverOptions(const std::vector& backends, bool , m_NumberOfThreads(0) , m_EnableAsyncModelExecution(false) , m_ArmnnNumberOfThreads(1) + , m_EnableImport(false) + , m_EnableExport(true) { } @@ -71,6 +75,8 @@ DriverOptions::DriverOptions(int argc, char** argv) , m_NumberOfThreads(0) , m_EnableAsyncModelExecution(false) , m_ArmnnNumberOfThreads(1) + , m_EnableImport(false) + , m_EnableExport(true) { std::string unsupportedOperationsAsString; std::string clTunedParametersModeAsString; @@ -168,7 +174,13 @@ DriverOptions::DriverOptions(int argc, char** argv) "Assign the number of threads used by ArmNN. " "Input value must be at least 1. " "Default is set to 1.", - cxxopts::value(m_ArmnnNumberOfThreads)->default_value("1")); + cxxopts::value(m_ArmnnNumberOfThreads)->default_value("1")) + + ("I,enableImport", "Enable Importing of input buffers", + cxxopts::value(m_EnableImport)->default_value("false")) + + ("E,enableExport", "Enable Exporting of output buffers", + cxxopts::value(m_EnableExport)->default_value("true")); } catch (const std::exception& e) { -- cgit v1.2.1