From a0675ccfabbc7d6ee829adae6e45fe096dd7862d Mon Sep 17 00:00:00 2001
From: David Monahan <David.Monahan@arm.com>
Date: Mon, 21 Feb 2022 12:35:24 +0000
Subject: IVGCVSW-6700 Enable Import by default

!armnn:7173
Signed-off-by: David Monahan <David.Monahan@arm.com>
Change-Id: I642734b414a785f831e1a825790a78ee5078950f
---
 ArmnnPreparedModel.hpp     | 2 +-
 ArmnnPreparedModel_1_2.hpp | 4 ++--
 ArmnnPreparedModel_1_3.hpp | 4 ++--
 DriverOptions.cpp          | 8 ++++----
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/ArmnnPreparedModel.hpp b/ArmnnPreparedModel.hpp
index 0d19c077..505538aa 100644
--- a/ArmnnPreparedModel.hpp
+++ b/ArmnnPreparedModel.hpp
@@ -42,7 +42,7 @@ public:
                        const bool gpuProfilingEnabled,
                        const bool asyncModelExecutionEnabled = false,
                        const unsigned int numberOfThreads = 1,
-                       const bool importEnabled = false,
+                       const bool importEnabled = true,
                        const bool exportEnabled = true);
 
     virtual ~ArmnnPreparedModel();
diff --git a/ArmnnPreparedModel_1_2.hpp b/ArmnnPreparedModel_1_2.hpp
index 6afcbbe4..8f35d7b3 100644
--- a/ArmnnPreparedModel_1_2.hpp
+++ b/ArmnnPreparedModel_1_2.hpp
@@ -48,7 +48,7 @@ public:
                            const bool gpuProfilingEnabled,
                            const bool asyncModelExecutionEnabled = false,
                            const unsigned int numberOfThreads = 1,
-                           const bool importEnabled = false,
+                           const bool importEnabled = true,
                            const bool exportEnabled = true);
 
     ArmnnPreparedModel_1_2(armnn::NetworkId networkId,
@@ -57,7 +57,7 @@ public:
                            const bool gpuProfilingEnabled,
                            const bool asyncModelExecutionEnabled = false,
                            const unsigned int numberOfThreads = 1,
-                           const bool importEnabled = false,
+                           const bool importEnabled = true,
                            const bool exportEnabled = true,
                            const bool preparedFromCache = false);
 
diff --git a/ArmnnPreparedModel_1_3.hpp b/ArmnnPreparedModel_1_3.hpp
index cb3c7684..42d7dab8 100644
--- a/ArmnnPreparedModel_1_3.hpp
+++ b/ArmnnPreparedModel_1_3.hpp
@@ -56,7 +56,7 @@ public:
                            V1_3::Priority priority = V1_3::Priority::MEDIUM,
                            const bool asyncModelExecutionEnabled = false,
                            const unsigned int numberOfThreads = 1,
-                           const bool importEnabled = false,
+                           const bool importEnabled = true,
                            const bool exportEnabled = true);
 
     ArmnnPreparedModel_1_3(armnn::NetworkId networkId,
@@ -66,7 +66,7 @@ public:
                            V1_3::Priority priority = V1_3::Priority::MEDIUM,
                            const bool asyncModelExecutionEnabled = false,
                            const unsigned int numberOfThreads = 1,
-                           const bool importEnabled = false,
+                           const bool importEnabled = true,
                            const bool exportEnabled = true,
                            const bool preparedFromCache = false);
 
diff --git a/DriverOptions.cpp b/DriverOptions.cpp
index 0018d975..9cfbabf9 100644
--- a/DriverOptions.cpp
+++ b/DriverOptions.cpp
@@ -40,7 +40,7 @@ DriverOptions::DriverOptions(armnn::Compute computeDevice, bool fp16Enabled)
     , m_NumberOfThreads(0)
     , m_EnableAsyncModelExecution(false)
     , m_ArmnnNumberOfThreads(1)
-    , m_EnableImport(false)
+    , m_EnableImport(true)
     , m_EnableExport(true)
 {
 }
@@ -58,7 +58,7 @@ DriverOptions::DriverOptions(const std::vector<armnn::BackendId>& backends, bool
     , m_NumberOfThreads(0)
     , m_EnableAsyncModelExecution(false)
     , m_ArmnnNumberOfThreads(1)
-    , m_EnableImport(false)
+    , m_EnableImport(true)
     , m_EnableExport(true)
 {
 }
@@ -75,7 +75,7 @@ DriverOptions::DriverOptions(int argc, char** argv)
     , m_NumberOfThreads(0)
     , m_EnableAsyncModelExecution(false)
     , m_ArmnnNumberOfThreads(1)
-    , m_EnableImport(false)
+    , m_EnableImport(true)
     , m_EnableExport(true)
 {
     std::string unsupportedOperationsAsString;
@@ -177,7 +177,7 @@ DriverOptions::DriverOptions(int argc, char** argv)
          cxxopts::value<unsigned int>(m_ArmnnNumberOfThreads)->default_value("1"))
 
         ("I,enableImport", "Enable Importing of input buffers",
-         cxxopts::value<bool>(m_EnableImport)->default_value("false"))
+         cxxopts::value<bool>(m_EnableImport)->default_value("true"))
 
         ("E,enableExport", "Enable Exporting of output buffers",
          cxxopts::value<bool>(m_EnableExport)->default_value("true"));
-- 
cgit v1.2.1