diff options
-rw-r--r-- | src/backends/backendsCommon/test/BatchMatMulEndToEndTestImpl.hpp | 84 | ||||
-rw-r--r-- | src/backends/neon/test/NeonEndToEndTests.cpp | 8 | ||||
-rw-r--r-- | src/backends/reference/test/RefEndToEndTests.cpp | 6 |
3 files changed, 97 insertions, 1 deletions
diff --git a/src/backends/backendsCommon/test/BatchMatMulEndToEndTestImpl.hpp b/src/backends/backendsCommon/test/BatchMatMulEndToEndTestImpl.hpp new file mode 100644 index 0000000000..905a56d53a --- /dev/null +++ b/src/backends/backendsCommon/test/BatchMatMulEndToEndTestImpl.hpp @@ -0,0 +1,84 @@ +// +// Copyright © 2022 Arm Ltd and Contributors. All rights reserved. +// SPDX-License-Identifier: MIT +// +#pragma once + +#include <ResolveType.hpp> + +#include <armnn/INetwork.hpp> + +#include <doctest/doctest.h> +#include <CommonTestUtils.hpp> + +namespace +{ + +template<typename armnn::DataType DataType> +armnn::INetworkPtr CreateBatchMatMulNetwork(const armnn::TensorShape& inputXShape, + const armnn::TensorShape& inputYShape, + const armnn::TensorShape& outputShape, + const float qScale = 1.0f, + const int32_t qOffset = 0) +{ + using namespace armnn; + + INetworkPtr network(INetwork::Create()); + + TensorInfo inputXTensorInfo(inputXShape, DataType, qScale, qOffset, true); + TensorInfo inputYTensorInfo(inputYShape, DataType, qScale, qOffset, true); + + TensorInfo outputTensorInfo(outputShape, DataType, qScale, qOffset); + + BatchMatMulDescriptor batchMatMulDesc; + batchMatMulDesc.m_TransposeX = false; + batchMatMulDesc.m_TransposeY = true; + + IConnectableLayer* batchMatMul = network->AddBatchMatMulLayer(batchMatMulDesc, "batchMatMul"); + IConnectableLayer* inputX = network->AddInputLayer(0, "inputX"); + IConnectableLayer* inputY = network->AddInputLayer(1, "inputY"); + IConnectableLayer* output = network->AddOutputLayer(0, "output"); + + Connect(inputX, batchMatMul, inputXTensorInfo, 0, 0); + Connect(inputY, batchMatMul, inputYTensorInfo, 0, 1); + Connect(batchMatMul, output, outputTensorInfo, 0, 0); + + return network; +} + +template<armnn::DataType ArmnnType, typename T = armnn::ResolveType<ArmnnType>> +void BatchMatMulEndToEnd(const std::vector<armnn::BackendId>& backends) +{ + using namespace armnn; + + const TensorShape& inputXShape = { 2, 2, 2 }; + const TensorShape& inputYShape = { 2, 2, 2 }; + const TensorShape& outputShape = { 2, 2, 2 }; + + INetworkPtr network = CreateBatchMatMulNetwork<ArmnnType>(inputXShape, inputYShape, outputShape); + + CHECK(network); + + std::vector<T> inputXData{ 1, 2, + 3, 4, + + 9, 10, + 11, 12 }; + std::vector<T> inputYData{ 5, 7, + 6, 8, + + 13, 15, + 14, 16 }; + std::vector<T> expectedOutput{ 19, 22, + 43, 50, + + 267, 286, + 323, 346 }; + + std::map<int, std::vector<T>> inputTensorData = {{ 0, inputXData }, {1, inputYData}}; + std::map<int, std::vector<T>> expectedOutputData = { { 0, expectedOutput } }; + + EndToEndLayerTestImpl<ArmnnType, ArmnnType>(std::move(network), inputTensorData, expectedOutputData, backends); +} + +} // anonymous namespace
\ No newline at end of file diff --git a/src/backends/neon/test/NeonEndToEndTests.cpp b/src/backends/neon/test/NeonEndToEndTests.cpp index d680e6deed..4c7608ff93 100644 --- a/src/backends/neon/test/NeonEndToEndTests.cpp +++ b/src/backends/neon/test/NeonEndToEndTests.cpp @@ -1,5 +1,5 @@ // -// Copyright © 2017 Arm Ltd. All rights reserved. +// Copyright © 2022 Arm Ltd and Contributors. All rights reserved. // SPDX-License-Identifier: MIT // @@ -7,6 +7,7 @@ #include <backendsCommon/test/ActivationEndToEndTestImpl.hpp> #include <backendsCommon/test/ArgMinMaxEndToEndTestImpl.hpp> +#include <backendsCommon/test/BatchMatMulEndToEndTestImpl.hpp> #include <backendsCommon/test/ComparisonEndToEndTestImpl.hpp> #include <backendsCommon/test/ConcatEndToEndTestImpl.hpp> #include <backendsCommon/test/DepthToSpaceEndToEndTestImpl.hpp> @@ -128,6 +129,11 @@ TEST_CASE("NeonGreaterBroadcastEndToEndUint8Test") expectedOutput); } +TEST_CASE("NeonBatchMatMulEndToEndFloat32Test") +{ + BatchMatMulEndToEnd<armnn::DataType::Float32>(neonDefaultBackends); +} + TEST_CASE("NeonConcatEndToEndDim0Test") { ConcatDim0EndToEnd<armnn::DataType::Float32>(neonDefaultBackends); diff --git a/src/backends/reference/test/RefEndToEndTests.cpp b/src/backends/reference/test/RefEndToEndTests.cpp index 2ed5ad812c..7c196ba1f2 100644 --- a/src/backends/reference/test/RefEndToEndTests.cpp +++ b/src/backends/reference/test/RefEndToEndTests.cpp @@ -8,6 +8,7 @@ #include <backendsCommon/test/ActivationEndToEndTestImpl.hpp> #include <backendsCommon/test/ArgMinMaxEndToEndTestImpl.hpp> #include <backendsCommon/test/BatchToSpaceNdEndToEndTestImpl.hpp> +#include <backendsCommon/test/BatchMatMulEndToEndTestImpl.hpp> #include <backendsCommon/test/ChannelShuffleEndToEndTestImpl.hpp> #include <backendsCommon/test/ComparisonEndToEndTestImpl.hpp> #include <backendsCommon/test/ConcatEndToEndTestImpl.hpp> @@ -466,6 +467,11 @@ TEST_CASE("RefGreaterBroadcastEndToEndUint8Test") expectedOutput); } +TEST_CASE("RefBatchMatMulEndToEndFloat32Test") +{ + BatchMatMulEndToEnd<armnn::DataType::Float32>(defaultBackends); +} + TEST_CASE("RefBatchToSpaceNdEndToEndFloat32NHWCTest") { BatchToSpaceNdEndToEnd<armnn::DataType::Float32>(defaultBackends, armnn::DataLayout::NHWC); |