commit d1a947fd487eb7674271f759e43507d10e932ab0
author Narumol Prangnawarat <narumol.prangnawarat@arm.com> Mon Feb 07 13:12:24 2022 +0000
committer David Monahan <david.monahan@arm.com> Wed Feb 16 14:42:00 2022 +0000
tree 17ad41e29935a657c5025485173b4ded85c4a47c
parent 29520c4c785fff938586ec231cbf5e51dadbf614

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 <David.Monahan@arm.com>

DriverOptions.cpp

diff --git a/DriverOptions.cpp b/DriverOptions.cpp
index 8fd5c47..0018d97 100644
--- a/DriverOptions.cpp
+++ b/DriverOptions.cpp
@@ -40,6 +40,8 @@
     , m_NumberOfThreads(0)
     , m_EnableAsyncModelExecution(false)
     , m_ArmnnNumberOfThreads(1)
+    , m_EnableImport(false)
+    , m_EnableExport(true)
 {
 }
 
@@ -56,6 +58,8 @@
     , m_NumberOfThreads(0)
     , m_EnableAsyncModelExecution(false)
     , m_ArmnnNumberOfThreads(1)
+    , m_EnableImport(false)
+    , m_EnableExport(true)
 {
 }
 
@@ -71,6 +75,8 @@
     , 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 @@
          "Assign the number of threads used by ArmNN. "
          "Input value must be at least 1. "
          "Default is set to 1.",
-         cxxopts::value<unsigned int>(m_ArmnnNumberOfThreads)->default_value("1"));
+         cxxopts::value<unsigned int>(m_ArmnnNumberOfThreads)->default_value("1"))
+
+        ("I,enableImport", "Enable Importing of input buffers",
+         cxxopts::value<bool>(m_EnableImport)->default_value("false"))
+
+        ("E,enableExport", "Enable Exporting of output buffers",
+         cxxopts::value<bool>(m_EnableExport)->default_value("true"));
     }
     catch (const std::exception& e)
     {