diff options
author | Jim Flynn <jim.flynn@arm.com> | 2019-05-17 15:44:36 +0100 |
---|---|---|
committer | Derek Lamberti <derek.lamberti@arm.com> | 2019-05-20 08:01:38 +0000 |
commit | 39d487d3e2834a6d3024c92a519d84aa05f87925 (patch) | |
tree | dfd56a61f1ea1293767a8ea452e4f3e6a74e3d56 /src/backends/neon/NeonLayerSupport.cpp | |
parent | 6905941332e243c518bc30ed18c5a222fb50a90a (diff) | |
download | armnn-39d487d3e2834a6d3024c92a519d84aa05f87925.tar.gz |
IVGCVSW-3117 Rename NeonMergerWorkload to NeonConcatWorkload
Change-Id: I9a373a31bfabbe0f691d7f9e240ac08e072b2c7d
Signed-off-by: Jim Flynn <jim.flynn@arm.com>
Diffstat (limited to 'src/backends/neon/NeonLayerSupport.cpp')
-rw-r--r-- | src/backends/neon/NeonLayerSupport.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/backends/neon/NeonLayerSupport.cpp b/src/backends/neon/NeonLayerSupport.cpp index 9bd48cf860..f4599ff8e4 100644 --- a/src/backends/neon/NeonLayerSupport.cpp +++ b/src/backends/neon/NeonLayerSupport.cpp @@ -26,7 +26,7 @@ #include "workloads/NeonL2NormalizationFloatWorkload.hpp" #include "workloads/NeonMaximumWorkload.hpp" #include "workloads/NeonMeanWorkload.hpp" -#include "workloads/NeonMergerWorkload.hpp" +#include "workloads/NeonConcatWorkload.hpp" #include "workloads/NeonMinimumWorkload.hpp" #include "workloads/NeonMultiplicationWorkload.hpp" #include "workloads/NeonNormalizationFloatWorkload.hpp" @@ -336,7 +336,7 @@ bool NeonLayerSupport::IsMergerSupported(const std::vector<const TensorInfo*> in unsigned int concatInnerAxis = (descriptor.GetNumDimensions() - descriptor.GetConcatAxis()) - 1; if(concatInnerAxis < 3) // Width, height, or channels { - FORWARD_WORKLOAD_VALIDATE_FUNC(NeonMergerWorkloadValidate, + FORWARD_WORKLOAD_VALIDATE_FUNC(NeonConcatWorkloadValidate, reasonIfUnsupported, inputs, output, |