From 80512b0e1e98cb6782f5526fc8308ae6a571cd59 Mon Sep 17 00:00:00 2001 From: Mike Kelly Date: Mon, 16 May 2022 23:10:42 +0100 Subject: IVGCVSW-6929 Support for models with implicit expanded dimensions * Added allow-expanded-dims to TFLite parser and ArmNN delegate * If true ArmNN will disregard dimensions with a size of 1 when validating tensor shapes. Tensor sizes must still match. * This allows us to support models where tensors have expanded dimensions (i.e. extra dimensions with a size of 1). * Fixed bug in Network where it assumed that only the first option could be ShapeInferenceMethod. * Fixed bug where m_ShapeInferenceMethod was lost when copying or moving Graphs. * Changed Delegate to pass "infer-output-shape", "allow-expanded-dims" and other BackendOptions through to the Network during construction. Signed-off-by: Mike Kelly Change-Id: Ibe7c5ae6597796fc9164cb07bd372bd7f8f8cacf --- delegate/src/DelegateOptions.cpp | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'delegate/src/DelegateOptions.cpp') diff --git a/delegate/src/DelegateOptions.cpp b/delegate/src/DelegateOptions.cpp index 9413a4689a..f3e13c90c6 100644 --- a/delegate/src/DelegateOptions.cpp +++ b/delegate/src/DelegateOptions.cpp @@ -155,6 +155,24 @@ DelegateOptions::DelegateOptions(char const* const* options_keys, else if (std::string(options_keys[i]) == std::string("debug-data")) { optimizerOptions.m_Debug = armnn::stringUtils::StringToBool(options_values[i]); + } + // Infer output-shape + else if (std::string(options_keys[i]) == std::string("infer-output-shape")) + { + armnn::BackendOptions backendOption("ShapeInferenceMethod", + { + { "InferAndValidate", armnn::stringUtils::StringToBool(options_values[i]) } + }); + optimizerOptions.m_ModelOptions.push_back(backendOption); + } + // Allow expanded dims + else if (std::string(options_keys[i]) == std::string("allow-expanded-dims")) + { + armnn::BackendOptions backendOption("AllowExpandedDims", + { + { "AllowExpandedDims", armnn::stringUtils::StringToBool(options_values[i]) } + }); + optimizerOptions.m_ModelOptions.push_back(backendOption); } // Process memory-import else if (std::string(options_keys[i]) == std::string("memory-import")) -- cgit v1.2.1