diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/backends/cl/ClLayerSupport.cpp | 11 | ||||
-rw-r--r-- | src/backends/cl/ClLayerSupport.hpp | 4 | ||||
-rw-r--r-- | src/backends/cl/ClWorkloadFactory.cpp | 6 | ||||
-rw-r--r-- | src/backends/cl/ClWorkloadFactory.hpp | 3 | ||||
-rw-r--r-- | src/backends/cl/backend.mk | 1 | ||||
-rw-r--r-- | src/backends/cl/test/ClEndToEndTests.cpp | 8 | ||||
-rw-r--r-- | src/backends/cl/test/ClLayerTests.cpp | 6 | ||||
-rw-r--r-- | src/backends/cl/workloads/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/backends/cl/workloads/ClAbsWorkload.cpp | 44 | ||||
-rw-r--r-- | src/backends/cl/workloads/ClAbsWorkload.hpp | 28 | ||||
-rw-r--r-- | src/backends/cl/workloads/ClWorkloads.hpp | 1 |
11 files changed, 114 insertions, 0 deletions
diff --git a/src/backends/cl/ClLayerSupport.cpp b/src/backends/cl/ClLayerSupport.cpp index 625d2348be..1fd3aa532e 100644 --- a/src/backends/cl/ClLayerSupport.cpp +++ b/src/backends/cl/ClLayerSupport.cpp @@ -16,6 +16,7 @@ #if defined(ARMCOMPUTECL_ENABLED) #include <aclCommon/ArmComputeUtils.hpp> +#include "workloads/ClAbsWorkload.hpp" #include "workloads/ClAdditionWorkload.hpp" #include "workloads/ClActivationWorkload.hpp" #include "workloads/ClBatchNormalizationFloatWorkload.hpp" @@ -139,6 +140,16 @@ bool IsSupportedForDataTypeCl(Optional<std::string&> reasonIfUnsupported, } // anonymous namespace +bool ClLayerSupport::IsAbsSupported(const TensorInfo& input, + const TensorInfo& output, + Optional<std::string&> reasonIfUnsupported) const +{ + FORWARD_WORKLOAD_VALIDATE_FUNC(ClAbsWorkloadValidate, + reasonIfUnsupported, + input, + output); +} + bool ClLayerSupport::IsActivationSupported(const TensorInfo& input, const TensorInfo& output, const ActivationDescriptor& descriptor, diff --git a/src/backends/cl/ClLayerSupport.hpp b/src/backends/cl/ClLayerSupport.hpp index 69c2280a59..b19ddae769 100644 --- a/src/backends/cl/ClLayerSupport.hpp +++ b/src/backends/cl/ClLayerSupport.hpp @@ -12,6 +12,10 @@ namespace armnn class ClLayerSupport : 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/cl/ClWorkloadFactory.cpp b/src/backends/cl/ClWorkloadFactory.cpp index ca3c30d61a..7e5aecfb58 100644 --- a/src/backends/cl/ClWorkloadFactory.cpp +++ b/src/backends/cl/ClWorkloadFactory.cpp @@ -136,6 +136,12 @@ std::unique_ptr<IWorkload> ClWorkloadFactory::CreateOutput(const OutputQueueDesc return std::make_unique<CopyMemGenericWorkload>(descriptor, info); } +std::unique_ptr<IWorkload> ClWorkloadFactory::CreateAbs(const AbsQueueDescriptor& descriptor, + const WorkloadInfo& info) const +{ + return MakeWorkload<ClAbsWorkload>(descriptor, info); +} + std::unique_ptr<IWorkload> ClWorkloadFactory::CreateActivation(const ActivationQueueDescriptor& descriptor, const WorkloadInfo& info) const { diff --git a/src/backends/cl/ClWorkloadFactory.hpp b/src/backends/cl/ClWorkloadFactory.hpp index 3a55ac5a2a..493f659eab 100644 --- a/src/backends/cl/ClWorkloadFactory.hpp +++ b/src/backends/cl/ClWorkloadFactory.hpp @@ -42,6 +42,9 @@ public: std::unique_ptr<IWorkload> CreateOutput(const OutputQueueDescriptor& descriptor, const WorkloadInfo& info) const override; + std::unique_ptr<IWorkload> CreateAbs(const AbsQueueDescriptor& descriptor, + const WorkloadInfo& info) const override; + std::unique_ptr<IWorkload> CreateActivation(const ActivationQueueDescriptor& descriptor, const WorkloadInfo& info) const override; diff --git a/src/backends/cl/backend.mk b/src/backends/cl/backend.mk index 5ad7933669..797e085ea1 100644 --- a/src/backends/cl/backend.mk +++ b/src/backends/cl/backend.mk @@ -22,6 +22,7 @@ BACKEND_SOURCES := \ ClTensorHandleFactory.cpp \ ClWorkloadFactory.cpp \ OpenClTimer.cpp \ + workloads/ClAbsWorkload.cpp \ workloads/ClActivationWorkload.cpp \ workloads/ClAdditionWorkload.cpp \ workloads/ClBatchNormalizationFloatWorkload.cpp \ diff --git a/src/backends/cl/test/ClEndToEndTests.cpp b/src/backends/cl/test/ClEndToEndTests.cpp index 8b71a46352..b1e51c648f 100644 --- a/src/backends/cl/test/ClEndToEndTests.cpp +++ b/src/backends/cl/test/ClEndToEndTests.cpp @@ -5,6 +5,7 @@ #include <backendsCommon/test/EndToEndTestImpl.hpp> +#include <backendsCommon/test/AbsEndToEndTestImpl.hpp> #include <backendsCommon/test/ArithmeticTestImpl.hpp> #include <backendsCommon/test/ConcatEndToEndTestImpl.hpp> #include <backendsCommon/test/DequantizeEndToEndTestImpl.hpp> @@ -20,6 +21,13 @@ BOOST_AUTO_TEST_SUITE(ClEndToEnd) std::vector<armnn::BackendId> defaultBackends = {armnn::Compute::GpuAcc}; +// Abs +BOOST_AUTO_TEST_CASE(ClAbsEndToEndTestFloat32) +{ + AbsEndToEnd<armnn::DataType::Float32>(defaultBackends); +} + +// Constant BOOST_AUTO_TEST_CASE(ConstantUsage_Cl_Float32) { ConstantUsageFloat32Test(defaultBackends); diff --git a/src/backends/cl/test/ClLayerTests.cpp b/src/backends/cl/test/ClLayerTests.cpp index 92f8db74e3..cc1365711a 100644 --- a/src/backends/cl/test/ClLayerTests.cpp +++ b/src/backends/cl/test/ClLayerTests.cpp @@ -767,6 +767,12 @@ ARMNN_AUTO_TEST_CASE(MultiChannelTransposeConvolution2dUint8Nhwc, MultiChannelTransposeConvolution2dTest<DataType::QuantisedAsymm8, DataType::Signed32>, DataLayout::NHWC) +// 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>) + #if defined(ARMNNREF_ENABLED) // The ARMNN_COMPARE_REF_AUTO_TEST_CASE and the ARMNN_COMPARE_REF_FIXTURE_TEST_CASE test units are not available diff --git a/src/backends/cl/workloads/CMakeLists.txt b/src/backends/cl/workloads/CMakeLists.txt index f62600b983..3e2ac76266 100644 --- a/src/backends/cl/workloads/CMakeLists.txt +++ b/src/backends/cl/workloads/CMakeLists.txt @@ -4,6 +4,8 @@ # list(APPEND armnnClBackendWorkloads_sources + ClAbsWorkload.cpp + ClAbsWorkload.hpp ClActivationWorkload.cpp ClActivationWorkload.hpp ClAdditionWorkload.cpp diff --git a/src/backends/cl/workloads/ClAbsWorkload.cpp b/src/backends/cl/workloads/ClAbsWorkload.cpp new file mode 100644 index 0000000000..058c453c6b --- /dev/null +++ b/src/backends/cl/workloads/ClAbsWorkload.cpp @@ -0,0 +1,44 @@ +// +// Copyright © 2017 Arm Ltd. All rights reserved. +// SPDX-License-Identifier: MIT +// + +#include "ClAbsWorkload.hpp" + +#include "ClWorkloadUtils.hpp" + +#include <aclCommon/ArmComputeTensorUtils.hpp> + +#include <cl/ClTensorHandle.hpp> + +#include <boost/cast.hpp> + +namespace armnn +{ + +arm_compute::Status ClAbsWorkloadValidate(const TensorInfo& input, const TensorInfo& output) +{ + const arm_compute::TensorInfo aclInput = armcomputetensorutils::BuildArmComputeTensorInfo(input); + const arm_compute::TensorInfo aclOutput = armcomputetensorutils::BuildArmComputeTensorInfo(output); + + return arm_compute::CLAbsLayer::validate(&aclInput, &aclOutput); +} + +ClAbsWorkload::ClAbsWorkload(const AbsQueueDescriptor& descriptor, const WorkloadInfo& info) + : BaseWorkload<AbsQueueDescriptor>(descriptor, info) +{ + m_Data.ValidateInputsOutputs("ClAbsWorkload", 1, 1); + + arm_compute::ICLTensor& input = boost::polymorphic_downcast<ClTensorHandle*>(m_Data.m_Inputs[0])->GetTensor(); + arm_compute::ICLTensor& output = boost::polymorphic_downcast<ClTensorHandle*>(m_Data.m_Outputs[0])->GetTensor(); + + m_AbsLayer.configure(&input, &output); +} + +void ClAbsWorkload::Execute() const +{ + ARMNN_SCOPED_PROFILING_EVENT_CL("ClAbsWorkload_Execute"); + RunClFunction(m_AbsLayer, CHECK_LOCATION()); +} + +} // namespace armnn diff --git a/src/backends/cl/workloads/ClAbsWorkload.hpp b/src/backends/cl/workloads/ClAbsWorkload.hpp new file mode 100644 index 0000000000..763cafcfbd --- /dev/null +++ b/src/backends/cl/workloads/ClAbsWorkload.hpp @@ -0,0 +1,28 @@ +// +// Copyright © 2017 Arm Ltd. All rights reserved. +// SPDX-License-Identifier: MIT +// + +#pragma once + +#include <backendsCommon/Workload.hpp> + +#include <arm_compute/core/Error.h> +#include <arm_compute/runtime/CL/functions/CLElementWiseUnaryLayer.h> + +namespace armnn +{ + +arm_compute::Status ClAbsWorkloadValidate(const TensorInfo& input, const TensorInfo& output); + +class ClAbsWorkload : public BaseWorkload<AbsQueueDescriptor> +{ +public: + ClAbsWorkload(const AbsQueueDescriptor& descriptor, const WorkloadInfo& info); + virtual void Execute() const override; + +private: + mutable arm_compute::CLAbsLayer m_AbsLayer; +}; + +} // namespace armnn diff --git a/src/backends/cl/workloads/ClWorkloads.hpp b/src/backends/cl/workloads/ClWorkloads.hpp index 1af30ffb34..45030e4f98 100644 --- a/src/backends/cl/workloads/ClWorkloads.hpp +++ b/src/backends/cl/workloads/ClWorkloads.hpp @@ -4,6 +4,7 @@ // #pragma once +#include "ClAbsWorkload.hpp" #include "ClActivationWorkload.hpp" #include "ClAdditionWorkload.hpp" #include "ClConstantWorkload.hpp" |