diff options
author | Mike Kelly <mike.kelly@arm.com> | 2023-01-23 19:32:06 +0000 |
---|---|---|
committer | TeresaARM <teresa.charlinreyes@arm.com> | 2023-01-24 17:01:30 +0000 |
commit | 0e3fe10bfe1b4f006f6e0c5c2fae8fb5515c7544 (patch) | |
tree | 222ff6eb1c034efa05bc5dcf4b255f80993987bf /src/armnnUtils/TensorUtils.cpp | |
parent | d134c13ec9a0585bb7656654e0e65c57958d8833 (diff) | |
download | armnn-0e3fe10bfe1b4f006f6e0c5c2fae8fb5515c7544.tar.gz |
IVGCVSW-7455 Workaround to allow CLBatchMatMul to parse some 4D models
* Added ability to reduce dimension sizes when calling BuildArmComputeTensorInfo or
BuildArmComputeTensorShapes, this will attempt to remove leading 1s in order to
squeeze the number of dimensions but retain the size.
* Changed ClBatchMatMulWorkload to attempt to squeeze the number of dimensions to 3
as the CL Gemm Kernel can only support up to 3 dimensions.
Signed-off-by: Mike Kelly <mike.kelly@arm.com>
Change-Id: I6b3d0886c5b97fdb686838fc3dc292833ddc4643
Diffstat (limited to 'src/armnnUtils/TensorUtils.cpp')
-rw-r--r-- | src/armnnUtils/TensorUtils.cpp | 36 |
1 files changed, 35 insertions, 1 deletions
diff --git a/src/armnnUtils/TensorUtils.cpp b/src/armnnUtils/TensorUtils.cpp index 9e3d719211..03109e0cee 100644 --- a/src/armnnUtils/TensorUtils.cpp +++ b/src/armnnUtils/TensorUtils.cpp @@ -1,5 +1,5 @@ // -// Copyright © 2017 Arm Ltd. All rights reserved. +// Copyright © 2017-2023 Arm Ltd. All rights reserved. // SPDX-License-Identifier: MIT // @@ -103,6 +103,40 @@ std::pair<float, float> FindMinMax(ITensorHandle* tensorHandle) return std::make_pair(min, max); } +TensorShape ReduceDims(const TensorShape& tensorShape, unsigned int dimensions) +{ + if (tensorShape.GetNumDimensions() <= dimensions) + { + return tensorShape; + } + std::vector<unsigned int> newShape; + + unsigned int dimsToSkip = tensorShape.GetNumDimensions() - dimensions; + unsigned int dimsSkipped = 0; + bool insertRemainder = false; + + for (unsigned int i = 0; i < tensorShape.GetNumDimensions(); ++i) + { + if (tensorShape[i] == 1 && dimsSkipped < dimsToSkip && !insertRemainder) + { + ++dimsSkipped; + continue; + } + newShape.push_back(tensorShape[i]); + // Once we insert the first dimension we can't skip any more + insertRemainder = true; + } + return TensorShape(static_cast<unsigned int>(newShape.size()), newShape.data()); +} + +TensorInfo ReduceDims(const TensorInfo& tensorInfo, unsigned int dimensions) +{ + TensorInfo strippedTensor(tensorInfo); + TensorShape strippedShape = ReduceDims(tensorInfo.GetShape(), dimensions); + strippedTensor.SetShape(strippedShape); + return strippedTensor; +} + TensorShape ExpandDims(const TensorShape& tensorShape, int axis) { unsigned int outputDim = tensorShape.GetNumDimensions() + 1; |