diff options
| author | Mike Kelly <mike.kelly@arm.com> | 2022-05-16 23:10:42 +0100 |
|---|---|---|
| committer | Ryan OShea <ryan.oshea3@arm.com> | 2022-05-19 11:06:34 +0100 |
| commit | 21fe06fad6760a0d453f2de9c8dd790983ae940c (patch) | |
| tree | bad2f314defadd4b340343d99b6e157b46622039 /delegate/src/DelegateOptions.cpp | |
| parent | b5e03cc39cdabc49bf117c119073f60e9d36a474 (diff) | |
| download | armnn-21fe06fad6760a0d453f2de9c8dd790983ae940c.tar.gz | |
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 <mike.kelly@arm.com>
Change-Id: Ibe7c5ae6597796fc9164cb07bd372bd7f8f8cacf
Diffstat (limited to 'delegate/src/DelegateOptions.cpp')
| -rw-r--r-- | delegate/src/DelegateOptions.cpp | 18 |
1 files changed, 18 insertions, 0 deletions
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 @@ -156,6 +156,24 @@ DelegateOptions::DelegateOptions(char const* const* options_keys, { 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")) { |