From 4ed34edd7fbc6569d7ba0bc7188efa287d42e239 Mon Sep 17 00:00:00 2001 From: Jim Flynn Date: Fri, 17 May 2019 15:32:17 +0100 Subject: IVGCVSW-3117 Rename RefMergerWorkload to RefConcatWorkload Change-Id: Ifeb33db919ef77bf777e114f2d84b88fd595ca2c Signed-off-by: Jim Flynn --- .../backendsCommon/test/WorkloadDataValidation.cpp | 6 +++--- src/backends/reference/RefWorkloadFactory.cpp | 2 +- src/backends/reference/backend.mk | 2 +- .../reference/test/RefCreateWorkloadTests.cpp | 22 +++++++++++----------- src/backends/reference/workloads/CMakeLists.txt | 4 ++-- .../reference/workloads/RefConcatWorkload.cpp | 21 +++++++++++++++++++++ .../reference/workloads/RefConcatWorkload.hpp | 21 +++++++++++++++++++++ .../reference/workloads/RefMergerWorkload.cpp | 21 --------------------- .../reference/workloads/RefMergerWorkload.hpp | 21 --------------------- src/backends/reference/workloads/RefWorkloads.hpp | 2 +- 10 files changed, 61 insertions(+), 61 deletions(-) create mode 100644 src/backends/reference/workloads/RefConcatWorkload.cpp create mode 100644 src/backends/reference/workloads/RefConcatWorkload.hpp delete mode 100644 src/backends/reference/workloads/RefMergerWorkload.cpp delete mode 100644 src/backends/reference/workloads/RefMergerWorkload.hpp diff --git a/src/backends/backendsCommon/test/WorkloadDataValidation.cpp b/src/backends/backendsCommon/test/WorkloadDataValidation.cpp index 962701f051..3793ecf70f 100644 --- a/src/backends/backendsCommon/test/WorkloadDataValidation.cpp +++ b/src/backends/backendsCommon/test/WorkloadDataValidation.cpp @@ -269,14 +269,14 @@ BOOST_AUTO_TEST_CASE(MergerQueueDescriptor_Validate_WrongWindow) BOOST_TEST_INFO("Invalid argument exception is expected, because merge window dimensionality does not " "match input."); - BOOST_CHECK_THROW(RefMergerWorkload(invalidData, invalidInfo), armnn::InvalidArgumentException); + BOOST_CHECK_THROW(RefConcatWorkload(invalidData, invalidInfo), armnn::InvalidArgumentException); // Invalid, since window extends past the boundary of output tensor. std::vector wOrigin3 = {0, 0, 15, 0}; armnn::MergerQueueDescriptor::ViewOrigin window3(wOrigin3); invalidData.m_ViewOrigins[0] = window3; BOOST_TEST_INFO("Invalid argument exception is expected (wOrigin3[2]+ inputHeight > outputHeight"); - BOOST_CHECK_THROW(RefMergerWorkload(invalidData, invalidInfo), armnn::InvalidArgumentException); + BOOST_CHECK_THROW(RefConcatWorkload(invalidData, invalidInfo), armnn::InvalidArgumentException); std::vector wOrigin4 = {0, 0, 0, 0}; @@ -288,7 +288,7 @@ BOOST_AUTO_TEST_CASE(MergerQueueDescriptor_Validate_WrongWindow) invalidData.m_ViewOrigins.push_back(window5); BOOST_TEST_INFO("Invalid exception due to number of merge windows not matching number of inputs."); - BOOST_CHECK_THROW(RefMergerWorkload(invalidData, invalidInfo), armnn::InvalidArgumentException); + BOOST_CHECK_THROW(RefConcatWorkload(invalidData, invalidInfo), armnn::InvalidArgumentException); } BOOST_AUTO_TEST_CASE(AdditionQueueDescriptor_Validate_InputNumbers) diff --git a/src/backends/reference/RefWorkloadFactory.cpp b/src/backends/reference/RefWorkloadFactory.cpp index 5c90a43c37..8c37fabe7c 100644 --- a/src/backends/reference/RefWorkloadFactory.cpp +++ b/src/backends/reference/RefWorkloadFactory.cpp @@ -139,7 +139,7 @@ std::unique_ptr RefWorkloadFactory::CreateMerger(const MergerQ { return MakeWorkload(descriptor, info); } - return std::make_unique(descriptor, info); + return std::make_unique(descriptor, info); } std::unique_ptr RefWorkloadFactory::CreateFullyConnected( diff --git a/src/backends/reference/backend.mk b/src/backends/reference/backend.mk index a297529d60..1d635aaa21 100644 --- a/src/backends/reference/backend.mk +++ b/src/backends/reference/backend.mk @@ -29,6 +29,7 @@ BACKEND_SOURCES := \ workloads/RefBatchNormalizationUint8Workload.cpp \ workloads/RefBatchToSpaceNdFloat32Workload.cpp \ workloads/RefBatchToSpaceNdUint8Workload.cpp \ + workloads/RefConcatWorkload.cpp \ workloads/RefConstantWorkload.cpp \ workloads/RefConvertFp16ToFp32Workload.cpp \ workloads/RefConvertFp32ToFp16Workload.cpp \ @@ -50,7 +51,6 @@ BACKEND_SOURCES := \ workloads/RefLstmWorkload.cpp \ workloads/RefMeanFloat32Workload.cpp \ workloads/RefMeanUint8Workload.cpp \ - workloads/RefMergerWorkload.cpp \ workloads/RefNormalizationFloat32Workload.cpp \ workloads/RefPadWorkload.cpp \ workloads/RefPermuteWorkload.cpp \ diff --git a/src/backends/reference/test/RefCreateWorkloadTests.cpp b/src/backends/reference/test/RefCreateWorkloadTests.cpp index 788b6559f6..024bfe1e0c 100644 --- a/src/backends/reference/test/RefCreateWorkloadTests.cpp +++ b/src/backends/reference/test/RefCreateWorkloadTests.cpp @@ -479,12 +479,12 @@ static void RefCreateSplitterMergerWorkloadTest() BOOST_AUTO_TEST_CASE(CreateSplitterMergerFloat32) { - RefCreateSplitterMergerWorkloadTest(); + RefCreateSplitterMergerWorkloadTest(); } BOOST_AUTO_TEST_CASE(CreateSplitterMergerUint8) { - RefCreateSplitterMergerWorkloadTest(); + RefCreateSplitterMergerWorkloadTest(); } template @@ -658,47 +658,47 @@ static void RefCreateMergerWorkloadTest(const armnn::TensorShape& outputShape, BOOST_AUTO_TEST_CASE(CreateMergerDim0Float32Workload) { - RefCreateMergerWorkloadTest({ 4, 3, 2, 5 }, 0); + RefCreateMergerWorkloadTest({ 4, 3, 2, 5 }, 0); } BOOST_AUTO_TEST_CASE(CreateMergerDim0Uint8Workload) { - RefCreateMergerWorkloadTest({ 4, 3, 2, 5 }, 0); + RefCreateMergerWorkloadTest({ 4, 3, 2, 5 }, 0); } BOOST_AUTO_TEST_CASE(CreateMergerDim0Uint16Workload) { - RefCreateMergerWorkloadTest({ 4, 3, 2, 5 }, 0); + RefCreateMergerWorkloadTest({ 4, 3, 2, 5 }, 0); } BOOST_AUTO_TEST_CASE(CreateMergerDim1Float32Workload) { - RefCreateMergerWorkloadTest({ 2, 6, 2, 5 }, 1); + RefCreateMergerWorkloadTest({ 2, 6, 2, 5 }, 1); } BOOST_AUTO_TEST_CASE(CreateMergerDim1Uint8Workload) { - RefCreateMergerWorkloadTest({ 2, 6, 2, 5 }, 1); + RefCreateMergerWorkloadTest({ 2, 6, 2, 5 }, 1); } BOOST_AUTO_TEST_CASE(CreateMergerDim2Float32Workload) { - RefCreateMergerWorkloadTest({ 2, 3, 4, 5 }, 2); + RefCreateMergerWorkloadTest({ 2, 3, 4, 5 }, 2); } BOOST_AUTO_TEST_CASE(CreateMergerDim2Uint8Workload) { - RefCreateMergerWorkloadTest({ 2, 3, 4, 5 }, 2); + RefCreateMergerWorkloadTest({ 2, 3, 4, 5 }, 2); } BOOST_AUTO_TEST_CASE(CreateMergerDim3Float32Workload) { - RefCreateMergerWorkloadTest({ 2, 3, 2, 10 }, 3); + RefCreateMergerWorkloadTest({ 2, 3, 2, 10 }, 3); } BOOST_AUTO_TEST_CASE(CreateMergerDim3Uint8Workload) { - RefCreateMergerWorkloadTest({ 2, 3, 2, 10 }, 3); + RefCreateMergerWorkloadTest({ 2, 3, 2, 10 }, 3); } BOOST_AUTO_TEST_SUITE_END() diff --git a/src/backends/reference/workloads/CMakeLists.txt b/src/backends/reference/workloads/CMakeLists.txt index 8c8aa6ffb5..6e4d7637bd 100644 --- a/src/backends/reference/workloads/CMakeLists.txt +++ b/src/backends/reference/workloads/CMakeLists.txt @@ -83,8 +83,8 @@ list(APPEND armnnRefBackendWorkloads_sources RefL2NormalizationFloat32Workload.hpp RefLstmWorkload.cpp RefLstmWorkload.hpp - RefMergerWorkload.cpp - RefMergerWorkload.hpp + RefConcatWorkload.cpp + RefConcatWorkload.hpp RefNormalizationFloat32Workload.cpp RefNormalizationFloat32Workload.hpp RefPadWorkload.cpp diff --git a/src/backends/reference/workloads/RefConcatWorkload.cpp b/src/backends/reference/workloads/RefConcatWorkload.cpp new file mode 100644 index 0000000000..9abddc0ff8 --- /dev/null +++ b/src/backends/reference/workloads/RefConcatWorkload.cpp @@ -0,0 +1,21 @@ +// +// Copyright © 2017 Arm Ltd. All rights reserved. +// SPDX-License-Identifier: MIT +// + +#include "RefConcatWorkload.hpp" + +#include "Merger.hpp" + +#include "Profiling.hpp" + +namespace armnn +{ + +void RefConcatWorkload::Execute() const +{ + ARMNN_SCOPED_PROFILING_EVENT(Compute::CpuRef, "RefConcatWorkload_Execute"); + Merger(m_Data); +} + +} //namespace armnn diff --git a/src/backends/reference/workloads/RefConcatWorkload.hpp b/src/backends/reference/workloads/RefConcatWorkload.hpp new file mode 100644 index 0000000000..9fc9c7ef7e --- /dev/null +++ b/src/backends/reference/workloads/RefConcatWorkload.hpp @@ -0,0 +1,21 @@ +// +// Copyright © 2017 Arm Ltd. All rights reserved. +// SPDX-License-Identifier: MIT +// + +#pragma once + +#include +#include + +namespace armnn +{ + +class RefConcatWorkload : public BaseWorkload +{ +public: + using BaseWorkload::BaseWorkload; + virtual void Execute() const override; +}; + +} //namespace armnn diff --git a/src/backends/reference/workloads/RefMergerWorkload.cpp b/src/backends/reference/workloads/RefMergerWorkload.cpp deleted file mode 100644 index 5b42e828b9..0000000000 --- a/src/backends/reference/workloads/RefMergerWorkload.cpp +++ /dev/null @@ -1,21 +0,0 @@ -// -// Copyright © 2017 Arm Ltd. All rights reserved. -// SPDX-License-Identifier: MIT -// - -#include "RefMergerWorkload.hpp" - -#include "Merger.hpp" - -#include "Profiling.hpp" - -namespace armnn -{ - -void RefMergerWorkload::Execute() const -{ - ARMNN_SCOPED_PROFILING_EVENT(Compute::CpuRef, "RefMergerWorkload_Execute"); - Merger(m_Data); -} - -} //namespace armnn diff --git a/src/backends/reference/workloads/RefMergerWorkload.hpp b/src/backends/reference/workloads/RefMergerWorkload.hpp deleted file mode 100644 index 138838a1af..0000000000 --- a/src/backends/reference/workloads/RefMergerWorkload.hpp +++ /dev/null @@ -1,21 +0,0 @@ -// -// Copyright © 2017 Arm Ltd. All rights reserved. -// SPDX-License-Identifier: MIT -// - -#pragma once - -#include -#include - -namespace armnn -{ - -class RefMergerWorkload : public BaseWorkload -{ -public: - using BaseWorkload::BaseWorkload; - virtual void Execute() const override; -}; - -} //namespace armnn diff --git a/src/backends/reference/workloads/RefWorkloads.hpp b/src/backends/reference/workloads/RefWorkloads.hpp index 9a2eb0a8af..314e65beeb 100644 --- a/src/backends/reference/workloads/RefWorkloads.hpp +++ b/src/backends/reference/workloads/RefWorkloads.hpp @@ -16,7 +16,7 @@ #include "RefActivationWorkload.hpp" #include "RefPooling2dFloat32Workload.hpp" #include "RefWorkloadUtils.hpp" -#include "RefMergerWorkload.hpp" +#include "RefConcatWorkload.hpp" #include "RefFullyConnectedFloat32Workload.hpp" #include "RefGatherWorkload.hpp" #include "Softmax.hpp" -- cgit v1.2.1