diff options
author | Keith Davis <keith.davis@arm.com> | 2019-06-14 17:33:22 +0100 |
---|---|---|
committer | Keith Davis <keith.davis@arm.com> | 2019-06-19 14:43:26 +0100 |
commit | a57eccbe313557b9eafec40b39bac3115d9b930d (patch) | |
tree | 2522157537f46fa2e54c0405d9e9e60f5f0a9ae1 /src/backends/backendsCommon | |
parent | ab9e52563f624d9782b97400f643d2632cc8d770 (diff) | |
download | armnn-a57eccbe313557b9eafec40b39bac3115d9b930d.tar.gz |
IVGCVSW-3231 Add reference workload support for SpaceToDepth
* Added reference workload for SpaceToDepth
* Added unit tests for float32 & uint8
* Minor sort refactoring to RefWorkloads.hpp to alphabetical order
Change-Id: I2e01f8101650e2aae102a8a32bc0064f067141ab
Signed-off-by: Keith Davis <keith.davis@arm.com>
Diffstat (limited to 'src/backends/backendsCommon')
-rw-r--r-- | src/backends/backendsCommon/WorkloadData.cpp | 48 | ||||
-rw-r--r-- | src/backends/backendsCommon/test/CMakeLists.txt | 1 | ||||
-rw-r--r-- | src/backends/backendsCommon/test/LayerTests.cpp | 40 | ||||
-rw-r--r-- | src/backends/backendsCommon/test/LayerTests.hpp | 16 | ||||
-rw-r--r-- | src/backends/backendsCommon/test/SpaceToDepthTestImpl.hpp | 147 |
5 files changed, 252 insertions, 0 deletions
diff --git a/src/backends/backendsCommon/WorkloadData.cpp b/src/backends/backendsCommon/WorkloadData.cpp index b7317af9cd..adba86c79a 100644 --- a/src/backends/backendsCommon/WorkloadData.cpp +++ b/src/backends/backendsCommon/WorkloadData.cpp @@ -1123,6 +1123,54 @@ void SpaceToBatchNdQueueDescriptor::Validate(const WorkloadInfo& workloadInfo) c "SpaceToBatchNdQueueDescriptor"); } +void SpaceToDepthQueueDescriptor::Validate(const WorkloadInfo& workloadInfo) const +{ + ValidateNumInputs(workloadInfo, "SpaceToDepthQueueDescriptor", 1); + ValidateNumOutputs(workloadInfo, "SpaceToDepthQueueDescriptor", 1); + + ValidateTensorNumDimensions(workloadInfo.m_InputTensorInfos[0], + "SpaceToDepthQueueDescriptor", 4, "input"); + ValidateTensorNumDimensions(workloadInfo.m_OutputTensorInfos[0], + "SpaceToDepthQueueDescriptor", 4, "output"); + + DataLayoutIndexed dimensionIndices(m_Parameters.m_DataLayout); + + std::vector<DataType> supportedTypes = + { + DataType::Float32, + DataType::Float16, + DataType::QuantisedAsymm8 + }; + + ValidateDataTypes(workloadInfo.m_InputTensorInfos[0], + supportedTypes, + "SpaceToDepthQueueDescriptor"); + ValidateDataTypes(workloadInfo.m_OutputTensorInfos[0], + supportedTypes, + "SpaceToDepthQueueDescriptor"); + + const TensorShape inputShape = workloadInfo.m_InputTensorInfos[0].GetShape(); + + unsigned int numInputElements = inputShape[0] + * inputShape[dimensionIndices.GetWidthIndex()] + * inputShape[dimensionIndices.GetHeightIndex()] + * inputShape[dimensionIndices.GetChannelsIndex()]; + + if (workloadInfo.m_OutputTensorInfos[0].GetNumElements() != numInputElements) + { + throw InvalidArgumentException("SpaceToDepthQueueDescriptor: Input tensor has " + + to_string(numInputElements) + " but output tensor has " + + to_string(workloadInfo.m_OutputTensorInfos[0].GetNumElements()) + " elements."); + } + + if (inputShape[dimensionIndices.GetHeightIndex()] % m_Parameters.m_BlockSize != 0 || + inputShape[dimensionIndices.GetWidthIndex()] % m_Parameters.m_BlockSize != 0) + { + throw InvalidArgumentException( + "Input shape must be divisible by block size in all spatial dimensions"); + } +} + void FloorQueueDescriptor::Validate(const WorkloadInfo& workloadInfo) const { const std::string floorQueueDescString = "FloorQueueDescriptor"; diff --git a/src/backends/backendsCommon/test/CMakeLists.txt b/src/backends/backendsCommon/test/CMakeLists.txt index 7512c89e9c..7819cfe056 100644 --- a/src/backends/backendsCommon/test/CMakeLists.txt +++ b/src/backends/backendsCommon/test/CMakeLists.txt @@ -44,6 +44,7 @@ list(APPEND armnnBackendsCommonUnitTests_sources QuantizeTestImpl.hpp RuntimeTestImpl.hpp SoftmaxTestImpl.hpp + SpaceToDepthTestImpl.hpp SplitterEndToEndTestImpl.hpp SplitterTestImpl.hpp StridedSliceTestImpl.hpp diff --git a/src/backends/backendsCommon/test/LayerTests.cpp b/src/backends/backendsCommon/test/LayerTests.cpp index 7f0c933f2b..45791e50f2 100644 --- a/src/backends/backendsCommon/test/LayerTests.cpp +++ b/src/backends/backendsCommon/test/LayerTests.cpp @@ -33,6 +33,7 @@ #include "FullyConnectedTestImpl.hpp" #include "GatherTestImpl.hpp" #include "SpaceToBatchNdTestImpl.hpp" +#include "SpaceToDepthTestImpl.hpp" #include "SplitterTestImpl.hpp" #include "SoftmaxTestImpl.hpp" #include "StridedSliceTestImpl.hpp" @@ -8969,6 +8970,45 @@ LayerTestResult<int16_t, 4> SpaceToBatchNdPaddingNHWCUint16Test( return SpaceToBatchNdPaddingNHWCTest<armnn::DataType::QuantisedSymm16>(workloadFactory, memoryManager); } + +LayerTestResult<uint8_t, 4> SpaceToDepthNHWCAsymmQ8Test( + armnn::IWorkloadFactory& workloadFactory, + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager) +{ + return SpaceToDepthSimpleTest<armnn::DataType::QuantisedAsymm8>( + workloadFactory, + memoryManager); +} + +LayerTestResult<uint8_t, 4> SpaceToDepthNCHWAsymmQ8Test( + armnn::IWorkloadFactory& workloadFactory, + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager) +{ + return SpaceToDepthSimpleTest<armnn::DataType::QuantisedAsymm8>( + workloadFactory, + memoryManager, + armnn::DataLayout::NCHW); +} + +LayerTestResult<float, 4> SpaceToDepthNHWCFloat32Test( + armnn::IWorkloadFactory& workloadFactory, + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager) +{ + return SpaceToDepthFloatTest<armnn::DataType::Float32>( + workloadFactory, + memoryManager); +} + +LayerTestResult<float, 4> SpaceToDepthNCHWFloat32Test( + armnn::IWorkloadFactory& workloadFactory, + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager) +{ + return SpaceToDepthFloatTest<armnn::DataType::Float32>( + workloadFactory, + memoryManager, + armnn::DataLayout::NCHW); +} + namespace { template<typename T, std::size_t InputDim, std::size_t OutputDim> diff --git a/src/backends/backendsCommon/test/LayerTests.hpp b/src/backends/backendsCommon/test/LayerTests.hpp index bf0d063091..e0b0273d9d 100644 --- a/src/backends/backendsCommon/test/LayerTests.hpp +++ b/src/backends/backendsCommon/test/LayerTests.hpp @@ -1914,6 +1914,22 @@ LayerTestResult<float, 4> DequantizeSimpleInt16Test( armnn::IWorkloadFactory& workloadFactory, const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager); +LayerTestResult<uint8_t, 4> SpaceToDepthNCHWAsymmQ8Test( + armnn::IWorkloadFactory& workloadFactory, + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager); + +LayerTestResult<uint8_t, 4> SpaceToDepthNHWCAsymmQ8Test( + armnn::IWorkloadFactory& workloadFactory, + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager); + +LayerTestResult<float, 4> SpaceToDepthNHWCFloat32Test( + armnn::IWorkloadFactory& workloadFactory, + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager); + +LayerTestResult<float, 4> SpaceToDepthNCHWFloat32Test( + armnn::IWorkloadFactory& workloadFactory, + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager); + LayerTestResult<uint8_t, 4> QuantizeSimpleUint8Test( armnn::IWorkloadFactory& workloadFactory, const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager); diff --git a/src/backends/backendsCommon/test/SpaceToDepthTestImpl.hpp b/src/backends/backendsCommon/test/SpaceToDepthTestImpl.hpp new file mode 100644 index 0000000000..99926cd026 --- /dev/null +++ b/src/backends/backendsCommon/test/SpaceToDepthTestImpl.hpp @@ -0,0 +1,147 @@ +// +// Copyright © 2017 Arm Ltd. All rights reserved. +// SPDX-License-Identifier: MIT +// +#pragma once + +#include "WorkloadTestUtils.hpp" + +#include <armnn/ArmNN.hpp> +#include <armnn/Tensor.hpp> +#include <armnn/TypesUtils.hpp> + +#include <backendsCommon/CpuTensorHandle.hpp> +#include <backendsCommon/IBackendInternal.hpp> +#include <backendsCommon/WorkloadFactory.hpp> + +#include <test/TensorHelpers.hpp> + +template<typename T> +LayerTestResult<T, 4> SpaceToDepthTestImpl( + armnn::IWorkloadFactory& workloadFactory, + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, + armnn::TensorInfo& inputTensorInfo, + armnn::TensorInfo& outputTensorInfo, + std::vector<float>& inputData, + std::vector<float>& outputExpectedData, + armnn::SpaceToDepthQueueDescriptor descriptor, + const float qScale = 1.0f, + const int32_t qOffset = 0) +{ + const armnn::PermutationVector NHWCToNCHW = {0, 2, 3, 1}; + + if (descriptor.m_Parameters.m_DataLayout == armnn::DataLayout::NCHW) + { + inputTensorInfo = armnnUtils::Permuted(inputTensorInfo, NHWCToNCHW); + outputTensorInfo = armnnUtils::Permuted(outputTensorInfo, NHWCToNCHW); + + std::vector<float> inputTmp(inputData.size()); + armnnUtils::Permute(inputTensorInfo.GetShape(), NHWCToNCHW, + inputData.data(), inputTmp.data(), sizeof(float)); + inputData = inputTmp; + + std::vector<float> outputTmp(outputExpectedData.size()); + armnnUtils::Permute(outputTensorInfo.GetShape(), NHWCToNCHW, + outputExpectedData.data(), outputTmp.data(), sizeof(float)); + outputExpectedData = outputTmp; + } + + if(armnn::IsQuantizedType<T>()) + { + inputTensorInfo.SetQuantizationScale(qScale); + inputTensorInfo.SetQuantizationOffset(qOffset); + outputTensorInfo.SetQuantizationScale(qScale); + outputTensorInfo.SetQuantizationOffset(qOffset); + } + + boost::multi_array<T, 4> input = MakeTensor<T, 4>(inputTensorInfo, QuantizedVector<T>(qScale, qOffset, inputData)); + + LayerTestResult<T, 4> ret(outputTensorInfo); + ret.outputExpected = MakeTensor<T, 4>(outputTensorInfo, QuantizedVector<T>(qScale, qOffset, outputExpectedData)); + + std::unique_ptr<armnn::ITensorHandle> inputHandle = workloadFactory.CreateTensorHandle(inputTensorInfo); + std::unique_ptr<armnn::ITensorHandle> outputHandle = workloadFactory.CreateTensorHandle(outputTensorInfo); + + armnn::WorkloadInfo info; + AddInputToWorkload(descriptor, info, inputTensorInfo, inputHandle.get()); + AddOutputToWorkload(descriptor, info, outputTensorInfo, outputHandle.get()); + + std::unique_ptr<armnn::IWorkload> workload = workloadFactory.CreateSpaceToDepth(descriptor, info); + + inputHandle->Allocate(); + outputHandle->Allocate(); + + CopyDataToITensorHandle(inputHandle.get(), &input[0][0][0][0]); + + workload->Execute(); + + CopyDataFromITensorHandle(&ret.output[0][0][0][0], outputHandle.get()); + + return ret; +} + +template<armnn::DataType ArmnnType, typename T = armnn::ResolveType<ArmnnType>> +LayerTestResult<T, 4> SpaceToDepthSimpleTest( + armnn::IWorkloadFactory& workloadFactory, + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, + armnn::DataLayout dataLayout = armnn::DataLayout::NHWC) +{ + unsigned int inputShape[] = {1, 2, 2, 1}; + unsigned int outputShape[] = {1, 1, 1, 4}; + + std::vector<float> input = std::vector<float>( + { + 1.0f, 2.0f, 3.0f, 4.0f + }); + + std::vector<float> outputExpected = std::vector<float>( + { + 1.0f, 2.0f, 3.0f, 4.0f + }); + + armnn::TensorInfo inputTensorInfo; + armnn::TensorInfo outputTensorInfo; + + armnn::SpaceToDepthQueueDescriptor desc; + desc.m_Parameters.m_DataLayout = dataLayout; + desc.m_Parameters.m_BlockSize = 2; + + inputTensorInfo = armnn::TensorInfo(4, inputShape, ArmnnType); + outputTensorInfo = armnn::TensorInfo(4, outputShape, ArmnnType); + + return SpaceToDepthTestImpl<T>( + workloadFactory, memoryManager, inputTensorInfo, outputTensorInfo, input, outputExpected, desc); +} + +template<armnn::DataType ArmnnType, typename T = armnn::ResolveType<ArmnnType>> +LayerTestResult<T, 4> SpaceToDepthFloatTest( + armnn::IWorkloadFactory& workloadFactory, + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, + armnn::DataLayout dataLayout = armnn::DataLayout::NHWC) +{ + unsigned int inputShape[] = {1, 2, 2, 2}; + unsigned int outputShape[] = {1, 1, 1, 8}; + + std::vector<float> input = std::vector<float>( + { + 1.4f, 2.3f, 3.2f, 4.1f, 5.4f, 6.3f, 7.2f, 8.1f + }); + + std::vector<float> outputExpected = std::vector<float>( + { + 1.4f, 2.3f, 3.2f, 4.1f, 5.4f, 6.3f, 7.2f, 8.1f + }); + + armnn::TensorInfo inputTensorInfo; + armnn::TensorInfo outputTensorInfo; + + armnn::SpaceToDepthQueueDescriptor desc; + desc.m_Parameters.m_DataLayout = dataLayout; + desc.m_Parameters.m_BlockSize = 2; + + inputTensorInfo = armnn::TensorInfo(4, inputShape, ArmnnType); + outputTensorInfo = armnn::TensorInfo(4, outputShape, ArmnnType); + + return SpaceToDepthTestImpl<T>( + workloadFactory, memoryManager, inputTensorInfo, outputTensorInfo, input, outputExpected, desc); +} |