diff options
| author | Teresa Charlin <teresa.charlinreyes@arm.com> | 2023-10-19 19:13:29 +0100 |
|---|---|---|
| committer | TeresaARM <teresa.charlinreyes@arm.com> | 2023-10-25 12:02:06 +0000 |
| commit | 3e4b60897bde2ad7ab5b730c7c5d727e41cc0eef (patch) | |
| tree | 20fe9535bc7ad775f7a42f3324c86e7671fd3a48 /delegate/opaque/src/test/DelegateTestInterpreter.cpp | |
| parent | c9c28351e6742732a6e8ad268ac93c36b94a8ee0 (diff) | |
| download | armnn-3e4b60897bde2ad7ab5b730c7c5d727e41cc0eef.tar.gz | |
IVGCVSW-7722 Add ArmNNSettings to Opaque Delegate
* Fix order for reading options to read backend first independently of the order given
Signed-off-by: Teresa Charlin <teresa.charlinreyes@arm.com>
Change-Id: Ia87b5920c7cd79b3e66bb6e5779e2355b21a7ec6
Diffstat (limited to 'delegate/opaque/src/test/DelegateTestInterpreter.cpp')
| -rw-r--r-- | delegate/opaque/src/test/DelegateTestInterpreter.cpp | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/delegate/opaque/src/test/DelegateTestInterpreter.cpp b/delegate/opaque/src/test/DelegateTestInterpreter.cpp index 04e6ad6208..c46d3e166a 100644 --- a/delegate/opaque/src/test/DelegateTestInterpreter.cpp +++ b/delegate/opaque/src/test/DelegateTestInterpreter.cpp @@ -7,7 +7,6 @@ #include <armnn_delegate.hpp> -#include <armnn/utility/IgnoreUnused.hpp> namespace delegateTestInterpreter { @@ -17,9 +16,6 @@ DelegateTestInterpreter::DelegateTestInterpreter(std::vector<char>& modelBuffer, const std::string& customOp, bool disableFallback) { - armnn::IgnoreUnused(backends); - armnn::IgnoreUnused(disableFallback); - TfLiteModel* tfLiteModel = delegateTestInterpreter::CreateTfLiteModel(modelBuffer); TfLiteInterpreterOptions* options = delegateTestInterpreter::CreateTfLiteInterpreterOptions(); @@ -28,8 +24,11 @@ DelegateTestInterpreter::DelegateTestInterpreter(std::vector<char>& modelBuffer, options->mutable_op_resolver = delegateTestInterpreter::GenerateCustomOpResolver(customOp); } - // Use default settings until options have been enabled. - auto armnnDelegate = armnnOpaqueDelegate::TfLiteArmnnOpaqueDelegateCreate(nullptr); + // Disable fallback by default for unit tests unless specified. + armnnDelegate::DelegateOptions delegateOptions(backends); + delegateOptions.DisableTfLiteRuntimeFallback(disableFallback); + + auto armnnDelegate = armnnOpaqueDelegate::TfLiteArmnnOpaqueDelegateCreate(delegateOptions); TfLiteInterpreterOptionsAddDelegate(options, armnnDelegate); m_TfLiteDelegate = armnnDelegate; @@ -44,8 +43,6 @@ DelegateTestInterpreter::DelegateTestInterpreter(std::vector<char>& modelBuffer, const armnnDelegate::DelegateOptions& delegateOptions, const std::string& customOp) { - armnn::IgnoreUnused(delegateOptions); - TfLiteModel* tfLiteModel = delegateTestInterpreter::CreateTfLiteModel(modelBuffer); TfLiteInterpreterOptions* options = delegateTestInterpreter::CreateTfLiteInterpreterOptions(); @@ -54,8 +51,7 @@ DelegateTestInterpreter::DelegateTestInterpreter(std::vector<char>& modelBuffer, options->mutable_op_resolver = delegateTestInterpreter::GenerateCustomOpResolver(customOp); } - // Use default settings until options have been enabled. - auto armnnDelegate = armnnOpaqueDelegate::TfLiteArmnnOpaqueDelegateCreate(nullptr); + auto armnnDelegate = armnnOpaqueDelegate::TfLiteArmnnOpaqueDelegateCreate(delegateOptions); TfLiteInterpreterOptionsAddDelegate(options, armnnDelegate); m_TfLiteDelegate = armnnDelegate; |