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/ClLayerSupport.cpp | |
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/ClLayerSupport.cpp')
-rw-r--r-- | src/backends/cl/ClLayerSupport.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/backends/cl/ClLayerSupport.cpp b/src/backends/cl/ClLayerSupport.cpp index a557870cea..2ce5179045 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 @@ bool ClLayerSupport::IsMergerSupported(const std::vector<const TensorInfo*> inpu 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, |