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 /include/armnnUtils/TensorUtils.hpp | |
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 'include/armnnUtils/TensorUtils.hpp')
-rw-r--r-- | include/armnnUtils/TensorUtils.hpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/armnnUtils/TensorUtils.hpp b/include/armnnUtils/TensorUtils.hpp index 6a975255c6..fc2f51061c 100644 --- a/include/armnnUtils/TensorUtils.hpp +++ b/include/armnnUtils/TensorUtils.hpp @@ -34,6 +34,8 @@ std::pair<float, float> FindMinMax(armnn::ITensorHandle* tensorHandle); armnn::TensorShape ExpandDims(const armnn::TensorShape& tensorShape, int axis); +std::vector<unsigned int> SqueezeDims(const armnn::TensorShape& tensorShape); + unsigned int GetNumElementsBetween(const armnn::TensorShape& shape, unsigned int firstAxisInclusive, unsigned int lastAxisExclusive); |