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/test/TensorUtilsTest.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/test/TensorUtilsTest.cpp')
-rw-r--r-- | src/armnnUtils/test/TensorUtilsTest.cpp | 58 |
1 files changed, 57 insertions, 1 deletions
diff --git a/src/armnnUtils/test/TensorUtilsTest.cpp b/src/armnnUtils/test/TensorUtilsTest.cpp index 16349c554e..a69a0098ce 100644 --- a/src/armnnUtils/test/TensorUtilsTest.cpp +++ b/src/armnnUtils/test/TensorUtilsTest.cpp @@ -1,5 +1,5 @@ // -// Copyright © 2019,2021-2022 Arm Ltd and Contributors. All rights reserved. +// Copyright © 2019,2021-2023 Arm Ltd and Contributors. All rights reserved. // SPDX-License-Identifier: MIT // @@ -126,6 +126,62 @@ TEST_CASE("ExpandDimsInvalidAxisTest") CHECK_THROWS_AS(ExpandDims(inputShape, 4), armnn::InvalidArgumentException); } +TEST_CASE("ReduceDimsShapeAll1s") +{ + armnn::TensorShape inputShape({ 1, 1, 1 }); + + // Invalid expand dimension 4 + armnn::TensorShape outputShape = ReduceDims(inputShape, 2); + CHECK(outputShape.GetNumDimensions() == 2); + CHECK(outputShape[0] == 1); + CHECK(outputShape[1] == 1); +} + +TEST_CASE("ReduceDimsShapeNotEnough1s") +{ + armnn::TensorShape inputShape({ 1, 2, 1 }); + + // Invalid expand dimension 4 + armnn::TensorShape outputShape = ReduceDims(inputShape, 1); + CHECK(outputShape.GetNumDimensions() == 2); + CHECK(outputShape[0] == 2); + CHECK(outputShape[1] == 1); +} + +TEST_CASE("ReduceDimsInfoAll1s") +{ + armnn::TensorInfo inputInfo({ 1, 1, 1 }, DataType::Float32); + + // Invalid expand dimension 4 + armnn::TensorInfo outputInfo = ReduceDims(inputInfo, 2); + CHECK(outputInfo.GetShape().GetNumDimensions() == 2); + CHECK(outputInfo.GetShape()[0] == 1); + CHECK(outputInfo.GetShape()[1] == 1); +} + +TEST_CASE("ReduceDimsInfoNotEnough1s") +{ + armnn::TensorInfo inputInfo({ 1, 2, 1 }, DataType::Float32); + + // Invalid expand dimension 4 + armnn::TensorInfo outputInfo = ReduceDims(inputInfo, 1); + CHECK(outputInfo.GetNumDimensions() == 2); + CHECK(outputInfo.GetShape()[0] == 2); + CHECK(outputInfo.GetShape()[1] == 1); +} + +TEST_CASE("ReduceDimsShapeDimensionGreaterThanSize") +{ + armnn::TensorShape inputShape({ 1, 1, 1 }); + + // Invalid expand dimension 4 + armnn::TensorShape outputShape = ReduceDims(inputShape, 4); + CHECK(outputShape.GetNumDimensions() == 3); + CHECK(outputShape[0] == 1); + CHECK(outputShape[1] == 1); + CHECK(outputShape[2] == 1); +} + TEST_CASE("ExpandDimsInvalidNegativeAxisTest") { armnn::TensorShape inputShape({ 2, 3, 4 }); |