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 --- src/armnn/Layer.hpp | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'src/armnn/Layer.hpp') diff --git a/src/armnn/Layer.hpp b/src/armnn/Layer.hpp index 114d69c652..767cf97eb3 100644 --- a/src/armnn/Layer.hpp +++ b/src/armnn/Layer.hpp @@ -238,6 +238,7 @@ public: } ShapeInferenceMethod GetShapeInferenceMethod() const { return m_ShapeInferenceMethod; }; + bool GetAllowExpandedDims() const { return m_AllowExpandedDims; }; const std::vector& GetInputSlots() const { return m_InputSlots; } const std::vector& GetOutputSlots() const { return m_OutputSlots; } @@ -343,6 +344,11 @@ public: m_ShapeInferenceMethod = shapeInferenceMethod; } + void SetAllowExpandedDims(bool allowExpandedDims) + { + m_AllowExpandedDims = allowExpandedDims; + } + template std::shared_ptr GetAdditionalInformation() const { @@ -428,6 +434,8 @@ private: mutable LayerPriority m_Priority = 0; mutable bool m_Visiting = false; + bool m_AllowExpandedDims = false; + LayerGuid m_Guid; std::list m_RelatedLayerNames; -- cgit v1.2.1