diff options
Diffstat (limited to 'src/backends/reference')
-rw-r--r-- | src/backends/reference/RefLayerSupport.cpp | 26 | ||||
-rw-r--r-- | src/backends/reference/RefLayerSupport.hpp | 4 | ||||
-rw-r--r-- | src/backends/reference/RefWorkloadFactory.cpp | 10 | ||||
-rw-r--r-- | src/backends/reference/RefWorkloadFactory.hpp | 3 | ||||
-rw-r--r-- | src/backends/reference/backend.mk | 2 | ||||
-rw-r--r-- | src/backends/reference/test/RefLayerTests.cpp | 9 | ||||
-rw-r--r-- | src/backends/reference/workloads/Abs.cpp | 23 | ||||
-rw-r--r-- | src/backends/reference/workloads/Abs.hpp | 19 | ||||
-rw-r--r-- | src/backends/reference/workloads/CMakeLists.txt | 4 | ||||
-rw-r--r-- | src/backends/reference/workloads/RefAbsWorkload.cpp | 37 | ||||
-rw-r--r-- | src/backends/reference/workloads/RefAbsWorkload.hpp | 21 | ||||
-rw-r--r-- | src/backends/reference/workloads/RefWorkloads.hpp | 2 |
12 files changed, 160 insertions, 0 deletions
diff --git a/src/backends/reference/RefLayerSupport.cpp b/src/backends/reference/RefLayerSupport.cpp index 22d7914ab9..5c53f12eb1 100644 --- a/src/backends/reference/RefLayerSupport.cpp +++ b/src/backends/reference/RefLayerSupport.cpp @@ -66,6 +66,32 @@ std::string CreateIncorrectDimensionsErrorMsg(unsigned int expected, } // anonymous namespace +bool RefLayerSupport::IsAbsSupported(const TensorInfo& input, const TensorInfo& output, + Optional<std::string&> reasonIfUnsupported) const +{ + bool supported = true; + std::array<DataType,3> supportedTypes = + { + DataType::Float32, + DataType::QuantisedAsymm8, + DataType::QuantisedSymm16 + }; + + supported &= CheckSupportRule(TypeAnyOf(input, supportedTypes), reasonIfUnsupported, + "Reference abs: input type not supported"); + + supported &= CheckSupportRule(TypeAnyOf(output, supportedTypes), reasonIfUnsupported, + "Reference abs: output type not supported"); + + supported &= CheckSupportRule(TypesAreEqual(input, output), reasonIfUnsupported, + "Reference abs: input and output types not matching"); + + supported &= CheckSupportRule(ShapesAreSameTotalSize(input, output), reasonIfUnsupported, + "Reference abs: input and output shapes have different number of total elements"); + + return supported; +} + bool RefLayerSupport::IsActivationSupported(const TensorInfo& input, const TensorInfo& output, const ActivationDescriptor& descriptor, diff --git a/src/backends/reference/RefLayerSupport.hpp b/src/backends/reference/RefLayerSupport.hpp index f8bbeb78bf..26c60dcf30 100644 --- a/src/backends/reference/RefLayerSupport.hpp +++ b/src/backends/reference/RefLayerSupport.hpp @@ -12,6 +12,10 @@ namespace armnn class RefLayerSupport : public LayerSupportBase { public: + bool IsAbsSupported(const TensorInfo& input, + const TensorInfo& output, + Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const override; + bool IsActivationSupported(const TensorInfo& input, const TensorInfo& output, const ActivationDescriptor& descriptor, diff --git a/src/backends/reference/RefWorkloadFactory.cpp b/src/backends/reference/RefWorkloadFactory.cpp index fff2fd2694..dc97356d57 100644 --- a/src/backends/reference/RefWorkloadFactory.cpp +++ b/src/backends/reference/RefWorkloadFactory.cpp @@ -535,4 +535,14 @@ std::unique_ptr<IWorkload> RefWorkloadFactory::CreateStack(const StackQueueDescr return std::make_unique<RefStackWorkload>(descriptor, info); } +std::unique_ptr<IWorkload> RefWorkloadFactory::CreateAbs(const AbsQueueDescriptor& descriptor, + const WorkloadInfo& info) const +{ + if (IsFloat16(info)) + { + return MakeWorkload<NullWorkload, NullWorkload>(descriptor, info); + } + return std::make_unique<RefAbsWorkload>(descriptor, info); +} + } // namespace armnn diff --git a/src/backends/reference/RefWorkloadFactory.hpp b/src/backends/reference/RefWorkloadFactory.hpp index 314e11788e..5851528f4a 100644 --- a/src/backends/reference/RefWorkloadFactory.hpp +++ b/src/backends/reference/RefWorkloadFactory.hpp @@ -209,6 +209,9 @@ public: std::unique_ptr<IWorkload> CreateStack(const StackQueueDescriptor& descriptor, const WorkloadInfo& info) const override; + std::unique_ptr<IWorkload> CreateAbs(const AbsQueueDescriptor& descriptor, + const WorkloadInfo& info) const override; + private: template <typename F32Workload, typename U8Workload, typename QueueDescriptorType> diff --git a/src/backends/reference/backend.mk b/src/backends/reference/backend.mk index 4bfacd5390..b1f0a03782 100644 --- a/src/backends/reference/backend.mk +++ b/src/backends/reference/backend.mk @@ -21,6 +21,7 @@ BACKEND_SOURCES := \ RefWorkloadFactory.cpp \ RefRegistryInitializer.cpp \ RefTensorHandleFactory.cpp \ + workloads/Abs.cpp \ workloads/Activation.cpp \ workloads/BatchNormImpl.cpp \ workloads/BatchToSpaceNd.cpp \ @@ -37,6 +38,7 @@ BACKEND_SOURCES := \ workloads/Pad.cpp \ workloads/Pooling2d.cpp \ workloads/PreluImpl.cpp \ + workloads/RefAbsWorkload.cpp \ workloads/RefActivationWorkload.cpp \ workloads/RefBatchNormalizationWorkload.cpp \ workloads/RefBatchToSpaceNdWorkload.cpp \ diff --git a/src/backends/reference/test/RefLayerTests.cpp b/src/backends/reference/test/RefLayerTests.cpp index 59ca51636f..af9f645a54 100644 --- a/src/backends/reference/test/RefLayerTests.cpp +++ b/src/backends/reference/test/RefLayerTests.cpp @@ -1110,6 +1110,15 @@ ARMNN_AUTO_TEST_CASE(GatherMultiDimParamsMultiDimIndicesFloat, GatherMultiDimPar ARMNN_AUTO_TEST_CASE(GatherMultiDimParamsMultiDimIndicesUint8, GatherMultiDimParamsMultiDimIndicesUint8Test) ARMNN_AUTO_TEST_CASE(GatherMultiDimParamsMultiDimIndicesInt16, GatherMultiDimParamsMultiDimIndicesInt16Test) +// Abs +ARMNN_AUTO_TEST_CASE(Abs2d, Abs2dTest<DataType::Float32>) +ARMNN_AUTO_TEST_CASE(Abs3d, Abs3dTest<DataType::Float32>) +ARMNN_AUTO_TEST_CASE(AbsZero, AbsZeroTest<DataType::Float32>) +ARMNN_AUTO_TEST_CASE(Abs2dQuantisedAsymm8, Abs2dTest<DataType::QuantisedAsymm8>) +ARMNN_AUTO_TEST_CASE(Abs3dQuantisedAsymm8, Abs3dTest<DataType::QuantisedAsymm8>) +ARMNN_AUTO_TEST_CASE(Abs2dQuantisedSymm16, Abs2dTest<DataType::QuantisedSymm16>) +ARMNN_AUTO_TEST_CASE(Abs3dQuantisedSymm16, Abs3dTest<DataType::QuantisedSymm16>) + // Detection PostProcess BOOST_AUTO_TEST_CASE(DetectionPostProcessRegularNmsFloat) { diff --git a/src/backends/reference/workloads/Abs.cpp b/src/backends/reference/workloads/Abs.cpp new file mode 100644 index 0000000000..6a6a79ca56 --- /dev/null +++ b/src/backends/reference/workloads/Abs.cpp @@ -0,0 +1,23 @@ +// +// Copyright © 2017 Arm Ltd. All rights reserved. +// SPDX-License-Identifier: MIT +// + +#include "Abs.hpp" + +namespace armnn +{ + +void Abs(Decoder<float>& in, + Encoder<float>& out, + const TensorInfo& tensorInfo) +{ + for (unsigned int i = 0u; i < tensorInfo.GetNumElements(); ++i) + { + out[i]; + in[i]; + out.Set(std::abs(in.Get())); + } +} + +} //namespace armnn diff --git a/src/backends/reference/workloads/Abs.hpp b/src/backends/reference/workloads/Abs.hpp new file mode 100644 index 0000000000..b1165d2d93 --- /dev/null +++ b/src/backends/reference/workloads/Abs.hpp @@ -0,0 +1,19 @@ +// +// Copyright © 2017 Arm Ltd. All rights reserved. +// SPDX-License-Identifier: MIT +// + +#include "BaseIterator.hpp" +#include <armnn/Tensor.hpp> +#include <armnn/Types.hpp> + +namespace armnn +{ + +/// Performs the absolute function elementwise +/// on the inputs to give the outputs. +void Abs(Decoder<float>& in, + Encoder<float>& out, + const TensorInfo& tensorInfo); + +} //namespace armnn diff --git a/src/backends/reference/workloads/CMakeLists.txt b/src/backends/reference/workloads/CMakeLists.txt index c9db057be5..7f49e800e5 100644 --- a/src/backends/reference/workloads/CMakeLists.txt +++ b/src/backends/reference/workloads/CMakeLists.txt @@ -4,6 +4,8 @@ # list(APPEND armnnRefBackendWorkloads_sources + Abs.cpp + Abs.hpp Activation.cpp Activation.hpp BaseIterator.hpp @@ -41,6 +43,8 @@ list(APPEND armnnRefBackendWorkloads_sources Pooling2d.hpp PreluImpl.cpp PreluImpl.hpp + RefAbsWorkload.cpp + RefAbsWorkload.hpp RefActivationWorkload.cpp RefActivationWorkload.hpp RefBatchNormalizationWorkload.cpp diff --git a/src/backends/reference/workloads/RefAbsWorkload.cpp b/src/backends/reference/workloads/RefAbsWorkload.cpp new file mode 100644 index 0000000000..5c1f8c0c69 --- /dev/null +++ b/src/backends/reference/workloads/RefAbsWorkload.cpp @@ -0,0 +1,37 @@ +// +// Copyright © 2017 Arm Ltd. All rights reserved. +// SPDX-License-Identifier: MIT +// + +#include "RefAbsWorkload.hpp" + +#include "Abs.hpp" +#include "Decoders.hpp" +#include "Encoders.hpp" +#include "RefWorkloadUtils.hpp" + +#include <Profiling.hpp> + +namespace armnn +{ + +void RefAbsWorkload::Execute() const +{ + ARMNN_SCOPED_PROFILING_EVENT(Compute::CpuRef, "RefAbsWorkload_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; + + Abs(decoder, + encoder, + inputTensorInfo); +} + +} //namespace armnn diff --git a/src/backends/reference/workloads/RefAbsWorkload.hpp b/src/backends/reference/workloads/RefAbsWorkload.hpp new file mode 100644 index 0000000000..68105556d5 --- /dev/null +++ b/src/backends/reference/workloads/RefAbsWorkload.hpp @@ -0,0 +1,21 @@ +// +// Copyright © 2017 Arm Ltd. All rights reserved. +// SPDX-License-Identifier: MIT +// + +#pragma once + +#include <backendsCommon/Workload.hpp> +#include <backendsCommon/WorkloadData.hpp> + +namespace armnn +{ + +class RefAbsWorkload : public BaseWorkload<AbsQueueDescriptor> +{ +public: + using BaseWorkload<AbsQueueDescriptor>::BaseWorkload; + virtual void Execute() const override; +}; + +} //namespace armnn diff --git a/src/backends/reference/workloads/RefWorkloads.hpp b/src/backends/reference/workloads/RefWorkloads.hpp index e86dccd5bf..1ec349ee22 100644 --- a/src/backends/reference/workloads/RefWorkloads.hpp +++ b/src/backends/reference/workloads/RefWorkloads.hpp @@ -5,6 +5,7 @@ #pragma once +#include "Abs.hpp" #include "Activation.hpp" #include "BatchNormImpl.hpp" #include "ConvImpl.hpp" @@ -13,6 +14,7 @@ #include "FullyConnected.hpp" #include "Gather.hpp" #include "Pooling2d.hpp" +#include "RefAbsWorkload.hpp" #include "RefActivationWorkload.hpp" #include "RefBatchNormalizationWorkload.hpp" #include "RefBatchToSpaceNdWorkload.hpp" |