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/ClLayerSupport.cpp

diff --git a/src/backends/cl/ClLayerSupport.cpp b/src/backends/cl/ClLayerSupport.cpp
index a557870..2ce5179 100644
--- a/src/backends/cl/ClLayerSupport.cpp
+++ b/src/backends/cl/ClLayerSupport.cpp
@@ -30,7 +30,7 @@
 #include "workloads/ClLstmFloatWorkload.hpp"
 #include "workloads/ClMaximumWorkload.hpp"
 #include "workloads/ClMeanWorkload.hpp"
-#include "workloads/ClMergerWorkload.hpp"
+#include "workloads/ClConcatWorkload.hpp"
 #include "workloads/ClMinimumWorkload.hpp"
 #include "workloads/ClMultiplicationWorkload.hpp"
 #include "workloads/ClNormalizationFloatWorkload.hpp"
@@ -452,7 +452,7 @@
     unsigned int concatInnerAxis = (descriptor.GetNumDimensions() - descriptor.GetConcatAxis()) - 1;
     if(concatInnerAxis < 3) // Width, height, or channels
     {
-        FORWARD_WORKLOAD_VALIDATE_FUNC(ClMergerWorkloadValidate,
+        FORWARD_WORKLOAD_VALIDATE_FUNC(ClConcatWorkloadValidate,
                                        reasonIfUnsupported,
                                        inputs,
                                        output,