From f4bfa6ae12d0f6385b2017c1d98ba9c2ec0d59f4 Mon Sep 17 00:00:00 2001 From: Ryan OShea Date: Wed, 10 Jun 2020 11:33:37 +0100 Subject: IVGCVSW-4620 Add Fill Reference Implementation * Add Fill Reference Implementation * Refactor FP converter to use static_cast Signed-off-by: Ryan OShea Signed-off-by: Keith Davis Change-Id: I532e2f982981d047690755fac43a0e9cf8b17dcd --- src/backends/backendsCommon/WorkloadData.hpp | 7 --- src/backends/backendsCommon/common.mk | 1 + src/backends/backendsCommon/test/CMakeLists.txt | 2 + src/backends/backendsCommon/test/LayerTests.hpp | 1 + .../test/layerTests/FillTestImpl.cpp | 70 ++++++++++++++++++++++ .../test/layerTests/FillTestImpl.hpp | 18 ++++++ 6 files changed, 92 insertions(+), 7 deletions(-) create mode 100644 src/backends/backendsCommon/test/layerTests/FillTestImpl.cpp create mode 100644 src/backends/backendsCommon/test/layerTests/FillTestImpl.hpp (limited to 'src/backends/backendsCommon') diff --git a/src/backends/backendsCommon/WorkloadData.hpp b/src/backends/backendsCommon/WorkloadData.hpp index ba9b0f394b..f2f7089040 100644 --- a/src/backends/backendsCommon/WorkloadData.hpp +++ b/src/backends/backendsCommon/WorkloadData.hpp @@ -140,13 +140,6 @@ struct ArgMinMaxQueueDescriptor : QueueDescriptorWithParameters { - FillQueueDescriptor() - : m_Value(nullptr) - { - } - - const ConstCpuTensorHandle* m_Value; - void Validate(const WorkloadInfo& workloadInfo) const; }; diff --git a/src/backends/backendsCommon/common.mk b/src/backends/backendsCommon/common.mk index 47e88214af..c31b1f07a4 100644 --- a/src/backends/backendsCommon/common.mk +++ b/src/backends/backendsCommon/common.mk @@ -56,6 +56,7 @@ COMMON_TEST_SOURCES := \ test/layerTests/ElementwiseUnaryTestImpl.cpp \ test/layerTests/ExpTestImpl.cpp \ test/layerTests/FakeQuantizationTestImpl.cpp \ + test/layerTests/FillTestImpl.cpp \ test/layerTests/FloorTestImpl.cpp \ test/layerTests/FullyConnectedTestImpl.cpp \ test/layerTests/GatherTestImpl.cpp \ diff --git a/src/backends/backendsCommon/test/CMakeLists.txt b/src/backends/backendsCommon/test/CMakeLists.txt index 81372dab3a..0ce529906f 100644 --- a/src/backends/backendsCommon/test/CMakeLists.txt +++ b/src/backends/backendsCommon/test/CMakeLists.txt @@ -95,6 +95,8 @@ list(APPEND armnnBackendsCommonUnitTests_sources layerTests/ExpTestImpl.hpp layerTests/FakeQuantizationTestImpl.cpp layerTests/FakeQuantizationTestImpl.hpp + layerTests/FillTestImpl.cpp + layerTests/FillTestImpl.hpp layerTests/FloorTestImpl.cpp layerTests/FloorTestImpl.hpp layerTests/FullyConnectedTestImpl.cpp diff --git a/src/backends/backendsCommon/test/LayerTests.hpp b/src/backends/backendsCommon/test/LayerTests.hpp index 195ca80b73..7e8b301b54 100644 --- a/src/backends/backendsCommon/test/LayerTests.hpp +++ b/src/backends/backendsCommon/test/LayerTests.hpp @@ -27,6 +27,7 @@ #include #include #include +#include #include #include #include diff --git a/src/backends/backendsCommon/test/layerTests/FillTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/FillTestImpl.cpp new file mode 100644 index 0000000000..00a185ca2d --- /dev/null +++ b/src/backends/backendsCommon/test/layerTests/FillTestImpl.cpp @@ -0,0 +1,70 @@ +// +// Copyright © 2020 Arm Ltd and Contributors. All rights reserved. +// SPDX-License-Identifier: MIT +// + +#include "FillTestImpl.hpp" + +#include +#include +#include + +#include + +template +LayerTestResult SimpleFillTest( + armnn::IWorkloadFactory& workloadFactory, + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager) +{ + IgnoreUnused(memoryManager); + armnn::TensorInfo inputTensorInfo({4}, ArmnnType); + inputTensorInfo.SetQuantizationScale(0.0f); + + armnn::TensorInfo outputTensorInfo({2, 2, 3, 2}, ArmnnType); + outputTensorInfo.SetQuantizationScale(0.0f); + + auto input = MakeTensor(inputTensorInfo, ConvertToDataType( + {2, 2, 3, 2}, + inputTensorInfo)); + + LayerTestResult ret(outputTensorInfo); + ret.outputExpected = MakeTensor(outputTensorInfo, ConvertToDataType( + { 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, + 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f }, + outputTensorInfo)); + + std::unique_ptr inputHandle = workloadFactory.CreateTensorHandle(inputTensorInfo); + std::unique_ptr outputHandle = workloadFactory.CreateTensorHandle(outputTensorInfo); + + armnn::FillQueueDescriptor data; + data.m_Parameters.m_Value = 1.0f; + armnn::WorkloadInfo info; + AddInputToWorkload(data, info, inputTensorInfo, inputHandle.get()); + AddOutputToWorkload(data, info, outputTensorInfo, outputHandle.get()); + + std::unique_ptr workload = workloadFactory.CreateFill(data, info); + + inputHandle->Allocate(); + outputHandle->Allocate(); + + CopyDataToITensorHandle(inputHandle.get(), &input[0]); + + workload->Execute(); + + CopyDataFromITensorHandle(&ret.output[0][0][0][0], outputHandle.get()); + + return ret; +} + +// +// Explicit template specializations +// +template LayerTestResult, 4> +SimpleFillTest( + armnn::IWorkloadFactory& workloadFactory, + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager); + +template LayerTestResult, 4> +SimpleFillTest( + armnn::IWorkloadFactory& workloadFactory, + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager); \ No newline at end of file diff --git a/src/backends/backendsCommon/test/layerTests/FillTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/FillTestImpl.hpp new file mode 100644 index 0000000000..988900774e --- /dev/null +++ b/src/backends/backendsCommon/test/layerTests/FillTestImpl.hpp @@ -0,0 +1,18 @@ +// +// Copyright © 2020 Arm Ltd and Contributors. All rights reserved. +// SPDX-License-Identifier: MIT +// + +#pragma once + +#include "LayerTestResult.hpp" + +#include + +#include +#include + +template> +LayerTestResult SimpleFillTest( + armnn::IWorkloadFactory& workloadFactory, + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager); -- cgit v1.2.1