From c17a35f4b016c223add511a148ed3bb741770593 Mon Sep 17 00:00:00 2001 From: Teresa Charlin Date: Thu, 12 Jan 2023 14:13:09 +0000 Subject: IVGCVSW-5128 Add EndToEnd test for REDUCE_SUM * Call Reshape EndToEnd test from 3 backends * Tidy up some naming of tests. Signed-off-by: Teresa Charlin Change-Id: I5546af35e89d352d3f1529368518aecc0a4a534b --- src/backends/backendsCommon/test/CMakeLists.txt | 3 +- .../backendsCommon/test/ReduceEndToEndTestImpl.hpp | 70 ++++++++++++++++++++++ src/backends/cl/test/ClEndToEndTests.cpp | 28 ++++++++- src/backends/neon/test/NeonEndToEndTests.cpp | 44 ++++++++++---- src/backends/reference/test/RefEndToEndTests.cpp | 26 +++++++- 5 files changed, 158 insertions(+), 13 deletions(-) create mode 100644 src/backends/backendsCommon/test/ReduceEndToEndTestImpl.hpp diff --git a/src/backends/backendsCommon/test/CMakeLists.txt b/src/backends/backendsCommon/test/CMakeLists.txt index d251bd2597..509157a378 100644 --- a/src/backends/backendsCommon/test/CMakeLists.txt +++ b/src/backends/backendsCommon/test/CMakeLists.txt @@ -1,5 +1,5 @@ # -# Copyright © 2017-2022 Arm Ltd and Contributors. All rights reserved. +# Copyright © 2017-2023 Arm Ltd and Contributors. All rights reserved. # SPDX-License-Identifier: MIT # @@ -50,6 +50,7 @@ list(APPEND armnnBackendsCommonUnitTests_sources QuantizedLstmEndToEndTestImpl.cpp QuantizedLstmEndToEndTestImpl.hpp RankEndToEndTestImpl.hpp + ReduceEndToEndTestImpl.hpp ReshapeEndToEndTestImpl.hpp ResizeEndToEndTestImpl.hpp RuntimeTestImpl.hpp diff --git a/src/backends/backendsCommon/test/ReduceEndToEndTestImpl.hpp b/src/backends/backendsCommon/test/ReduceEndToEndTestImpl.hpp new file mode 100644 index 0000000000..83c59f594f --- /dev/null +++ b/src/backends/backendsCommon/test/ReduceEndToEndTestImpl.hpp @@ -0,0 +1,70 @@ +// +// Copyright © 2023 Arm Ltd and Contributors. All rights reserved. +// SPDX-License-Identifier: MIT +// +#pragma once + +#include + +#include +#include + +#include + +namespace +{ + +template +armnn::INetworkPtr CreateReduceNetwork(const armnn::TensorShape& inputShape, + const armnn::TensorShape& outputShape, + const armnn::ReduceDescriptor& descriptor, + const float qScale = 1.0f, + const int32_t qOffset = 0) +{ + using namespace armnn; + + INetworkPtr network(INetwork::Create()); + + TensorInfo inputTensorInfo(inputShape, DataType, qScale, qOffset, true); + TensorInfo outputTensorInfo(outputShape, DataType, qScale, qOffset); + + + IConnectableLayer* reduce = network->AddReduceLayer(descriptor, "reduce"); + IConnectableLayer* input = network->AddInputLayer(0, "input"); + IConnectableLayer* output = network->AddOutputLayer(0, "output"); + + Connect(input, reduce, inputTensorInfo, 0, 0); + Connect(reduce, output, outputTensorInfo, 0, 0); + + return network; +} + +template> +void ReduceEndToEnd(const std::vector& backends) +{ + using namespace armnn; + + const TensorShape& inputShape = { 1, 1, 1, 5 }; + const TensorShape& outputShape = { 1, 1, 1 }; + + ReduceDescriptor descriptor; + descriptor.m_KeepDims = false; + descriptor.m_vAxis = { 3 }; + descriptor.m_ReduceOperation = ReduceOperation::Sum; + + INetworkPtr network = CreateReduceNetwork(inputShape, outputShape, descriptor); + + CHECK(network); + + std::vector floatInputData({ 5.0f, 2.0f, 8.0f, 10.0f, 9.0f }); + std::vector floatOutputData({ 34.0f }); + + std::vector inputData = armnnUtils::QuantizedVector(floatInputData); + std::vector outputData = armnnUtils::QuantizedVector(floatOutputData); + + std::map> inputTensorData = { { 0, inputData } }; + std::map> expectedOutputData = { { 0, outputData } }; + + EndToEndLayerTestImpl(std::move(network), inputTensorData, expectedOutputData, backends); +} +} // anonymous namespace diff --git a/src/backends/cl/test/ClEndToEndTests.cpp b/src/backends/cl/test/ClEndToEndTests.cpp index b354481967..d5ac8b11bc 100644 --- a/src/backends/cl/test/ClEndToEndTests.cpp +++ b/src/backends/cl/test/ClEndToEndTests.cpp @@ -1,5 +1,5 @@ // -// Copyright © 2017,2022 Arm Ltd. All rights reserved. +// Copyright © 2017-2023 Arm Ltd. All rights reserved. // SPDX-License-Identifier: MIT // @@ -18,6 +18,8 @@ #include #include #include +#include +#include #include #include #include @@ -271,6 +273,29 @@ TEST_CASE("ClPreluEndToEndTestUint8") PreluEndToEndPositiveTest(clDefaultBackends); } +// Reduce +TEST_CASE("ClReduceEndToEndTest") +{ + ReduceEndToEnd(clDefaultBackends); +} + +TEST_CASE("ClReduceEndToEndTestFloat16") +{ + ReduceEndToEnd(clDefaultBackends); +} + +// Reshape +TEST_CASE("ClReshapeEndToEndTest") +{ + ReshapeEndToEnd(clDefaultBackends); +} + +TEST_CASE("ClReshapeEndToEndTestFloat16") +{ + ReshapeEndToEndFloat16(clDefaultBackends); +} + +// Space to depth TEST_CASE("ClSpaceToDepthNhwcEndToEndTest1") { SpaceToDepthNhwcEndToEndTest1(clDefaultBackends); @@ -291,6 +316,7 @@ TEST_CASE("ClSpaceToDepthNchwEndToEndTest2") SpaceToDepthNchwEndToEndTest2(clDefaultBackends); } +// Split TEST_CASE("ClSplitter1dEndToEndTest") { Splitter1dEndToEnd(clDefaultBackends); diff --git a/src/backends/neon/test/NeonEndToEndTests.cpp b/src/backends/neon/test/NeonEndToEndTests.cpp index a64e42688e..d74c50109a 100644 --- a/src/backends/neon/test/NeonEndToEndTests.cpp +++ b/src/backends/neon/test/NeonEndToEndTests.cpp @@ -1,5 +1,5 @@ // -// Copyright © 2017,2022 Arm Ltd and Contributors. All rights reserved. +// Copyright © 2017-2023 Arm Ltd and Contributors. All rights reserved. // SPDX-License-Identifier: MIT // @@ -20,6 +20,8 @@ #include #include #include +#include +#include #include #include #include @@ -177,42 +179,42 @@ TEST_CASE("NeonConcatEndToEndDim3Uint8Test") } // DepthToSpace -TEST_CASE("DephtToSpaceEndToEndNchwFloat32") +TEST_CASE("NeonDephtToSpaceEndToEndNchwFloat32") { DepthToSpaceEndToEnd(neonDefaultBackends, armnn::DataLayout::NCHW); } -TEST_CASE("DephtToSpaceEndToEndNchwFloat16") +TEST_CASE("NeonDephtToSpaceEndToEndNchwFloat16") { DepthToSpaceEndToEnd(neonDefaultBackends, armnn::DataLayout::NCHW); } -TEST_CASE("DephtToSpaceEndToEndNchwUint8") +TEST_CASE("NeonDephtToSpaceEndToEndNchwUint8") { DepthToSpaceEndToEnd(neonDefaultBackends, armnn::DataLayout::NCHW); } -TEST_CASE("DephtToSpaceEndToEndNchwInt16") +TEST_CASE("NeonDephtToSpaceEndToEndNchwInt16") { DepthToSpaceEndToEnd(neonDefaultBackends, armnn::DataLayout::NCHW); } -TEST_CASE("DephtToSpaceEndToEndNhwcFloat32") +TEST_CASE("NeonDephtToSpaceEndToEndNhwcFloat32") { DepthToSpaceEndToEnd(neonDefaultBackends, armnn::DataLayout::NHWC); } -TEST_CASE("DephtToSpaceEndToEndNhwcFloat16") +TEST_CASE("NeonDephtToSpaceEndToEndNhwcFloat16") { DepthToSpaceEndToEnd(neonDefaultBackends, armnn::DataLayout::NHWC); } -TEST_CASE("DephtToSpaceEndToEndNhwcUint8") +TEST_CASE("NeonDephtToSpaceEndToEndNhwcUint8") { DepthToSpaceEndToEnd(neonDefaultBackends, armnn::DataLayout::NHWC); } -TEST_CASE("DephtToSpaceEndToEndNhwcInt16") +TEST_CASE("NeonDephtToSpaceEndToEndNhwcInt16") { DepthToSpaceEndToEnd(neonDefaultBackends, armnn::DataLayout::NHWC); } @@ -476,7 +478,7 @@ TEST_CASE("NeonFillEndToEndTest") FillEndToEnd(neonDefaultBackends); } -TEST_CASE("RefFillEndToEndTestFloat16") +TEST_CASE("NeonFillEndToEndTestFloat16") { FillEndToEnd(neonDefaultBackends); } @@ -587,6 +589,28 @@ TEST_CASE("NeonArgMinAxis3TestQuantisedAsymm8") ArgMinAxis3EndToEnd(neonDefaultBackends); } +// Reduce +TEST_CASE("NeonReduceEndToEndTest") +{ + ReduceEndToEnd(neonDefaultBackends); +} + +TEST_CASE("NeonReduceEndToEndTestFloat16") +{ + ReduceEndToEnd(neonDefaultBackends); +} + +// Reshape +TEST_CASE("NeonReshapeEndToEndTest") +{ + ReshapeEndToEnd(neonDefaultBackends); +} + +TEST_CASE("NeonReshapeEndToEndTestFloat16") +{ + ReshapeEndToEndFloat16(neonDefaultBackends); +} + TEST_CASE("NeonStridedSliceInvalidSliceEndToEndTest") { StridedSliceInvalidSliceEndToEndTest(neonDefaultBackends); diff --git a/src/backends/reference/test/RefEndToEndTests.cpp b/src/backends/reference/test/RefEndToEndTests.cpp index 017330ed53..8fcb3d19bc 100644 --- a/src/backends/reference/test/RefEndToEndTests.cpp +++ b/src/backends/reference/test/RefEndToEndTests.cpp @@ -1,5 +1,5 @@ // -// Copyright © 2017,2022 Arm Ltd and Contributors. All rights reserved. +// Copyright © 2017-2023 Arm Ltd and Contributors. All rights reserved. // SPDX-License-Identifier: MIT // @@ -28,6 +28,8 @@ #include #include #include +#include +#include #include #include #include @@ -1440,6 +1442,28 @@ TEST_CASE("RefRankEndToEndTestQSymmS8") RankEndToEnd(defaultBackends); } +// Reduce +TEST_CASE("RefReduceEndToEndTest") +{ + ReduceEndToEnd(defaultBackends); +} + +TEST_CASE("RefReduceEndToEndTestFloat16") +{ + ReduceEndToEnd(defaultBackends); +} + +// Reshape +TEST_CASE("RefReshapeEndToEndTest") +{ + ReshapeEndToEnd(defaultBackends); +} + +TEST_CASE("RefReshapeEndToEndTestFloat16") +{ + ReshapeEndToEndFloat16(defaultBackends); +} + TEST_CASE("RefForceImportWithAlignedBuffersEndToEndTest") { ForceImportWithAlignedBuffersEndToEndTest(defaultBackends); -- cgit v1.2.1