diff options
author | narpra01 <narumol.prangnawarat@arm.com> | 2019-01-23 15:23:11 +0000 |
---|---|---|
committer | Narumol Prangnawarat <narumol.prangnawarat@arm.com> | 2019-01-23 17:13:15 +0000 |
commit | db2b160bf9e7759d0157dfa57ee940290f5170e3 (patch) | |
tree | 536fa36ebc9eb8442b96b486a10cadab28d32647 /src/backends/backendsCommon | |
parent | c625f000198218fc8d03130ee5658f73b94b2683 (diff) | |
download | armnn-db2b160bf9e7759d0157dfa57ee940290f5170e3.tar.gz |
IVGCVSW-2511 Add end to end Gather layer test
* Add end to end test for Gather operator
* Add Support for int32 to Constant layer for Ref
* Add Int32Workload
* Add RefConstantWorkload as template for float, uint8, int32
* Remove unused RefBaseConstantWorkload
* Remove unused RefConstantFloat32Workload
* Remove unused RefConstantUint8Workload
* Add support check for int32 in LayerSupport functions
Change-Id: Ic970588a49ebe2aafb12be8adef52371feacaa7b
Diffstat (limited to 'src/backends/backendsCommon')
-rw-r--r-- | src/backends/backendsCommon/MakeWorkloadHelper.hpp | 9 | ||||
-rw-r--r-- | src/backends/backendsCommon/Workload.hpp | 3 | ||||
-rw-r--r-- | src/backends/backendsCommon/test/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/backends/backendsCommon/test/GatherEndToEndTestImpl.hpp | 124 |
4 files changed, 134 insertions, 4 deletions
diff --git a/src/backends/backendsCommon/MakeWorkloadHelper.hpp b/src/backends/backendsCommon/MakeWorkloadHelper.hpp index 78a9669530..7784cc6d4d 100644 --- a/src/backends/backendsCommon/MakeWorkloadHelper.hpp +++ b/src/backends/backendsCommon/MakeWorkloadHelper.hpp @@ -37,8 +37,8 @@ struct MakeWorkloadForType<NullWorkload> // Makes a workload for one the specified types based on the data type requirements of the tensorinfo. // Specify type void as the WorkloadType for unsupported DataType/WorkloadType combos. -template <typename Float16Workload, typename Float32Workload, typename Uint8Workload, typename QueueDescriptorType, - typename... Args> +template <typename Float16Workload, typename Float32Workload, typename Uint8Workload, typename Int32Workload, + typename QueueDescriptorType, typename... Args> std::unique_ptr<IWorkload> MakeWorkloadHelper(const QueueDescriptorType& descriptor, const WorkloadInfo& info, Args&&... args) @@ -58,6 +58,8 @@ std::unique_ptr<IWorkload> MakeWorkloadHelper(const QueueDescriptorType& descrip return MakeWorkloadForType<Float32Workload>::Func(descriptor, info, std::forward<Args>(args)...); case DataType::QuantisedAsymm8: return MakeWorkloadForType<Uint8Workload>::Func(descriptor, info, std::forward<Args>(args)...); + case DataType::Signed32: + return MakeWorkloadForType<Int32Workload>::Func(descriptor, info, std::forward<Args>(args)...); default: BOOST_ASSERT_MSG(false, "Unknown DataType."); return nullptr; @@ -73,10 +75,9 @@ std::unique_ptr<IWorkload> MakeWorkloadHelper(const QueueDescriptorType& descrip const WorkloadInfo& info, Args&&... args) { - return MakeWorkloadHelper<FloatWorkload, FloatWorkload, Uint8Workload>(descriptor, info, + return MakeWorkloadHelper<FloatWorkload, FloatWorkload, Uint8Workload, NullWorkload>(descriptor, info, std::forward<Args>(args)...); } - } //namespace } //namespace armnn diff --git a/src/backends/backendsCommon/Workload.hpp b/src/backends/backendsCommon/Workload.hpp index 65392194a2..34d13635ba 100644 --- a/src/backends/backendsCommon/Workload.hpp +++ b/src/backends/backendsCommon/Workload.hpp @@ -162,6 +162,9 @@ template <typename QueueDescriptor> using Uint8Workload = TypedWorkload<QueueDescriptor, armnn::DataType::QuantisedAsymm8>; template <typename QueueDescriptor> +using Int32Workload = TypedWorkload<QueueDescriptor, armnn::DataType::Signed32>; + +template <typename QueueDescriptor> using Float16ToFloat32Workload = MultiTypedWorkload<QueueDescriptor, armnn::DataType::Float16, armnn::DataType::Float32>; diff --git a/src/backends/backendsCommon/test/CMakeLists.txt b/src/backends/backendsCommon/test/CMakeLists.txt index 8107176210..80a9cfeaa9 100644 --- a/src/backends/backendsCommon/test/CMakeLists.txt +++ b/src/backends/backendsCommon/test/CMakeLists.txt @@ -16,6 +16,8 @@ list(APPEND armnnBackendsCommonUnitTests_sources DebugTestImpl.hpp EndToEndTestImpl.hpp FullyConnectedTestImpl.hpp + GatherTestImpl.hpp + GatherEndToEndTestImpl.hpp IsLayerSupportedTestImpl.hpp JsonPrinterTestImpl.cpp JsonPrinterTestImpl.hpp diff --git a/src/backends/backendsCommon/test/GatherEndToEndTestImpl.hpp b/src/backends/backendsCommon/test/GatherEndToEndTestImpl.hpp new file mode 100644 index 0000000000..d30da549df --- /dev/null +++ b/src/backends/backendsCommon/test/GatherEndToEndTestImpl.hpp @@ -0,0 +1,124 @@ +// +// Copyright © 2017 Arm Ltd. All rights reserved. +// SPDX-License-Identifier: MIT +// + +#pragma once + +#include <armnn/INetwork.hpp> +#include <backendsCommon/test/CommonTestUtils.hpp> +#include <TypeUtils.hpp> + +namespace{ + +armnn::INetworkPtr CreateGatherNetwork(const armnn::TensorInfo& paramsInfo, + const armnn::TensorInfo& indicesInfo, + const armnn::TensorInfo& outputInfo, + const std::vector<int32_t>& indicesData) +{ + armnn::INetworkPtr net(armnn::INetwork::Create()); + + armnn::IConnectableLayer* paramsLayer = net->AddInputLayer(0); + armnn::IConnectableLayer* indicesLayer = net->AddConstantLayer(armnn::ConstTensor(indicesInfo, indicesData)); + armnn::IConnectableLayer* gatherLayer = net->AddGatherLayer("gather"); + armnn::IConnectableLayer* outputLayer = net->AddOutputLayer(0, "output"); + Connect(paramsLayer, gatherLayer, paramsInfo, 0, 0); + Connect(indicesLayer, gatherLayer, indicesInfo, 0, 1); + Connect(gatherLayer, outputLayer, outputInfo, 0, 0); + + return net; +} + +template<armnn::DataType ArmnnType, typename T = armnn::ResolveType<ArmnnType>> +void GatherEndToEnd(const std::vector<BackendId>& backends) +{ + armnn::TensorInfo paramsInfo({ 8 }, ArmnnType); + armnn::TensorInfo indicesInfo({ 3 }, armnn::DataType::Signed32); + armnn::TensorInfo outputInfo({ 3 }, ArmnnType); + + paramsInfo.SetQuantizationScale(1.0f); + paramsInfo.SetQuantizationOffset(0); + outputInfo.SetQuantizationScale(1.0f); + outputInfo.SetQuantizationOffset(0); + + // Creates structures for input & output. + std::vector<T> paramsData{ + 1, 2, 3, 4, 5, 6, 7, 8 + }; + + std::vector<int32_t> indicesData{ + 7, 6, 5 + }; + + std::vector<T> expectedOutput{ + 8, 7, 6 + }; + + // Builds up the structure of the network + armnn::INetworkPtr net = CreateGatherNetwork(paramsInfo, indicesInfo, outputInfo, indicesData); + + BOOST_TEST_CHECKPOINT("create a network"); + + std::map<int, std::vector<T>> inputTensorData = {{ 0, paramsData }}; + std::map<int, std::vector<T>> expectedOutputData = {{ 0, expectedOutput }}; + + EndToEndLayerTestImpl<T>(move(net), inputTensorData, expectedOutputData, backends); +} + +template<armnn::DataType ArmnnType, typename T = armnn::ResolveType<ArmnnType>> +void GatherMultiDimEndToEnd(const std::vector<BackendId>& backends) +{ + armnn::TensorInfo paramsInfo({ 3, 2, 3}, ArmnnType); + armnn::TensorInfo indicesInfo({ 2, 3 }, armnn::DataType::Signed32); + armnn::TensorInfo outputInfo({ 2, 3, 2, 3 }, ArmnnType); + + paramsInfo.SetQuantizationScale(1.0f); + paramsInfo.SetQuantizationOffset(0); + outputInfo.SetQuantizationScale(1.0f); + outputInfo.SetQuantizationOffset(0); + + // Creates structures for input & output. + std::vector<T> paramsData{ + 1, 2, 3, + 4, 5, 6, + + 7, 8, 9, + 10, 11, 12, + + 13, 14, 15, + 16, 17, 18 + }; + + std::vector<int32_t> indicesData{ + 1, 2, 1, + 2, 1, 0 + }; + + std::vector<T> expectedOutput{ + 7, 8, 9, + 10, 11, 12, + 13, 14, 15, + 16, 17, 18, + 7, 8, 9, + 10, 11, 12, + + 13, 14, 15, + 16, 17, 18, + 7, 8, 9, + 10, 11, 12, + 1, 2, 3, + 4, 5, 6 + }; + + // Builds up the structure of the network + armnn::INetworkPtr net = CreateGatherNetwork(paramsInfo, indicesInfo, outputInfo, indicesData); + + BOOST_TEST_CHECKPOINT("create a network"); + + std::map<int, std::vector<T>> inputTensorData = {{ 0, paramsData }}; + std::map<int, std::vector<T>> expectedOutputData = {{ 0, expectedOutput }}; + + EndToEndLayerTestImpl<T>(move(net), inputTensorData, expectedOutputData, backends); +} + +} // anonymous namespace
\ No newline at end of file |