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/armnnUtils/TensorUtils.cpp | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'src/armnnUtils') diff --git a/src/armnnUtils/TensorUtils.cpp b/src/armnnUtils/TensorUtils.cpp index 5b5b2bd6e6..d77f5d74c3 100644 --- a/src/armnnUtils/TensorUtils.cpp +++ b/src/armnnUtils/TensorUtils.cpp @@ -131,6 +131,22 @@ TensorShape ExpandDims(const TensorShape& tensorShape, int axis) return TensorShape(outputDim, outputShape.data()); } +std::vector SqueezeDims(const TensorShape& tensorShape) +{ + unsigned int outputDimSize = 0; + std::vector squeezedDims; + + for (unsigned int i = 0; i < tensorShape.GetNumDimensions(); ++i) + { + if (tensorShape[i] != 1) + { + squeezedDims.push_back(tensorShape[i]); + ++outputDimSize; + } + } + return squeezedDims; +} + unsigned int GetNumElementsBetween(const TensorShape& shape, const unsigned int firstAxisInclusive, const unsigned int lastAxisExclusive) -- cgit v1.2.1