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>

1.2/ArmnnDriverImpl.cpp

diff --git a/1.2/ArmnnDriverImpl.cpp b/1.2/ArmnnDriverImpl.cpp
index 3274a8a..1c31384 100644
--- a/1.2/ArmnnDriverImpl.cpp
+++ b/1.2/ArmnnDriverImpl.cpp
@@ -267,7 +267,9 @@
                     options.GetRequestInputsAndOutputsDumpDir(),
                     options.IsGpuProfilingEnabled(),
                     options.isAsyncModelExecutionEnabled(),
-                    options.getNoOfArmnnThreads()));
+                    options.getNoOfArmnnThreads(),
+                    options.isImportEnabled(),
+                    options.isExportEnabled()));
 
     // Run a single 'dummy' inference of the model. This means that CL kernels will get compiled (and tuned if
     // this is enabled) before the first 'real' inference which removes the overhead of the first inference.
@@ -630,6 +632,8 @@
                     options.IsGpuProfilingEnabled(),
                     options.isAsyncModelExecutionEnabled(),
                     options.getNoOfArmnnThreads(),
+                    options.isImportEnabled(),
+                    options.isExportEnabled(),
                     true));
 
     NotifyCallbackAndCheck(cb, V1_0::ErrorStatus::NONE, preparedModel.release());