diff options
-rw-r--r-- | src/backends/neon/NeonLayerSupport.cpp | 4 | ||||
-rw-r--r-- | src/backends/neon/NeonWorkloadFactory.cpp | 2 | ||||
-rw-r--r-- | src/backends/neon/backend.mk | 2 | ||||
-rw-r--r-- | src/backends/neon/test/NeonCreateWorkloadTests.cpp | 14 | ||||
-rw-r--r-- | src/backends/neon/workloads/CMakeLists.txt | 4 | ||||
-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.hpp | 2 |
8 files changed, 22 insertions, 22 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, diff --git a/src/backends/neon/NeonWorkloadFactory.cpp b/src/backends/neon/NeonWorkloadFactory.cpp index 8db5f9ad84..c49ff3a36c 100644 --- a/src/backends/neon/NeonWorkloadFactory.cpp +++ b/src/backends/neon/NeonWorkloadFactory.cpp @@ -123,7 +123,7 @@ std::unique_ptr<IWorkload> NeonWorkloadFactory::CreateSplitter(const SplitterQue std::unique_ptr<armnn::IWorkload> NeonWorkloadFactory::CreateMerger(const MergerQueueDescriptor& descriptor, const WorkloadInfo& info) const { - return std::make_unique<NeonMergerWorkload>(descriptor, info); + return std::make_unique<NeonConcatWorkload>(descriptor, info); } std::unique_ptr<armnn::IWorkload> NeonWorkloadFactory::CreateFullyConnected( diff --git a/src/backends/neon/backend.mk b/src/backends/neon/backend.mk index c06d05f3cc..6824879ac9 100644 --- a/src/backends/neon/backend.mk +++ b/src/backends/neon/backend.mk @@ -22,6 +22,7 @@ BACKEND_SOURCES := \ workloads/NeonActivationWorkload.cpp \ workloads/NeonAdditionWorkload.cpp \ workloads/NeonBatchNormalizationWorkload.cpp \ + workloads/NeonConcatWorkload.cpp \ workloads/NeonConstantWorkload.cpp \ workloads/NeonConvertFp16ToFp32Workload.cpp \ workloads/NeonConvertFp32ToFp16Workload.cpp \ @@ -34,7 +35,6 @@ BACKEND_SOURCES := \ workloads/NeonLstmFloatWorkload.cpp \ workloads/NeonMaximumWorkload.cpp \ workloads/NeonMeanWorkload.cpp \ - workloads/NeonMergerWorkload.cpp \ workloads/NeonMinimumWorkload.cpp \ workloads/NeonMultiplicationWorkload.cpp \ workloads/NeonNormalizationFloatWorkload.cpp \ diff --git a/src/backends/neon/test/NeonCreateWorkloadTests.cpp b/src/backends/neon/test/NeonCreateWorkloadTests.cpp index d4065898a8..b41d62f7eb 100644 --- a/src/backends/neon/test/NeonCreateWorkloadTests.cpp +++ b/src/backends/neon/test/NeonCreateWorkloadTests.cpp @@ -517,7 +517,7 @@ BOOST_AUTO_TEST_CASE(CreateSplitterMerger) NeonWorkloadFactoryHelper::GetFactory(NeonWorkloadFactoryHelper::GetMemoryManager()); auto workloads = - CreateSplitterMergerWorkloadTest<NeonSplitterWorkload, NeonMergerWorkload, + CreateSplitterMergerWorkloadTest<NeonSplitterWorkload, NeonConcatWorkload, DataType::Float32>(factory, graph); auto wlSplitter = std::move(workloads.first); @@ -654,32 +654,32 @@ static void NeonCreateMergerWorkloadTest(std::initializer_list<unsigned int> out BOOST_AUTO_TEST_CASE(CreateMergerDim0Float32Workload) { - NeonCreateMergerWorkloadTest<NeonMergerWorkload, armnn::DataType::Float32>({ 4, 3, 2, 5 }, 0); + NeonCreateMergerWorkloadTest<NeonConcatWorkload, armnn::DataType::Float32>({ 4, 3, 2, 5 }, 0); } BOOST_AUTO_TEST_CASE(CreateMergerDim1Float32Workload) { - NeonCreateMergerWorkloadTest<NeonMergerWorkload, armnn::DataType::Float32>({ 2, 6, 2, 5 }, 1); + NeonCreateMergerWorkloadTest<NeonConcatWorkload, armnn::DataType::Float32>({ 2, 6, 2, 5 }, 1); } BOOST_AUTO_TEST_CASE(CreateMergerDim3Float32Workload) { - NeonCreateMergerWorkloadTest<NeonMergerWorkload, armnn::DataType::Float32>({ 2, 3, 2, 10 }, 3); + NeonCreateMergerWorkloadTest<NeonConcatWorkload, armnn::DataType::Float32>({ 2, 3, 2, 10 }, 3); } BOOST_AUTO_TEST_CASE(CreateMergerDim0Uint8Workload) { - NeonCreateMergerWorkloadTest<NeonMergerWorkload, armnn::DataType::QuantisedAsymm8>({ 4, 3, 2, 5 }, 0); + NeonCreateMergerWorkloadTest<NeonConcatWorkload, armnn::DataType::QuantisedAsymm8>({ 4, 3, 2, 5 }, 0); } BOOST_AUTO_TEST_CASE(CreateMergerDim1Uint8Workload) { - NeonCreateMergerWorkloadTest<NeonMergerWorkload, armnn::DataType::QuantisedAsymm8>({ 2, 6, 2, 5 }, 1); + NeonCreateMergerWorkloadTest<NeonConcatWorkload, armnn::DataType::QuantisedAsymm8>({ 2, 6, 2, 5 }, 1); } BOOST_AUTO_TEST_CASE(CreateMergerDim3Uint8Workload) { - NeonCreateMergerWorkloadTest<NeonMergerWorkload, armnn::DataType::QuantisedAsymm8>({ 2, 3, 2, 10 }, 3); + NeonCreateMergerWorkloadTest<NeonConcatWorkload, armnn::DataType::QuantisedAsymm8>({ 2, 3, 2, 10 }, 3); } BOOST_AUTO_TEST_SUITE_END() 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" |