diff options
author | Jim Flynn <jim.flynn@arm.com> | 2019-05-17 13:03:57 +0100 |
---|---|---|
committer | Derek Lamberti <derek.lamberti@arm.com> | 2019-05-20 08:00:07 +0000 |
commit | 6905941332e243c518bc30ed18c5a222fb50a90a (patch) | |
tree | 6e98379a891a3415fb788f966d74538c33a99447 /src/backends/cl/workloads | |
parent | 4ed34edd7fbc6569d7ba0bc7188efa287d42e239 (diff) | |
download | armnn-6905941332e243c518bc30ed18c5a222fb50a90a.tar.gz |
IVGCVSW-3117 Rename ClMergerWorkload to ClConcatWorkload
Change-Id: Ie0394336a772afa7b075eb562ac5191c8b3ec9f3
Signed-off-by: Jim Flynn <jim.flynn@arm.com>
Diffstat (limited to 'src/backends/cl/workloads')
-rw-r--r-- | src/backends/cl/workloads/CMakeLists.txt | 4 | ||||
-rw-r--r-- | src/backends/cl/workloads/ClConcatWorkload.cpp (renamed from src/backends/cl/workloads/ClMergerWorkload.cpp) | 10 | ||||
-rw-r--r-- | src/backends/cl/workloads/ClConcatWorkload.hpp (renamed from src/backends/cl/workloads/ClMergerWorkload.hpp) | 6 | ||||
-rw-r--r-- | src/backends/cl/workloads/ClWorkloads.hpp | 2 |
4 files changed, 11 insertions, 11 deletions
diff --git a/src/backends/cl/workloads/CMakeLists.txt b/src/backends/cl/workloads/CMakeLists.txt index d5dccb607c..abbed0e754 100644 --- a/src/backends/cl/workloads/CMakeLists.txt +++ b/src/backends/cl/workloads/CMakeLists.txt @@ -12,6 +12,8 @@ list(APPEND armnnClBackendWorkloads_sources ClBatchNormalizationFloatWorkload.hpp ClBatchToSpaceNdWorkload.cpp ClBatchToSpaceNdWorkload.hpp + ClConcatWorkload.cpp + ClConcatWorkload.hpp ClConstantWorkload.cpp ClConstantWorkload.hpp ClConvertFp16ToFp32Workload.cpp @@ -38,8 +40,6 @@ list(APPEND armnnClBackendWorkloads_sources ClMaximumWorkload.hpp ClMeanWorkload.cpp ClMeanWorkload.hpp - ClMergerWorkload.cpp - ClMergerWorkload.hpp ClMinimumWorkload.cpp ClMinimumWorkload.hpp ClMultiplicationWorkload.cpp diff --git a/src/backends/cl/workloads/ClMergerWorkload.cpp b/src/backends/cl/workloads/ClConcatWorkload.cpp index 610acb91fb..ee4ba6b65f 100644 --- a/src/backends/cl/workloads/ClMergerWorkload.cpp +++ b/src/backends/cl/workloads/ClConcatWorkload.cpp @@ -2,7 +2,7 @@ // Copyright © 2017 Arm Ltd. All rights reserved. // SPDX-License-Identifier: MIT // -#include "ClMergerWorkload.hpp" +#include "ClConcatWorkload.hpp" #include "ClWorkloadUtils.hpp" #include <aclCommon/ArmComputeTensorUtils.hpp> #include <backendsCommon/CpuTensorHandle.hpp> @@ -25,7 +25,7 @@ size_t CalcAxis(const MergerDescriptor& desc) } } //namespace -arm_compute::Status ClMergerWorkloadValidate(const std::vector<const TensorInfo*>& inputs, +arm_compute::Status ClConcatWorkloadValidate(const std::vector<const TensorInfo*>& inputs, const TensorInfo& output, const MergerDescriptor& descriptor) { @@ -46,7 +46,7 @@ arm_compute::Status ClMergerWorkloadValidate(const std::vector<const TensorInfo* return arm_compute::CLConcatenateLayer::validate(aclInputPtrs, &aclOutputInfo, aclAxis); } -ClMergerWorkload::ClMergerWorkload(const MergerQueueDescriptor& descriptor, const WorkloadInfo& info) +ClConcatWorkload::ClConcatWorkload(const MergerQueueDescriptor& descriptor, const WorkloadInfo& info) : BaseWorkload<MergerQueueDescriptor>(descriptor, info) { bool allInputsAreSubtensors = true; @@ -88,11 +88,11 @@ ClMergerWorkload::ClMergerWorkload(const MergerQueueDescriptor& descriptor, cons m_Layer->prepare(); } -void ClMergerWorkload::Execute() const +void ClConcatWorkload::Execute() const { if (m_Layer) { - ARMNN_SCOPED_PROFILING_EVENT_CL("ClMergerWorkload_Execute"); + ARMNN_SCOPED_PROFILING_EVENT_CL("ClConcatWorkload_Execute"); m_Layer->run(); } } diff --git a/src/backends/cl/workloads/ClMergerWorkload.hpp b/src/backends/cl/workloads/ClConcatWorkload.hpp index 1c2f823b7a..106193d090 100644 --- a/src/backends/cl/workloads/ClMergerWorkload.hpp +++ b/src/backends/cl/workloads/ClConcatWorkload.hpp @@ -12,14 +12,14 @@ namespace armnn { -arm_compute::Status ClMergerWorkloadValidate(const std::vector<const TensorInfo*>& inputs, +arm_compute::Status ClConcatWorkloadValidate(const std::vector<const TensorInfo*>& inputs, const TensorInfo& output, const MergerDescriptor& descriptor); -class ClMergerWorkload : public BaseWorkload<MergerQueueDescriptor> +class ClConcatWorkload : public BaseWorkload<MergerQueueDescriptor> { public: - ClMergerWorkload(const MergerQueueDescriptor& descriptor, const WorkloadInfo& info); + ClConcatWorkload(const MergerQueueDescriptor& descriptor, const WorkloadInfo& info); void Execute() const override; diff --git a/src/backends/cl/workloads/ClWorkloads.hpp b/src/backends/cl/workloads/ClWorkloads.hpp index 36f2b90609..7e0170cac3 100644 --- a/src/backends/cl/workloads/ClWorkloads.hpp +++ b/src/backends/cl/workloads/ClWorkloads.hpp @@ -17,7 +17,7 @@ #include "ClGreaterWorkload.hpp" #include "ClL2NormalizationFloatWorkload.hpp" #include "ClLstmFloatWorkload.hpp" -#include "ClMergerWorkload.hpp" +#include "ClConcatWorkload.hpp" #include "ClMaximumWorkload.hpp" #include "ClMeanWorkload.hpp" #include "ClMinimumWorkload.hpp" |