From be9d99e354b54ecf50578478203a86efa5442789 Mon Sep 17 00:00:00 2001 From: David Monahan Date: Fri, 29 Apr 2022 16:25:24 +0100 Subject: IVGCVSW-6838 Disable Import/Export by default in the Android-NN-Driver Signed-off-by: David Monahan Change-Id: If873ed691e1878e8b0c1dc52717b4418a178c72f --- ArmnnPreparedModel.hpp | 4 ++-- ArmnnPreparedModel_1_2.hpp | 8 ++++---- ArmnnPreparedModel_1_3.hpp | 8 ++++---- DriverOptions.cpp | 16 ++++++++-------- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/ArmnnPreparedModel.hpp b/ArmnnPreparedModel.hpp index 505538aa..b9d89d4b 100644 --- a/ArmnnPreparedModel.hpp +++ b/ArmnnPreparedModel.hpp @@ -42,8 +42,8 @@ public: const bool gpuProfilingEnabled, const bool asyncModelExecutionEnabled = false, const unsigned int numberOfThreads = 1, - const bool importEnabled = true, - const bool exportEnabled = true); + const bool importEnabled = false, + const bool exportEnabled = false); virtual ~ArmnnPreparedModel(); diff --git a/ArmnnPreparedModel_1_2.hpp b/ArmnnPreparedModel_1_2.hpp index 8f35d7b3..57deb98c 100644 --- a/ArmnnPreparedModel_1_2.hpp +++ b/ArmnnPreparedModel_1_2.hpp @@ -48,8 +48,8 @@ public: const bool gpuProfilingEnabled, const bool asyncModelExecutionEnabled = false, const unsigned int numberOfThreads = 1, - const bool importEnabled = true, - const bool exportEnabled = true); + const bool importEnabled = false, + const bool exportEnabled = false); ArmnnPreparedModel_1_2(armnn::NetworkId networkId, armnn::IRuntime* runtime, @@ -57,8 +57,8 @@ public: const bool gpuProfilingEnabled, const bool asyncModelExecutionEnabled = false, const unsigned int numberOfThreads = 1, - const bool importEnabled = true, - const bool exportEnabled = true, + const bool importEnabled = false, + const bool exportEnabled = false, const bool preparedFromCache = false); virtual ~ArmnnPreparedModel_1_2(); diff --git a/ArmnnPreparedModel_1_3.hpp b/ArmnnPreparedModel_1_3.hpp index 42d7dab8..6c1c5c26 100644 --- a/ArmnnPreparedModel_1_3.hpp +++ b/ArmnnPreparedModel_1_3.hpp @@ -56,8 +56,8 @@ public: V1_3::Priority priority = V1_3::Priority::MEDIUM, const bool asyncModelExecutionEnabled = false, const unsigned int numberOfThreads = 1, - const bool importEnabled = true, - const bool exportEnabled = true); + const bool importEnabled = false, + const bool exportEnabled = false); ArmnnPreparedModel_1_3(armnn::NetworkId networkId, armnn::IRuntime* runtime, @@ -66,8 +66,8 @@ public: V1_3::Priority priority = V1_3::Priority::MEDIUM, const bool asyncModelExecutionEnabled = false, const unsigned int numberOfThreads = 1, - const bool importEnabled = true, - const bool exportEnabled = true, + const bool importEnabled = false, + const bool exportEnabled = false, const bool preparedFromCache = false); virtual ~ArmnnPreparedModel_1_3(); diff --git a/DriverOptions.cpp b/DriverOptions.cpp index 9cfbabf9..42d932c1 100644 --- a/DriverOptions.cpp +++ b/DriverOptions.cpp @@ -40,8 +40,8 @@ DriverOptions::DriverOptions(armnn::Compute computeDevice, bool fp16Enabled) , m_NumberOfThreads(0) , m_EnableAsyncModelExecution(false) , m_ArmnnNumberOfThreads(1) - , m_EnableImport(true) - , m_EnableExport(true) + , m_EnableImport(false) + , m_EnableExport(false) { } @@ -58,8 +58,8 @@ DriverOptions::DriverOptions(const std::vector& backends, bool , m_NumberOfThreads(0) , m_EnableAsyncModelExecution(false) , m_ArmnnNumberOfThreads(1) - , m_EnableImport(true) - , m_EnableExport(true) + , m_EnableImport(false) + , m_EnableExport(false) { } @@ -75,8 +75,8 @@ DriverOptions::DriverOptions(int argc, char** argv) , m_NumberOfThreads(0) , m_EnableAsyncModelExecution(false) , m_ArmnnNumberOfThreads(1) - , m_EnableImport(true) - , m_EnableExport(true) + , m_EnableImport(false) + , m_EnableExport(false) { std::string unsupportedOperationsAsString; std::string clTunedParametersModeAsString; @@ -177,10 +177,10 @@ DriverOptions::DriverOptions(int argc, char** argv) cxxopts::value(m_ArmnnNumberOfThreads)->default_value("1")) ("I,enableImport", "Enable Importing of input buffers", - cxxopts::value(m_EnableImport)->default_value("true")) + cxxopts::value(m_EnableImport)->default_value("false")) ("E,enableExport", "Enable Exporting of output buffers", - cxxopts::value(m_EnableExport)->default_value("true")); + cxxopts::value(m_EnableExport)->default_value("false")); } catch (const std::exception& e) { -- cgit v1.2.1