diff options
Diffstat (limited to 'src/backends/cl/workloads')
-rw-r--r-- | src/backends/cl/workloads/CMakeLists.txt | 6 | ||||
-rw-r--r-- | src/backends/cl/workloads/ClActivationUint8Workload.cpp | 44 | ||||
-rw-r--r-- | src/backends/cl/workloads/ClActivationUint8Workload.hpp | 29 | ||||
-rw-r--r-- | src/backends/cl/workloads/ClActivationWorkload.cpp (renamed from src/backends/cl/workloads/ClActivationFloatWorkload.cpp) | 21 | ||||
-rw-r--r-- | src/backends/cl/workloads/ClActivationWorkload.hpp (renamed from src/backends/cl/workloads/ClActivationFloatWorkload.hpp) | 5 | ||||
-rw-r--r-- | src/backends/cl/workloads/ClWorkloads.hpp | 3 |
6 files changed, 17 insertions, 91 deletions
diff --git a/src/backends/cl/workloads/CMakeLists.txt b/src/backends/cl/workloads/CMakeLists.txt index 1e19bf5bf9..7ff04a774f 100644 --- a/src/backends/cl/workloads/CMakeLists.txt +++ b/src/backends/cl/workloads/CMakeLists.txt @@ -4,10 +4,8 @@ # list(APPEND armnnClBackendWorkloads_sources - ClActivationFloatWorkload.cpp - ClActivationFloatWorkload.hpp - ClActivationUint8Workload.cpp - ClActivationUint8Workload.hpp + ClActivationWorkload.cpp + ClActivationWorkload.hpp ClAdditionWorkload.cpp ClAdditionWorkload.hpp ClBaseMergerWorkload.hpp diff --git a/src/backends/cl/workloads/ClActivationUint8Workload.cpp b/src/backends/cl/workloads/ClActivationUint8Workload.cpp deleted file mode 100644 index ad6b73074b..0000000000 --- a/src/backends/cl/workloads/ClActivationUint8Workload.cpp +++ /dev/null @@ -1,44 +0,0 @@ -// -// Copyright © 2017 Arm Ltd. All rights reserved. -// SPDX-License-Identifier: MIT -// - -#include "ClActivationUint8Workload.hpp" -#include <backends/cl/ClLayerSupport.hpp> - -#include <backends/aclCommon/ArmComputeUtils.hpp> -#include <backends/cl/ClTensorHandle.hpp> -#include <backends/CpuTensorHandle.hpp> - -#include "ClWorkloadUtils.hpp" - -namespace armnn -{ - -ClActivationUint8Workload::ClActivationUint8Workload(const ActivationQueueDescriptor& descriptor, - const WorkloadInfo& info) - : Uint8Workload<ActivationQueueDescriptor>(descriptor, info) -{ - auto activation = ConvertActivationFunctionToAclActivationFunction(m_Data.m_Parameters.m_Function); - arm_compute::ActivationLayerInfo layerInfo(activation, - m_Data.m_Parameters.m_A, - m_Data.m_Parameters.m_B); - - m_Data.ValidateInputsOutputs("ClActivationUint8Workload", 1, 1); - - arm_compute::ICLTensor& input = static_cast<ClTensorHandle*>(m_Data.m_Inputs[0])->GetTensor(); - arm_compute::ICLTensor& output = static_cast<ClTensorHandle*>(m_Data.m_Outputs[0])->GetTensor(); - - m_ActivationLayer.configure(&input, &output, layerInfo); -} - -void ClActivationUint8Workload::Execute() const -{ - ARMNN_SCOPED_PROFILING_EVENT_CL("ClActivationUint8Workload_Execute"); - - m_ActivationLayer.run(); -} - -} //namespace Armnn - - diff --git a/src/backends/cl/workloads/ClActivationUint8Workload.hpp b/src/backends/cl/workloads/ClActivationUint8Workload.hpp deleted file mode 100644 index d0b7d3a78f..0000000000 --- a/src/backends/cl/workloads/ClActivationUint8Workload.hpp +++ /dev/null @@ -1,29 +0,0 @@ -// -// Copyright © 2017 Arm Ltd. All rights reserved. -// SPDX-License-Identifier: MIT -// - -#pragma once - -#include <backends/Workload.hpp> - -#include <arm_compute/runtime/CL/CLFunctions.h> - -namespace armnn -{ - -// Activation layer execution. -class ClActivationUint8Workload : public Uint8Workload<ActivationQueueDescriptor> -{ -public: - ClActivationUint8Workload(const ActivationQueueDescriptor& descriptor, const WorkloadInfo& info); - void Execute() const override; - -private: - mutable arm_compute::CLActivationLayer m_ActivationLayer; -}; - -} //namespace armnn - - - diff --git a/src/backends/cl/workloads/ClActivationFloatWorkload.cpp b/src/backends/cl/workloads/ClActivationWorkload.cpp index cbaac9d226..426af9f16d 100644 --- a/src/backends/cl/workloads/ClActivationFloatWorkload.cpp +++ b/src/backends/cl/workloads/ClActivationWorkload.cpp @@ -3,12 +3,15 @@ // SPDX-License-Identifier: MIT // -#include "ClActivationFloatWorkload.hpp" -#include <backends/cl/ClTensorHandle.hpp> -#include <backends/aclCommon/ArmComputeUtils.hpp> +#include "ClActivationWorkload.hpp" #include "ClWorkloadUtils.hpp" +#include <backends/CpuTensorHandle.hpp> +#include <backends/cl/ClLayerSupport.hpp> +#include <backends/cl/ClTensorHandle.hpp> +#include <backends/aclCommon/ArmComputeUtils.hpp> + namespace armnn { arm_compute::Status ClActivationWorkloadValidate(const TensorInfo& input, @@ -33,11 +36,11 @@ arm_compute::Status ClActivationWorkloadValidate(const TensorInfo& input, activationLayerInfo); } -ClActivationFloatWorkload::ClActivationFloatWorkload(const ActivationQueueDescriptor& descriptor, - const WorkloadInfo& info) - : FloatWorkload<ActivationQueueDescriptor>(descriptor, info) +ClActivationWorkload::ClActivationWorkload(const ActivationQueueDescriptor& descriptor, + const WorkloadInfo& info) + : BaseWorkload<ActivationQueueDescriptor>(descriptor, info) { - m_Data.ValidateInputsOutputs("ClActivationFloatWorkload", 1, 1); + m_Data.ValidateInputsOutputs("ClActivationWorkload", 1, 1); const arm_compute::ActivationLayerInfo activationLayerInfo = ConvertActivationDescriptorToAclActivationLayerInfo(m_Data.m_Parameters); @@ -47,9 +50,9 @@ ClActivationFloatWorkload::ClActivationFloatWorkload(const ActivationQueueDescri m_ActivationLayer.configure(&input, &output, activationLayerInfo); } -void ClActivationFloatWorkload::Execute() const +void ClActivationWorkload::Execute() const { - ARMNN_SCOPED_PROFILING_EVENT_CL("ClActivationFloatWorkload_Execute"); + ARMNN_SCOPED_PROFILING_EVENT_CL("ClActivationWorkload_Execute"); m_ActivationLayer.run(); } diff --git a/src/backends/cl/workloads/ClActivationFloatWorkload.hpp b/src/backends/cl/workloads/ClActivationWorkload.hpp index cb560a791b..c1f6de2601 100644 --- a/src/backends/cl/workloads/ClActivationFloatWorkload.hpp +++ b/src/backends/cl/workloads/ClActivationWorkload.hpp @@ -15,11 +15,10 @@ arm_compute::Status ClActivationWorkloadValidate(const TensorInfo& input, const TensorInfo& output, const ActivationDescriptor& descriptor); -// Activation layer execution. -class ClActivationFloatWorkload : public FloatWorkload<ActivationQueueDescriptor> +class ClActivationWorkload : public BaseWorkload<ActivationQueueDescriptor> { public: - ClActivationFloatWorkload(const ActivationQueueDescriptor& descriptor, const WorkloadInfo& info); + ClActivationWorkload(const ActivationQueueDescriptor& descriptor, const WorkloadInfo& info); void Execute() const override; private: diff --git a/src/backends/cl/workloads/ClWorkloads.hpp b/src/backends/cl/workloads/ClWorkloads.hpp index e03f6a5955..a01d9d809c 100644 --- a/src/backends/cl/workloads/ClWorkloads.hpp +++ b/src/backends/cl/workloads/ClWorkloads.hpp @@ -4,8 +4,7 @@ // #pragma once -#include "ClActivationFloatWorkload.hpp" -#include "ClActivationUint8Workload.hpp" +#include "ClActivationWorkload.hpp" #include "ClAdditionWorkload.hpp" #include "ClConstantWorkload.hpp" #include "ClBaseMergerWorkload.hpp" |