diff options
author | narpra01 <narumol.prangnawarat@arm.com> | 2019-01-18 16:53:53 +0000 |
---|---|---|
committer | Narumol Prangnawarat <narumol.prangnawarat@arm.com> | 2019-01-22 17:46:51 +0000 |
commit | 4951d84b1174a4bb0a5d9c900740f64201f765bf (patch) | |
tree | fe713740ac0acbaa8d74bbc9cdb450d08ef9f575 /src/backends/backendsCommon | |
parent | 0edd46737065d3e5c09aa959807e81f9836ee709 (diff) | |
download | armnn-4951d84b1174a4bb0a5d9c900740f64201f765bf.tar.gz |
IVGCVSW-2510 Ref workload implementation for Gather operator
* add implemenentation for GatherQueueDescriptor validate function
* add FirstInputTypedWorkload to allow type check on the first input tensor only
* add ref workload implemenentation for float and uint8
* add Gather layer support in Ref
* unit tests
Change-Id: I4578a3211f11d24aa29d15bcf7f45b0445bcd1ee
Diffstat (limited to 'src/backends/backendsCommon')
-rw-r--r-- | src/backends/backendsCommon/Workload.hpp | 25 | ||||
-rw-r--r-- | src/backends/backendsCommon/WorkloadData.cpp | 15 | ||||
-rw-r--r-- | src/backends/backendsCommon/test/GatherTestImpl.hpp | 128 | ||||
-rw-r--r-- | src/backends/backendsCommon/test/LayerTests.cpp | 44 | ||||
-rw-r--r-- | src/backends/backendsCommon/test/LayerTests.hpp | 24 |
5 files changed, 236 insertions, 0 deletions
diff --git a/src/backends/backendsCommon/Workload.hpp b/src/backends/backendsCommon/Workload.hpp index 309d53f48e..65392194a2 100644 --- a/src/backends/backendsCommon/Workload.hpp +++ b/src/backends/backendsCommon/Workload.hpp @@ -116,6 +116,7 @@ public: return it.GetDataType() == InputDataType; }), "Trying to create workload with incorrect type"); + BOOST_ASSERT_MSG(std::all_of(info.m_OutputTensorInfos.begin(), info.m_OutputTensorInfos.end(), [&](auto it){ @@ -125,6 +126,30 @@ public: } }; +// FirstInputTypedWorkload used to check type of the first input +template <typename QueueDescriptor, armnn::DataType DataType> +class FirstInputTypedWorkload : public BaseWorkload<QueueDescriptor> +{ +public: + + FirstInputTypedWorkload(const QueueDescriptor& descriptor, const WorkloadInfo& info) + : BaseWorkload<QueueDescriptor>(descriptor, info) + { + if (!info.m_InputTensorInfos.empty()) + { + BOOST_ASSERT_MSG(info.m_InputTensorInfos.front().GetDataType() == DataType, + "Trying to create workload with incorrect type"); + } + + BOOST_ASSERT_MSG(std::all_of(info.m_OutputTensorInfos.begin(), + info.m_OutputTensorInfos.end(), + [&](auto it){ + return it.GetDataType() == DataType; + }), + "Trying to create workload with incorrect type"); + } +}; + template <typename QueueDescriptor> using FloatWorkload = TypedWorkload<QueueDescriptor, armnn::DataType::Float16, diff --git a/src/backends/backendsCommon/WorkloadData.cpp b/src/backends/backendsCommon/WorkloadData.cpp index 072b9a9934..05f4e317a9 100644 --- a/src/backends/backendsCommon/WorkloadData.cpp +++ b/src/backends/backendsCommon/WorkloadData.cpp @@ -1055,6 +1055,21 @@ void GatherQueueDescriptor::Validate(const WorkloadInfo& workloadInfo) const { ValidateTwoInputs(workloadInfo, "GatherQueueDescriptor"); ValidateSingleOutput(workloadInfo, "GatherQueueDescriptor"); + + const TensorInfo& indices = workloadInfo.m_InputTensorInfos[1]; + + if (indices.GetDataType() != DataType::Signed32) + { + throw InvalidArgumentException("GatherQueueDescriptor: Indices tensor type must be int32."); + } + + const TensorInfo& params = workloadInfo.m_InputTensorInfos[0]; + const TensorInfo& output = workloadInfo.m_OutputTensorInfos[0]; + unsigned int paramsDim = params.GetNumDimensions(); + unsigned int indicesDim = indices.GetNumDimensions(); + unsigned int outputDim = paramsDim - 1 + indicesDim; + + ValidateTensorNumDimensions(output, "GatherQueueDescriptor", outputDim, "output"); } void PreCompiledQueueDescriptor::Validate(const WorkloadInfo& workloadInfo) const diff --git a/src/backends/backendsCommon/test/GatherTestImpl.hpp b/src/backends/backendsCommon/test/GatherTestImpl.hpp new file mode 100644 index 0000000000..16b266ed29 --- /dev/null +++ b/src/backends/backendsCommon/test/GatherTestImpl.hpp @@ -0,0 +1,128 @@ +// +// Copyright © 2017 Arm Ltd. All rights reserved. +// SPDX-License-Identifier: MIT +// +#pragma once + +#include "WorkloadTestUtils.hpp" + +#include <armnn/Types.hpp> +#include <backendsCommon/CpuTensorHandle.hpp> +#include <backendsCommon/IBackendInternal.hpp> +#include <backendsCommon/WorkloadFactory.hpp> + +template <armnn::DataType ArmnnType, typename T = armnn::ResolveType<ArmnnType>, + unsigned int paramsDim, unsigned int indicesDim, unsigned int OutputDim> +LayerTestResult<T, OutputDim> GatherTestImpl( + armnn::IWorkloadFactory& workloadFactory, + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, + const armnn::TensorInfo& paramsInfo, + const armnn::TensorInfo& indicesInfo, + const armnn::TensorInfo& outputInfo, + const std::vector<T>& paramsData, + const std::vector<int32_t>& indicesData, + const std::vector<T>& outputData) +{ + auto params = MakeTensor<T, paramsDim>(paramsInfo, paramsData); + auto indices = MakeTensor<int32_t, indicesDim>(indicesInfo, indicesData); + + LayerTestResult<T, OutputDim> result(outputInfo); + result.outputExpected = MakeTensor<T, OutputDim>(outputInfo, outputData); + + std::unique_ptr<armnn::ITensorHandle> paramsHandle = workloadFactory.CreateTensorHandle(paramsInfo); + std::unique_ptr<armnn::ITensorHandle> indicesHandle = workloadFactory.CreateTensorHandle(indicesInfo); + std::unique_ptr<armnn::ITensorHandle> outputHandle = workloadFactory.CreateTensorHandle(outputInfo); + + armnn::GatherQueueDescriptor data; + armnn::WorkloadInfo info; + AddInputToWorkload(data, info, paramsInfo, paramsHandle.get()); + AddInputToWorkload(data, info, indicesInfo, indicesHandle.get()); + AddOutputToWorkload(data, info, outputInfo, outputHandle.get()); + + std::unique_ptr<armnn::IWorkload> workload = workloadFactory.CreateGather(data, info); + + paramsHandle->Allocate(); + indicesHandle->Allocate(); + outputHandle->Allocate(); + + CopyDataToITensorHandle(paramsHandle.get(), params.origin()); + CopyDataToITensorHandle(indicesHandle.get(), indices.origin()); + + workload->Execute(); + + CopyDataFromITensorHandle(result.output.origin(), outputHandle.get()); + + return result; +} + +template <armnn::DataType ArmnnType, typename T = armnn::ResolveType<ArmnnType>> +LayerTestResult<T, 1> Gather1DParamsTestImpl(armnn::IWorkloadFactory& workloadFactory, + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager) +{ + armnn::TensorInfo paramsInfo({ 8 }, ArmnnType); + armnn::TensorInfo indicesInfo({ 4 }, armnn::DataType::Signed32); + armnn::TensorInfo outputInfo({ 4 }, ArmnnType); + + const std::vector<T> params = std::vector<T>({ 1, 2, 3, 4, 5, 6, 7, 8 }); + const std::vector<int32_t> indices = std::vector<int32_t>({ 0, 2, 1, 5 }); + const std::vector<T> expectedOutput = std::vector<T>({ 1, 3, 2, 6 }); + + return GatherTestImpl<ArmnnType, T, 1, 1, 1>(workloadFactory, memoryManager, + paramsInfo, indicesInfo, outputInfo, + params,indices, expectedOutput); +} + +template <armnn::DataType ArmnnType, typename T = armnn::ResolveType<ArmnnType>> +LayerTestResult<T, 2> GatherMultiDimParamsTestImpl( + armnn::IWorkloadFactory& workloadFactory, const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager) +{ + armnn::TensorInfo paramsInfo({ 5, 2 }, ArmnnType); + armnn::TensorInfo indicesInfo({ 3 }, armnn::DataType::Signed32); + armnn::TensorInfo outputInfo({ 3, 2 }, ArmnnType); + + const std::vector<T> params = std::vector<T>({ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 }); + const std::vector<int32_t> indices = std::vector<int32_t>({ 1, 3, 4 }); + const std::vector<T> expectedOutput = std::vector<T>({ 3, 4, 7, 8, 9, 10 }); + + return GatherTestImpl<ArmnnType, T, 2, 1, 2>(workloadFactory, memoryManager, + paramsInfo, indicesInfo, outputInfo, + params,indices, expectedOutput); +} + +template <armnn::DataType ArmnnType, typename T = armnn::ResolveType<ArmnnType>> +LayerTestResult<T, 4> GatherMultiDimParamsMultiDimIndicesTestImpl( + armnn::IWorkloadFactory& workloadFactory, const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager) +{ + armnn::TensorInfo paramsInfo({ 3, 2, 3}, ArmnnType); + armnn::TensorInfo indicesInfo({ 2, 3 }, armnn::DataType::Signed32); + armnn::TensorInfo outputInfo({ 2, 3, 2, 3 }, ArmnnType); + + const std::vector<T> params = std::vector<T>({ + 1, 2, 3, + 4, 5, 6, + + 7, 8, 9, + 10, 11, 12, + + 13, 14, 15, + 16, 17, 18 }); + const std::vector<int32_t> indices = std::vector<int32_t>({ 1, 2, 1, 2, 1, 0 }); + const std::vector<T> expectedOutput = std::vector<T>({ + 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 }); + + return GatherTestImpl<ArmnnType, T, 3, 2, 4>(workloadFactory, memoryManager, + paramsInfo, indicesInfo, outputInfo, + params,indices, expectedOutput); +} diff --git a/src/backends/backendsCommon/test/LayerTests.cpp b/src/backends/backendsCommon/test/LayerTests.cpp index 3c78c82b6e..c9188e3768 100644 --- a/src/backends/backendsCommon/test/LayerTests.cpp +++ b/src/backends/backendsCommon/test/LayerTests.cpp @@ -32,6 +32,7 @@ #include "Pooling2dTestImpl.hpp" #include "ReshapeTestImpl.hpp" #include "FullyConnectedTestImpl.hpp" +#include "GatherTestImpl.hpp" #include "SpaceToBatchNdTestImpl.hpp" #include "SplitterTestImpl.hpp" #include "SoftmaxTestImpl.hpp" @@ -8689,3 +8690,46 @@ LayerTestResult<uint8_t, 4> PreCompiledMaxPooling2dTest( { return PreCompiledMaxPooling2dTestImpl(workloadFactory, memoryManager); } + +LayerTestResult<float, 1> Gather1DParamsFloatTest( + armnn::IWorkloadFactory& workloadFactory, + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager) +{ + return Gather1DParamsTestImpl<armnn::DataType::Float32>(workloadFactory, memoryManager); +} + +LayerTestResult<uint8_t, 1> Gather1DParamsUint8Test( + armnn::IWorkloadFactory& workloadFactory, + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager) +{ + return Gather1DParamsTestImpl<armnn::DataType::QuantisedAsymm8>(workloadFactory, memoryManager); +} + +LayerTestResult<float, 2> GatherMultiDimParamsFloatTest( + armnn::IWorkloadFactory& workloadFactory, + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager) +{ + return GatherMultiDimParamsTestImpl<armnn::DataType::Float32>(workloadFactory, memoryManager); +} + +LayerTestResult<uint8_t, 2> GatherMultiDimParamsUint8Test( + armnn::IWorkloadFactory& workloadFactory, + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager) +{ + return GatherMultiDimParamsTestImpl<armnn::DataType::QuantisedAsymm8>(workloadFactory, memoryManager); +} + +LayerTestResult<float, 4> GatherMultiDimParamsMultiDimIndicesFloatTest( + armnn::IWorkloadFactory& workloadFactory, + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager) +{ + return GatherMultiDimParamsMultiDimIndicesTestImpl<armnn::DataType::Float32>(workloadFactory, memoryManager); +} + +LayerTestResult<uint8_t, 4> GatherMultiDimParamsMultiDimIndicesUint8Test( + armnn::IWorkloadFactory& workloadFactory, + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager) +{ + return GatherMultiDimParamsMultiDimIndicesTestImpl<armnn::DataType::QuantisedAsymm8>( + workloadFactory, memoryManager); +}
\ No newline at end of file diff --git a/src/backends/backendsCommon/test/LayerTests.hpp b/src/backends/backendsCommon/test/LayerTests.hpp index 7e955653ca..16fe43212b 100644 --- a/src/backends/backendsCommon/test/LayerTests.hpp +++ b/src/backends/backendsCommon/test/LayerTests.hpp @@ -1381,3 +1381,27 @@ LayerTestResult<uint8_t, 2> Debug2DUint8Test( LayerTestResult<uint8_t, 1> Debug1DUint8Test( armnn::IWorkloadFactory& workloadFactory, const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager); + +LayerTestResult<float, 1> Gather1DParamsFloatTest( + armnn::IWorkloadFactory& workloadFactory, + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager); + +LayerTestResult<uint8_t, 1> Gather1DParamsUint8Test( + armnn::IWorkloadFactory& workloadFactory, + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager); + +LayerTestResult<float, 2> GatherMultiDimParamsFloatTest( + armnn::IWorkloadFactory& workloadFactory, + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager); + +LayerTestResult<uint8_t, 2> GatherMultiDimParamsUint8Test( + armnn::IWorkloadFactory& workloadFactory, + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager); + +LayerTestResult<float, 4> GatherMultiDimParamsMultiDimIndicesFloatTest( + armnn::IWorkloadFactory& workloadFactory, + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager); + +LayerTestResult<uint8_t, 4> GatherMultiDimParamsMultiDimIndicesUint8Test( + armnn::IWorkloadFactory& workloadFactory, + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager); |