diff options
Diffstat (limited to 'src/backends')
-rw-r--r-- | src/backends/cl/ClLayerSupport.cpp | 4 | ||||
-rw-r--r-- | src/backends/cl/ClWorkloadFactory.cpp | 2 | ||||
-rw-r--r-- | src/backends/cl/backend.mk | 2 | ||||
-rw-r--r-- | src/backends/cl/test/ClCreateWorkloadTests.cpp | 14 | ||||
-rw-r--r-- | src/backends/cl/workloads/CMakeLists.txt | 4 | ||||
-rw-r--r-- | src/backends/cl/workloads/ClConcatWorkload.cpp (renamed from src/backends/cl/workloads/ClMergerWorkload.cpp) | 10 | ||||
-rw-r--r-- | src/backends/cl/workloads/ClConcatWorkload.hpp (renamed from src/backends/cl/workloads/ClMergerWorkload.hpp) | 6 | ||||
-rw-r--r-- | src/backends/cl/workloads/ClWorkloads.hpp | 2 |
8 files changed, 22 insertions, 22 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, diff --git a/src/backends/cl/ClWorkloadFactory.cpp b/src/backends/cl/ClWorkloadFactory.cpp index e4097a1b50..400926966e 100644 --- a/src/backends/cl/ClWorkloadFactory.cpp +++ b/src/backends/cl/ClWorkloadFactory.cpp @@ -158,7 +158,7 @@ std::unique_ptr<IWorkload> ClWorkloadFactory::CreateSplitter(const SplitterQueue std::unique_ptr<armnn::IWorkload> ClWorkloadFactory::CreateMerger(const MergerQueueDescriptor& descriptor, const WorkloadInfo& info) const { - return MakeWorkload<ClMergerWorkload>(descriptor, info); + return MakeWorkload<ClConcatWorkload>(descriptor, info); } std::unique_ptr<armnn::IWorkload> ClWorkloadFactory::CreateFullyConnected( diff --git a/src/backends/cl/backend.mk b/src/backends/cl/backend.mk index 283ebcad89..2dc4d9cbbf 100644 --- a/src/backends/cl/backend.mk +++ b/src/backends/cl/backend.mk @@ -24,6 +24,7 @@ BACKEND_SOURCES := \ workloads/ClAdditionWorkload.cpp \ workloads/ClBatchNormalizationFloatWorkload.cpp \ workloads/ClBatchToSpaceNdWorkload.cpp \ + workloads/ClConcatWorkload.cpp \ workloads/ClConstantWorkload.cpp \ workloads/ClConvertFp16ToFp32Workload.cpp \ workloads/ClConvertFp32ToFp16Workload.cpp \ @@ -37,7 +38,6 @@ BACKEND_SOURCES := \ workloads/ClLstmFloatWorkload.cpp \ workloads/ClMaximumWorkload.cpp \ workloads/ClMeanWorkload.cpp \ - workloads/ClMergerWorkload.cpp \ workloads/ClMinimumWorkload.cpp \ workloads/ClMultiplicationWorkload.cpp \ workloads/ClNormalizationFloatWorkload.cpp \ diff --git a/src/backends/cl/test/ClCreateWorkloadTests.cpp b/src/backends/cl/test/ClCreateWorkloadTests.cpp index c5f685dc94..7f08b80a14 100644 --- a/src/backends/cl/test/ClCreateWorkloadTests.cpp +++ b/src/backends/cl/test/ClCreateWorkloadTests.cpp @@ -564,7 +564,7 @@ static void ClSplitterMergerTest() ClWorkloadFactoryHelper::GetFactory(ClWorkloadFactoryHelper::GetMemoryManager()); auto workloads = - CreateSplitterMergerWorkloadTest<ClSplitterWorkload, ClMergerWorkload, DataType> + CreateSplitterMergerWorkloadTest<ClSplitterWorkload, ClConcatWorkload, DataType> (factory, graph); auto wlSplitter = std::move(workloads.first); @@ -823,32 +823,32 @@ static void ClCreateMergerWorkloadTest(std::initializer_list<unsigned int> outpu BOOST_AUTO_TEST_CASE(CreateMergerDim0Float32Workload) { - ClCreateMergerWorkloadTest<ClMergerWorkload, armnn::DataType::Float32>({ 4, 3, 2, 5 }, 0); + ClCreateMergerWorkloadTest<ClConcatWorkload, armnn::DataType::Float32>({ 4, 3, 2, 5 }, 0); } BOOST_AUTO_TEST_CASE(CreateMergerDim1Float32Workload) { - ClCreateMergerWorkloadTest<ClMergerWorkload, armnn::DataType::Float32>({ 2, 6, 2, 5 }, 1); + ClCreateMergerWorkloadTest<ClConcatWorkload, armnn::DataType::Float32>({ 2, 6, 2, 5 }, 1); } BOOST_AUTO_TEST_CASE(CreateMergerDim3Float32Workload) { - ClCreateMergerWorkloadTest<ClMergerWorkload, armnn::DataType::Float32>({ 2, 3, 2, 10 }, 3); + ClCreateMergerWorkloadTest<ClConcatWorkload, armnn::DataType::Float32>({ 2, 3, 2, 10 }, 3); } BOOST_AUTO_TEST_CASE(CreateMergerDim0Uint8Workload) { - ClCreateMergerWorkloadTest<ClMergerWorkload, armnn::DataType::QuantisedAsymm8>({ 4, 3, 2, 5 }, 0); + ClCreateMergerWorkloadTest<ClConcatWorkload, armnn::DataType::QuantisedAsymm8>({ 4, 3, 2, 5 }, 0); } BOOST_AUTO_TEST_CASE(CreateMergerDim1Uint8Workload) { - ClCreateMergerWorkloadTest<ClMergerWorkload, armnn::DataType::QuantisedAsymm8>({ 2, 6, 2, 5 }, 1); + ClCreateMergerWorkloadTest<ClConcatWorkload, armnn::DataType::QuantisedAsymm8>({ 2, 6, 2, 5 }, 1); } BOOST_AUTO_TEST_CASE(CreateMergerDim3Uint8Workload) { - ClCreateMergerWorkloadTest<ClMergerWorkload, armnn::DataType::QuantisedAsymm8>({ 2, 3, 2, 10 }, 3); + ClCreateMergerWorkloadTest<ClConcatWorkload, armnn::DataType::QuantisedAsymm8>({ 2, 3, 2, 10 }, 3); } BOOST_AUTO_TEST_SUITE_END() diff --git a/src/backends/cl/workloads/CMakeLists.txt b/src/backends/cl/workloads/CMakeLists.txt index d5dccb607c..abbed0e754 100644 --- a/src/backends/cl/workloads/CMakeLists.txt +++ b/src/backends/cl/workloads/CMakeLists.txt @@ -12,6 +12,8 @@ list(APPEND armnnClBackendWorkloads_sources ClBatchNormalizationFloatWorkload.hpp ClBatchToSpaceNdWorkload.cpp ClBatchToSpaceNdWorkload.hpp + ClConcatWorkload.cpp + ClConcatWorkload.hpp ClConstantWorkload.cpp ClConstantWorkload.hpp ClConvertFp16ToFp32Workload.cpp @@ -38,8 +40,6 @@ list(APPEND armnnClBackendWorkloads_sources ClMaximumWorkload.hpp ClMeanWorkload.cpp ClMeanWorkload.hpp - ClMergerWorkload.cpp - ClMergerWorkload.hpp ClMinimumWorkload.cpp ClMinimumWorkload.hpp ClMultiplicationWorkload.cpp diff --git a/src/backends/cl/workloads/ClMergerWorkload.cpp b/src/backends/cl/workloads/ClConcatWorkload.cpp index 610acb91fb..ee4ba6b65f 100644 --- a/src/backends/cl/workloads/ClMergerWorkload.cpp +++ b/src/backends/cl/workloads/ClConcatWorkload.cpp @@ -2,7 +2,7 @@ // Copyright © 2017 Arm Ltd. All rights reserved. // SPDX-License-Identifier: MIT // -#include "ClMergerWorkload.hpp" +#include "ClConcatWorkload.hpp" #include "ClWorkloadUtils.hpp" #include <aclCommon/ArmComputeTensorUtils.hpp> #include <backendsCommon/CpuTensorHandle.hpp> @@ -25,7 +25,7 @@ size_t CalcAxis(const MergerDescriptor& desc) } } //namespace -arm_compute::Status ClMergerWorkloadValidate(const std::vector<const TensorInfo*>& inputs, +arm_compute::Status ClConcatWorkloadValidate(const std::vector<const TensorInfo*>& inputs, const TensorInfo& output, const MergerDescriptor& descriptor) { @@ -46,7 +46,7 @@ arm_compute::Status ClMergerWorkloadValidate(const std::vector<const TensorInfo* return arm_compute::CLConcatenateLayer::validate(aclInputPtrs, &aclOutputInfo, aclAxis); } -ClMergerWorkload::ClMergerWorkload(const MergerQueueDescriptor& descriptor, const WorkloadInfo& info) +ClConcatWorkload::ClConcatWorkload(const MergerQueueDescriptor& descriptor, const WorkloadInfo& info) : BaseWorkload<MergerQueueDescriptor>(descriptor, info) { bool allInputsAreSubtensors = true; @@ -88,11 +88,11 @@ ClMergerWorkload::ClMergerWorkload(const MergerQueueDescriptor& descriptor, cons m_Layer->prepare(); } -void ClMergerWorkload::Execute() const +void ClConcatWorkload::Execute() const { if (m_Layer) { - ARMNN_SCOPED_PROFILING_EVENT_CL("ClMergerWorkload_Execute"); + ARMNN_SCOPED_PROFILING_EVENT_CL("ClConcatWorkload_Execute"); m_Layer->run(); } } diff --git a/src/backends/cl/workloads/ClMergerWorkload.hpp b/src/backends/cl/workloads/ClConcatWorkload.hpp index 1c2f823b7a..106193d090 100644 --- a/src/backends/cl/workloads/ClMergerWorkload.hpp +++ b/src/backends/cl/workloads/ClConcatWorkload.hpp @@ -12,14 +12,14 @@ namespace armnn { -arm_compute::Status ClMergerWorkloadValidate(const std::vector<const TensorInfo*>& inputs, +arm_compute::Status ClConcatWorkloadValidate(const std::vector<const TensorInfo*>& inputs, const TensorInfo& output, const MergerDescriptor& descriptor); -class ClMergerWorkload : public BaseWorkload<MergerQueueDescriptor> +class ClConcatWorkload : public BaseWorkload<MergerQueueDescriptor> { public: - ClMergerWorkload(const MergerQueueDescriptor& descriptor, const WorkloadInfo& info); + ClConcatWorkload(const MergerQueueDescriptor& descriptor, const WorkloadInfo& info); void Execute() const override; diff --git a/src/backends/cl/workloads/ClWorkloads.hpp b/src/backends/cl/workloads/ClWorkloads.hpp index 36f2b90609..7e0170cac3 100644 --- a/src/backends/cl/workloads/ClWorkloads.hpp +++ b/src/backends/cl/workloads/ClWorkloads.hpp @@ -17,7 +17,7 @@ #include "ClGreaterWorkload.hpp" #include "ClL2NormalizationFloatWorkload.hpp" #include "ClLstmFloatWorkload.hpp" -#include "ClMergerWorkload.hpp" +#include "ClConcatWorkload.hpp" #include "ClMaximumWorkload.hpp" #include "ClMeanWorkload.hpp" #include "ClMinimumWorkload.hpp" |