commit 74a3cf5755b801cf258177e8e55b4cda64a0c351
author Narumol Prangnawarat <narumol.prangnawarat@arm.com> Fri Jan 29 15:38:54 2021 +0000
committer Narumol Prangnawarat <narumol.prangnawarat@arm.com> Tue Feb 02 13:53:38 2021 +0000
tree 01246003e2b336e75095d148000370a17e790511
parent bd4fcc30a3732ce63e100d556ee5c9ea9e556c05

IVGCVSW-5619 Enable OptimizerOptions for the python external delegate

 * Add reduce-fp32-to-fp16, reduce-fp32-to-bf16, debug-data, memory-import
options to external delegate
 * Simplify DelegateOptions
 * Add test mock models
 * Unit tests
 * Configure lfs to manage tflite files

Signed-off-by: Narumol Prangnawarat <narumol.prangnawarat@arm.com>
Change-Id: I1e4db468862ba03d4cb031347bc307cf940b3cb1

delegate/include/DelegateOptions.hpp

diff --git a/delegate/include/DelegateOptions.hpp b/delegate/include/DelegateOptions.hpp
index 82de076..ace0859 100644
--- a/delegate/include/DelegateOptions.hpp
+++ b/delegate/include/DelegateOptions.hpp
@@ -29,13 +29,11 @@
 
     DelegateOptions(armnn::Compute computeDevice,
                     const armnn::OptimizerOptions& optimizerOptions,
-                    const armnn::INetworkProperties& networkProperties = armnn::INetworkProperties(),
                     const armnn::Optional<armnn::LogSeverity>& logSeverityLevel = armnn::EmptyOptional(),
                     const armnn::Optional<armnn::DebugCallbackFunction>& func = armnn::EmptyOptional());
 
     DelegateOptions(const std::vector<armnn::BackendId>& backends,
                     const armnn::OptimizerOptions& optimizerOptions,
-                    const armnn::INetworkProperties& networkProperties = armnn::INetworkProperties(),
                     const armnn::Optional<armnn::LogSeverity>& logSeverityLevel = armnn::EmptyOptional(),
                     const armnn::Optional<armnn::DebugCallbackFunction>& func = armnn::EmptyOptional());
 
@@ -59,11 +57,11 @@
 
     const armnn::OptimizerOptions& GetOptimizerOptions() const { return m_OptimizerOptions; }
 
+    void SetOptimizerOptions(const armnn::OptimizerOptions& optimizerOptions) { m_OptimizerOptions = optimizerOptions; }
+
     const armnn::Optional<armnn::DebugCallbackFunction>& GetDebugCallbackFunction() const
         { return m_DebugCallbackFunc; }
 
-    const armnn::INetworkProperties& GetNetworkProperties() const { return m_NetworkProperties; };
-
 private:
     /// Which backend to run Delegate on.
     /// Examples of possible values are: CpuRef, CpuAcc, GpuAcc.
@@ -96,17 +94,12 @@
     /// bool m_Debug;
     /// Reduce Fp32 data to Bf16 for faster processing
     /// bool m_ReduceFp32ToBf16;
-    /// Infer output size when not available
-    /// ShapeInferenceMethod m_shapeInferenceMethod;
     /// Enable Import
     /// bool m_ImportEnabled;
     /// Enable Model Options
     /// ModelOptions m_ModelOptions;
     armnn::OptimizerOptions m_OptimizerOptions;
 
-    /// Network properties to enable memory import
-    armnn::INetworkProperties m_NetworkProperties;
-
     /// Severity level for logging within ArmNN that will be used on creation of the delegate
     armnn::Optional<armnn::LogSeverity> m_LoggingSeverity;