commit 6905941332e243c518bc30ed18c5a222fb50a90a
author Jim Flynn <jim.flynn@arm.com> Fri May 17 13:03:57 2019 +0100
committer Derek Lamberti <derek.lamberti@arm.com> Mon May 20 08:00:07 2019 +0000
tree 6e98379a891a3415fb788f966d74538c33a99447
parent 4ed34edd7fbc6569d7ba0bc7188efa287d42e239

IVGCVSW-3117 Rename ClMergerWorkload to ClConcatWorkload

Change-Id: Ie0394336a772afa7b075eb562ac5191c8b3ec9f3
Signed-off-by: Jim Flynn <jim.flynn@arm.com>

src/backends/cl/workloads/CMakeLists.txt

diff --git a/src/backends/cl/workloads/CMakeLists.txt b/src/backends/cl/workloads/CMakeLists.txt
index d5dccb6..abbed0e 100644
--- a/src/backends/cl/workloads/CMakeLists.txt
+++ b/src/backends/cl/workloads/CMakeLists.txt
@@ -12,6 +12,8 @@
     ClBatchNormalizationFloatWorkload.hpp
     ClBatchToSpaceNdWorkload.cpp
     ClBatchToSpaceNdWorkload.hpp
+    ClConcatWorkload.cpp
+    ClConcatWorkload.hpp
     ClConstantWorkload.cpp
     ClConstantWorkload.hpp
     ClConvertFp16ToFp32Workload.cpp
@@ -38,8 +40,6 @@
     ClMaximumWorkload.hpp
     ClMeanWorkload.cpp
     ClMeanWorkload.hpp
-    ClMergerWorkload.cpp
-    ClMergerWorkload.hpp
     ClMinimumWorkload.cpp
     ClMinimumWorkload.hpp
     ClMultiplicationWorkload.cpp

src/backends/cl/workloads/ClConcatWorkload.cpp

diff --git a/src/backends/cl/workloads/ClMergerWorkload.cpp b/src/backends/cl/workloads/ClConcatWorkload.cpp
similarity index 91%
rename from src/backends/cl/workloads/ClMergerWorkload.cpp
rename to src/backends/cl/workloads/ClConcatWorkload.cpp
index 610acb9..ee4ba6b 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 @@
 }
 } //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 @@
     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 @@
     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();
     }
 }

src/backends/cl/workloads/ClConcatWorkload.hpp

diff --git a/src/backends/cl/workloads/ClMergerWorkload.hpp b/src/backends/cl/workloads/ClConcatWorkload.hpp
similarity index 74%
rename from src/backends/cl/workloads/ClMergerWorkload.hpp
rename to src/backends/cl/workloads/ClConcatWorkload.hpp
index 1c2f823..106193d 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;
 

src/backends/cl/workloads/ClWorkloads.hpp

diff --git a/src/backends/cl/workloads/ClWorkloads.hpp b/src/backends/cl/workloads/ClWorkloads.hpp
index 36f2b90..7e0170c 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"