diff options
author | James Conroy <james.conroy@arm.com> | 2019-05-30 16:36:59 +0100 |
---|---|---|
committer | James Conroy <james.conroy@arm.com> | 2019-05-31 15:56:38 +0100 |
commit | 83735b177a4c71952d36e7a7919537b5a4d6d49e (patch) | |
tree | 51a2e30b1f6caeea9994848c3be6f93471d03b64 /src/backends/reference | |
parent | 983daec95bd3b3e5558771e995092981f2df2373 (diff) | |
download | armnn-83735b177a4c71952d36e7a7919537b5a4d6d49e.tar.gz |
IVGCVSW-3177 Refactor Floor reference workload
* Renamed RefFloorFloat32Workload to RefFloorWorkload
and updated references to reflect this change.
* RefFloorWorkload now uses Decoders/Encoders and
supports the use of multiple data types.
* Deleted FloorTestImpl.hpp and moved its contents
into LayerTests.hpp.
Change-Id: Ie079d05f2f6a578172f0fe3024f9607c030bce64
Signed-off-by: James Conroy <james.conroy@arm.com>
Diffstat (limited to 'src/backends/reference')
-rw-r--r-- | src/backends/reference/RefLayerSupport.cpp | 18 | ||||
-rw-r--r-- | src/backends/reference/RefWorkloadFactory.cpp | 2 | ||||
-rw-r--r-- | src/backends/reference/backend.mk | 2 | ||||
-rw-r--r-- | src/backends/reference/test/RefLayerTests.cpp | 2 | ||||
-rw-r--r-- | src/backends/reference/workloads/CMakeLists.txt | 4 | ||||
-rw-r--r-- | src/backends/reference/workloads/RefFloorFloat32Workload.cpp | 29 | ||||
-rw-r--r-- | src/backends/reference/workloads/RefFloorWorkload.cpp | 38 | ||||
-rw-r--r-- | src/backends/reference/workloads/RefFloorWorkload.hpp (renamed from src/backends/reference/workloads/RefFloorFloat32Workload.hpp) | 4 | ||||
-rw-r--r-- | src/backends/reference/workloads/RefWorkloads.hpp | 2 |
9 files changed, 60 insertions, 41 deletions
diff --git a/src/backends/reference/RefLayerSupport.cpp b/src/backends/reference/RefLayerSupport.cpp index fbe235dcf2..5ec888bde3 100644 --- a/src/backends/reference/RefLayerSupport.cpp +++ b/src/backends/reference/RefLayerSupport.cpp @@ -597,10 +597,20 @@ bool RefLayerSupport::IsFloorSupported(const TensorInfo& input, Optional<std::string&> reasonIfUnsupported) const { ignore_unused(output); - return IsSupportedForDataTypeRef(reasonIfUnsupported, - input.GetDataType(), - &TrueFunc<>, - &FalseFuncU8<>); + bool supported = true; + + std::array<DataType,1> supportedTypes = + { + DataType::Float32 + }; + + supported &= CheckSupportRule(TypeAnyOf(input, supportedTypes), reasonIfUnsupported, + "Reference Floor: input type not supported."); + + supported &= CheckSupportRule(TypeAnyOf(output, supportedTypes), reasonIfUnsupported, + "Reference Floor: output type not supported."); + + return supported; } bool RefLayerSupport::IsFullyConnectedSupported(const TensorInfo& input, diff --git a/src/backends/reference/RefWorkloadFactory.cpp b/src/backends/reference/RefWorkloadFactory.cpp index b829d54be0..500c14b244 100644 --- a/src/backends/reference/RefWorkloadFactory.cpp +++ b/src/backends/reference/RefWorkloadFactory.cpp @@ -288,7 +288,7 @@ std::unique_ptr<IWorkload> RefWorkloadFactory::CreateSpaceToBatchNd(const SpaceT std::unique_ptr<IWorkload> RefWorkloadFactory::CreateFloor(const FloorQueueDescriptor& descriptor, const WorkloadInfo& info) const { - return MakeWorkload<RefFloorFloat32Workload, NullWorkload>(descriptor, info); + return std::make_unique<RefFloorWorkload>(descriptor, info); } std::unique_ptr<IWorkload> RefWorkloadFactory::CreateLstm(const LstmQueueDescriptor& descriptor, diff --git a/src/backends/reference/backend.mk b/src/backends/reference/backend.mk index 46aac056bf..f371c8bd0b 100644 --- a/src/backends/reference/backend.mk +++ b/src/backends/reference/backend.mk @@ -41,7 +41,7 @@ BACKEND_SOURCES := \ workloads/RefDetectionPostProcessUint8Workload.cpp \ workloads/RefElementwiseWorkload.cpp \ workloads/RefFakeQuantizationFloat32Workload.cpp \ - workloads/RefFloorFloat32Workload.cpp \ + workloads/RefFloorWorkload.cpp \ workloads/RefFullyConnectedWorkload.cpp \ workloads/RefGatherWorkload.cpp \ workloads/RefL2NormalizationFloat32Workload.cpp \ diff --git a/src/backends/reference/test/RefLayerTests.cpp b/src/backends/reference/test/RefLayerTests.cpp index ebd9ce2a26..6743ef9c3d 100644 --- a/src/backends/reference/test/RefLayerTests.cpp +++ b/src/backends/reference/test/RefLayerTests.cpp @@ -452,7 +452,7 @@ ARMNN_AUTO_TEST_CASE(Concatenation4dDiffShapeDim2Uint8, Concatenation4dDiffShape ARMNN_AUTO_TEST_CASE(Concatenation4dDiffShapeDim3Uint8, Concatenation4dDiffShapeDim3Uint8Test, true) // Floor -ARMNN_AUTO_TEST_CASE(SimpleFloor, SimpleFloorTest) +ARMNN_AUTO_TEST_CASE(SimpleFloor, SimpleFloorTest<armnn::DataType::Float32>) // Reshape ARMNN_AUTO_TEST_CASE(SimpleReshapeFloat32, SimpleReshapeTest<armnn::DataType::Float32>) diff --git a/src/backends/reference/workloads/CMakeLists.txt b/src/backends/reference/workloads/CMakeLists.txt index e57a40a9ba..df126c4308 100644 --- a/src/backends/reference/workloads/CMakeLists.txt +++ b/src/backends/reference/workloads/CMakeLists.txt @@ -67,8 +67,8 @@ list(APPEND armnnRefBackendWorkloads_sources RefDetectionPostProcessFloat32Workload.hpp RefFakeQuantizationFloat32Workload.cpp RefFakeQuantizationFloat32Workload.hpp - RefFloorFloat32Workload.cpp - RefFloorFloat32Workload.hpp + RefFloorWorkload.cpp + RefFloorWorkload.hpp RefFullyConnectedWorkload.cpp RefFullyConnectedWorkload.hpp RefGatherWorkload.cpp diff --git a/src/backends/reference/workloads/RefFloorFloat32Workload.cpp b/src/backends/reference/workloads/RefFloorFloat32Workload.cpp deleted file mode 100644 index cc1f8800dc..0000000000 --- a/src/backends/reference/workloads/RefFloorFloat32Workload.cpp +++ /dev/null @@ -1,29 +0,0 @@ -// -// Copyright © 2017 Arm Ltd. All rights reserved. -// SPDX-License-Identifier: MIT -// - -#include "RefFloorFloat32Workload.hpp" - -#include "RefWorkloadUtils.hpp" - -#include "Profiling.hpp" - -namespace armnn -{ - -void RefFloorFloat32Workload::Execute() const -{ - ARMNN_SCOPED_PROFILING_EVENT(Compute::CpuRef, "RefFloorFloat32Workload_Execute"); - - const float* const input = GetInputTensorDataFloat(0, m_Data); - float* const output = GetOutputTensorDataFloat(0, m_Data); - - unsigned int numElements = GetTensorInfo(m_Data.m_Inputs[0]).GetNumElements(); - for (unsigned int i = 0; i < numElements; ++i) - { - output[i] = floorf(input[i]); - } -} - -} //namespace armnn diff --git a/src/backends/reference/workloads/RefFloorWorkload.cpp b/src/backends/reference/workloads/RefFloorWorkload.cpp new file mode 100644 index 0000000000..d96b18b530 --- /dev/null +++ b/src/backends/reference/workloads/RefFloorWorkload.cpp @@ -0,0 +1,38 @@ +// +// Copyright © 2017 Arm Ltd. All rights reserved. +// SPDX-License-Identifier: MIT +// + +#include "RefFloorWorkload.hpp" + +#include "Decoders.hpp" +#include "Encoders.hpp" +#include "RefWorkloadUtils.hpp" +#include "Profiling.hpp" + +namespace armnn +{ + +void RefFloorWorkload::Execute() const +{ + ARMNN_SCOPED_PROFILING_EVENT(Compute::CpuRef, "RefFloorFloat32Workload_Execute"); + + const TensorInfo &inputTensorInfo = GetTensorInfo(m_Data.m_Inputs[0]); + std::unique_ptr<Decoder<float>> decoderPtr = MakeDecoder<float>(inputTensorInfo, m_Data.m_Inputs[0]->Map()); + Decoder<float> &decoder = *decoderPtr; + + const TensorInfo &outputTensorInfo = GetTensorInfo(m_Data.m_Outputs[0]); + std::unique_ptr<Encoder<float>> encoderPtr = MakeEncoder<float>(outputTensorInfo, m_Data.m_Outputs[0]->Map()); + Encoder<float> &encoder = *encoderPtr; + + unsigned int numElements = GetTensorInfo(m_Data.m_Inputs[0]).GetNumElements(); + + for (unsigned int i = 0; i < numElements; ++i) + { + encoder.Set(floorf(decoder.Get())); + ++decoder; + ++encoder; + } +} + +} //namespace armnn diff --git a/src/backends/reference/workloads/RefFloorFloat32Workload.hpp b/src/backends/reference/workloads/RefFloorWorkload.hpp index 3f540d068d..2dea3a4259 100644 --- a/src/backends/reference/workloads/RefFloorFloat32Workload.hpp +++ b/src/backends/reference/workloads/RefFloorWorkload.hpp @@ -11,10 +11,10 @@ namespace armnn { -class RefFloorFloat32Workload : public Float32Workload<FloorQueueDescriptor> +class RefFloorWorkload : public BaseWorkload<FloorQueueDescriptor> { public: - using Float32Workload<FloorQueueDescriptor>::Float32Workload; + using BaseWorkload<FloorQueueDescriptor>::BaseWorkload; virtual void Execute() const override; }; diff --git a/src/backends/reference/workloads/RefWorkloads.hpp b/src/backends/reference/workloads/RefWorkloads.hpp index c20e2f6191..c8c26b0b83 100644 --- a/src/backends/reference/workloads/RefWorkloads.hpp +++ b/src/backends/reference/workloads/RefWorkloads.hpp @@ -26,7 +26,7 @@ #include "RefDepthwiseConvolution2dWorkload.hpp" #include "FullyConnected.hpp" #include "Gather.hpp" -#include "RefFloorFloat32Workload.hpp" +#include "RefFloorWorkload.hpp" #include "RefSoftmaxWorkload.hpp" #include "RefResizeBilinearFloat32Workload.hpp" #include "RefBatchNormalizationUint8Workload.hpp" |