aboutsummaryrefslogtreecommitdiff
path: root/src/backends/neon/workloads
diff options
context:
space:
mode:
Diffstat (limited to 'src/backends/neon/workloads')
-rw-r--r--src/backends/neon/workloads/CMakeLists.txt4
-rw-r--r--src/backends/neon/workloads/NeonConcatWorkload.cpp (renamed from src/backends/neon/workloads/NeonMergerWorkload.cpp)10
-rw-r--r--src/backends/neon/workloads/NeonConcatWorkload.hpp (renamed from src/backends/neon/workloads/NeonMergerWorkload.hpp)6
-rw-r--r--src/backends/neon/workloads/NeonWorkloads.hpp2
4 files changed, 11 insertions, 11 deletions
diff --git a/src/backends/neon/workloads/CMakeLists.txt b/src/backends/neon/workloads/CMakeLists.txt
index 3bbf64d4fb..f1c773dc4c 100644
--- a/src/backends/neon/workloads/CMakeLists.txt
+++ b/src/backends/neon/workloads/CMakeLists.txt
@@ -10,6 +10,8 @@ list(APPEND armnnNeonBackendWorkloads_sources
NeonAdditionWorkload.hpp
NeonBatchNormalizationWorkload.cpp
NeonBatchNormalizationWorkload.hpp
+ NeonConcatWorkload.cpp
+ NeonConcatWorkload.hpp
NeonConstantWorkload.cpp
NeonConstantWorkload.hpp
NeonConvertFp16ToFp32Workload.cpp
@@ -34,8 +36,6 @@ list(APPEND armnnNeonBackendWorkloads_sources
NeonMaximumWorkload.hpp
NeonMeanWorkload.cpp
NeonMeanWorkload.hpp
- NeonMergerWorkload.cpp
- NeonMergerWorkload.hpp
NeonMinimumWorkload.cpp
NeonMinimumWorkload.hpp
NeonMultiplicationWorkload.cpp
diff --git a/src/backends/neon/workloads/NeonMergerWorkload.cpp b/src/backends/neon/workloads/NeonConcatWorkload.cpp
index 64d4d93d97..91f81090ce 100644
--- a/src/backends/neon/workloads/NeonMergerWorkload.cpp
+++ b/src/backends/neon/workloads/NeonConcatWorkload.cpp
@@ -3,7 +3,7 @@
// SPDX-License-Identifier: MIT
//
-#include "NeonMergerWorkload.hpp"
+#include "NeonConcatWorkload.hpp"
#include "NeonWorkloadUtils.hpp"
@@ -25,7 +25,7 @@ size_t CalcAxis(const armnn::MergerDescriptor& desc)
}
} //namespace
-arm_compute::Status NeonMergerWorkloadValidate(const std::vector<const TensorInfo*>& inputs,
+arm_compute::Status NeonConcatWorkloadValidate(const std::vector<const TensorInfo*>& inputs,
const TensorInfo& output,
const MergerDescriptor& descriptor)
@@ -47,7 +47,7 @@ arm_compute::Status NeonMergerWorkloadValidate(const std::vector<const TensorInf
return arm_compute::NEConcatenateLayer::validate(aclInputPtrs, &aclOutputInfo, aclAxis);
}
-NeonMergerWorkload::NeonMergerWorkload(
+NeonConcatWorkload::NeonConcatWorkload(
const MergerQueueDescriptor& descriptor, const WorkloadInfo& info)
: BaseWorkload<MergerQueueDescriptor>(descriptor, info)
{
@@ -90,11 +90,11 @@ const MergerQueueDescriptor& descriptor, const WorkloadInfo& info)
m_Layer->prepare();
}
-void NeonMergerWorkload::Execute() const
+void NeonConcatWorkload::Execute() const
{
if (m_Layer)
{
- ARMNN_SCOPED_PROFILING_EVENT_NEON("NeonMergerWorkload_Execute");
+ ARMNN_SCOPED_PROFILING_EVENT_NEON("NeonConcatWorkload_Execute");
m_Layer->run();
}
}
diff --git a/src/backends/neon/workloads/NeonMergerWorkload.hpp b/src/backends/neon/workloads/NeonConcatWorkload.hpp
index 1dd9309aff..e5a8d15055 100644
--- a/src/backends/neon/workloads/NeonMergerWorkload.hpp
+++ b/src/backends/neon/workloads/NeonConcatWorkload.hpp
@@ -15,14 +15,14 @@
namespace armnn
{
-arm_compute::Status NeonMergerWorkloadValidate(const std::vector<const TensorInfo*>& inputs,
+arm_compute::Status NeonConcatWorkloadValidate(const std::vector<const TensorInfo*>& inputs,
const TensorInfo& output,
const MergerDescriptor& descriptor);
-class NeonMergerWorkload : public BaseWorkload<MergerQueueDescriptor>
+class NeonConcatWorkload : public BaseWorkload<MergerQueueDescriptor>
{
public:
- NeonMergerWorkload(const MergerQueueDescriptor& descriptor, const WorkloadInfo& info);
+ NeonConcatWorkload(const MergerQueueDescriptor& descriptor, const WorkloadInfo& info);
using BaseWorkload<MergerQueueDescriptor>::BaseWorkload;
void Execute() const override;
diff --git a/src/backends/neon/workloads/NeonWorkloads.hpp b/src/backends/neon/workloads/NeonWorkloads.hpp
index 04ea14eff7..dc02aecfd7 100644
--- a/src/backends/neon/workloads/NeonWorkloads.hpp
+++ b/src/backends/neon/workloads/NeonWorkloads.hpp
@@ -19,7 +19,7 @@
#include "NeonLstmFloatWorkload.hpp"
#include "NeonMaximumWorkload.hpp"
#include "NeonMeanWorkload.hpp"
-#include "NeonMergerWorkload.hpp"
+#include "NeonConcatWorkload.hpp"
#include "NeonMinimumWorkload.hpp"
#include "NeonMultiplicationWorkload.hpp"
#include "NeonNormalizationFloatWorkload.hpp"