diff options
| author | Mike Kelly <mike.kelly@arm.com> | 2022-05-16 23:10:42 +0100 |
|---|---|---|
| committer | TeresaARM <teresa.charlinreyes@arm.com> | 2022-05-18 14:19:19 +0000 |
| commit | 80512b0e1e98cb6782f5526fc8308ae6a571cd59 (patch) | |
| tree | bad2f314defadd4b340343d99b6e157b46622039 /src/armnn/layers | |
| parent | d0420cb62b71f9c015d2b0e889011899051e56c0 (diff) | |
| download | armnn-80512b0e1e98cb6782f5526fc8308ae6a571cd59.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 'src/armnn/layers')
| -rw-r--r-- | src/armnn/layers/LayerCloneBase.hpp | 1 | ||||
| -rw-r--r-- | src/armnn/layers/LayerWithParameters.hpp | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/armnn/layers/LayerCloneBase.hpp b/src/armnn/layers/LayerCloneBase.hpp index 348b1f3bf6..54b64c5852 100644 --- a/src/armnn/layers/LayerCloneBase.hpp +++ b/src/armnn/layers/LayerCloneBase.hpp @@ -19,6 +19,7 @@ LayerType* Layer::CloneBase(Graph& graph, Params&& ... params) const layer->SetBackendId(GetBackendId()); layer->SetGuid(GetGuid()); layer->SetShapeInferenceMethod(m_ShapeInferenceMethod); + layer->SetAllowExpandedDims(m_AllowExpandedDims); return layer; } diff --git a/src/armnn/layers/LayerWithParameters.hpp b/src/armnn/layers/LayerWithParameters.hpp index 2ac16c5f5f..8d9ddffc24 100644 --- a/src/armnn/layers/LayerWithParameters.hpp +++ b/src/armnn/layers/LayerWithParameters.hpp @@ -43,6 +43,7 @@ protected: WorkloadInfo PrepInfoAndDesc(QueueDescriptor& descriptor) const { descriptor.m_Parameters = m_Param; + descriptor.m_AllowExpandedDims = GetAllowExpandedDims(); return Layer::PrepInfoAndDesc(descriptor); } |