From 29cadb3ff3066d6feb1801a921be326bf5ed8f47 Mon Sep 17 00:00:00 2001 From: Matthew Bentham Date: Mon, 1 Oct 2018 17:22:32 +0100 Subject: IVGCVSW-1951 Remove type templating from ClSplitterWorkload Change-Id: Ib289ed5885e0e22ce6d73d7b3b3b103691187a34 --- src/backends/cl/workloads/CMakeLists.txt | 6 +---- .../cl/workloads/ClBaseSplitterWorkload.hpp | 28 ---------------------- .../cl/workloads/ClSplitterFloatWorkload.cpp | 19 --------------- .../cl/workloads/ClSplitterFloatWorkload.hpp | 20 ---------------- .../cl/workloads/ClSplitterUint8Workload.cpp | 19 --------------- .../cl/workloads/ClSplitterUint8Workload.hpp | 21 ---------------- src/backends/cl/workloads/ClSplitterWorkload.hpp | 25 +++++++++++++++++++ src/backends/cl/workloads/ClWorkloads.hpp | 3 +-- 8 files changed, 27 insertions(+), 114 deletions(-) delete mode 100644 src/backends/cl/workloads/ClBaseSplitterWorkload.hpp delete mode 100644 src/backends/cl/workloads/ClSplitterFloatWorkload.cpp delete mode 100644 src/backends/cl/workloads/ClSplitterFloatWorkload.hpp delete mode 100644 src/backends/cl/workloads/ClSplitterUint8Workload.cpp delete mode 100644 src/backends/cl/workloads/ClSplitterUint8Workload.hpp create mode 100644 src/backends/cl/workloads/ClSplitterWorkload.hpp (limited to 'src/backends/cl/workloads') diff --git a/src/backends/cl/workloads/CMakeLists.txt b/src/backends/cl/workloads/CMakeLists.txt index 959d3e25df..9c48dc9e50 100644 --- a/src/backends/cl/workloads/CMakeLists.txt +++ b/src/backends/cl/workloads/CMakeLists.txt @@ -13,7 +13,6 @@ list(APPEND armnnClBackendWorkloads_sources ClBaseConstantWorkload.cpp ClBaseConstantWorkload.hpp ClBaseMergerWorkload.hpp - ClBaseSplitterWorkload.hpp ClBatchNormalizationFloatWorkload.cpp ClBatchNormalizationFloatWorkload.hpp ClConstantFloatWorkload.cpp @@ -76,10 +75,7 @@ list(APPEND armnnClBackendWorkloads_sources ClSoftmaxFloatWorkload.hpp ClSoftmaxUint8Workload.cpp ClSoftmaxUint8Workload.hpp - ClSplitterFloatWorkload.cpp - ClSplitterFloatWorkload.hpp - ClSplitterUint8Workload.cpp - ClSplitterUint8Workload.hpp + ClSplitterWorkload.hpp ClSubtractionWorkload.cpp ClSubtractionWorkload.hpp ClWorkloads.hpp diff --git a/src/backends/cl/workloads/ClBaseSplitterWorkload.hpp b/src/backends/cl/workloads/ClBaseSplitterWorkload.hpp deleted file mode 100644 index 7fdcc84235..0000000000 --- a/src/backends/cl/workloads/ClBaseSplitterWorkload.hpp +++ /dev/null @@ -1,28 +0,0 @@ -// -// Copyright © 2017 Arm Ltd. All rights reserved. -// SPDX-License-Identifier: MIT -// - -#pragma once - -#include - -#include - -namespace armnn -{ - -// Base class template providing an implementation of the Splitter layer common to all data types. -template -class ClBaseSplitterWorkload : public TypedWorkload -{ -public: - using TypedWorkload::TypedWorkload; - - void Execute() const override - { - // With subtensors, merger is a no-op. - } -}; - -} //namespace armnn diff --git a/src/backends/cl/workloads/ClSplitterFloatWorkload.cpp b/src/backends/cl/workloads/ClSplitterFloatWorkload.cpp deleted file mode 100644 index 5fd634bdb6..0000000000 --- a/src/backends/cl/workloads/ClSplitterFloatWorkload.cpp +++ /dev/null @@ -1,19 +0,0 @@ -// -// Copyright © 2017 Arm Ltd. All rights reserved. -// SPDX-License-Identifier: MIT -// - -#include "ClSplitterFloatWorkload.hpp" - -#include "ClWorkloadUtils.hpp" - -namespace armnn -{ - -void ClSplitterFloatWorkload::Execute() const -{ - ARMNN_SCOPED_PROFILING_EVENT_CL("ClSplitterFloatWorkload_Execute"); - ClBaseSplitterWorkload::Execute(); -} - -} //namespace armnn diff --git a/src/backends/cl/workloads/ClSplitterFloatWorkload.hpp b/src/backends/cl/workloads/ClSplitterFloatWorkload.hpp deleted file mode 100644 index a0b5846f8e..0000000000 --- a/src/backends/cl/workloads/ClSplitterFloatWorkload.hpp +++ /dev/null @@ -1,20 +0,0 @@ -// -// Copyright © 2017 Arm Ltd. All rights reserved. -// SPDX-License-Identifier: MIT -// - -#pragma once - -#include "ClBaseSplitterWorkload.hpp" - -namespace armnn -{ - -class ClSplitterFloatWorkload : public ClBaseSplitterWorkload -{ -public: - using ClBaseSplitterWorkload::ClBaseSplitterWorkload; - virtual void Execute() const override; -}; - -} //namespace armnn diff --git a/src/backends/cl/workloads/ClSplitterUint8Workload.cpp b/src/backends/cl/workloads/ClSplitterUint8Workload.cpp deleted file mode 100644 index 50a251ada7..0000000000 --- a/src/backends/cl/workloads/ClSplitterUint8Workload.cpp +++ /dev/null @@ -1,19 +0,0 @@ -// -// Copyright © 2017 Arm Ltd. All rights reserved. -// SPDX-License-Identifier: MIT -// - -#include "ClSplitterUint8Workload.hpp" - -#include "ClWorkloadUtils.hpp" - -namespace armnn -{ - -void ClSplitterUint8Workload::Execute() const -{ - ARMNN_SCOPED_PROFILING_EVENT_CL("ClSplitterUint8Workload_Execute"); - ClBaseSplitterWorkload::Execute(); -} - -} //namespace armnn diff --git a/src/backends/cl/workloads/ClSplitterUint8Workload.hpp b/src/backends/cl/workloads/ClSplitterUint8Workload.hpp deleted file mode 100644 index 19e8be5034..0000000000 --- a/src/backends/cl/workloads/ClSplitterUint8Workload.hpp +++ /dev/null @@ -1,21 +0,0 @@ -// -// Copyright © 2017 Arm Ltd. All rights reserved. -// SPDX-License-Identifier: MIT -// - -#pragma once - -#include "ClBaseSplitterWorkload.hpp" - -namespace armnn -{ -class ClSplitterUint8Workload : public ClBaseSplitterWorkload -{ -public: - using ClBaseSplitterWorkload::ClBaseSplitterWorkload; - virtual void Execute() const override; -}; -} //namespace armnn - - - diff --git a/src/backends/cl/workloads/ClSplitterWorkload.hpp b/src/backends/cl/workloads/ClSplitterWorkload.hpp new file mode 100644 index 0000000000..ffc02c047f --- /dev/null +++ b/src/backends/cl/workloads/ClSplitterWorkload.hpp @@ -0,0 +1,25 @@ +// +// Copyright © 2017 Arm Ltd. All rights reserved. +// SPDX-License-Identifier: MIT +// + +#pragma once + +#include + +namespace armnn +{ + +// Base class template providing an implementation of the Splitter layer common to all data types. +class ClSplitterWorkload : public BaseWorkload +{ +public: + using BaseWorkload::BaseWorkload; + + void Execute() const override + { + // With subtensors, splitter is a no-op. + } +}; + +} //namespace armnn diff --git a/src/backends/cl/workloads/ClWorkloads.hpp b/src/backends/cl/workloads/ClWorkloads.hpp index c0625f6791..439ad2d989 100644 --- a/src/backends/cl/workloads/ClWorkloads.hpp +++ b/src/backends/cl/workloads/ClWorkloads.hpp @@ -34,8 +34,7 @@ #include "ClResizeBilinearFloatWorkload.hpp" #include "ClSoftmaxFloatWorkload.hpp" #include "ClSoftmaxUint8Workload.hpp" -#include "ClSplitterFloatWorkload.hpp" -#include "ClSplitterUint8Workload.hpp" +#include "ClSplitterWorkload.hpp" #include "ClSubtractionWorkload.hpp" #include "ClConvertFp16ToFp32Workload.hpp" #include "ClConvertFp32ToFp16Workload.hpp" -- cgit v1.2.1