From 14e4669b88aba8816211e2f5a5b7e8d774ce2ad4 Mon Sep 17 00:00:00 2001 From: Matthew Bentham Date: Thu, 20 Sep 2018 15:35:30 +0100 Subject: IVGCVSW-949 Refactor - clean up includes of ClWorkloadUtils.hpp Move ClWorkloadUtils.hpp into ClWorkloads and reduce the number of places that include it Change-Id: Iac661be34c185d6208ca75509155b049c24293ca --- src/armnn/backends/ClWorkloadUtils.hpp | 65 --------------------- .../ClWorkloads/ClActivationFloatWorkload.cpp | 4 +- .../ClWorkloads/ClActivationFloatWorkload.hpp | 6 +- .../ClWorkloads/ClActivationUint8Workload.cpp | 3 + .../ClWorkloads/ClActivationUint8Workload.hpp | 4 +- .../backends/ClWorkloads/ClAdditionWorkload.cpp | 2 + .../backends/ClWorkloads/ClAdditionWorkload.hpp | 4 +- .../ClWorkloads/ClBaseConstantWorkload.cpp | 4 +- .../ClWorkloads/ClBaseConstantWorkload.hpp | 6 +- .../backends/ClWorkloads/ClBaseMergerWorkload.hpp | 4 +- .../ClWorkloads/ClBaseSplitterWorkload.hpp | 4 +- .../ClBatchNormalizationFloatWorkload.cpp | 4 +- .../ClBatchNormalizationFloatWorkload.hpp | 4 +- .../ClWorkloads/ClConstantFloatWorkload.cpp | 4 +- .../ClWorkloads/ClConstantFloatWorkload.hpp | 2 +- .../ClWorkloads/ClConstantUint8Workload.cpp | 4 +- .../ClWorkloads/ClConvertFp16ToFp32Workload.cpp | 2 + .../ClWorkloads/ClConvertFp16ToFp32Workload.hpp | 4 +- .../ClWorkloads/ClConvertFp32ToFp16Workload.cpp | 4 +- .../ClWorkloads/ClConvertFp32ToFp16Workload.hpp | 4 +- .../ClWorkloads/ClConvolution2dBaseWorkload.cpp | 2 + .../ClWorkloads/ClConvolution2dBaseWorkload.hpp | 5 +- .../ClWorkloads/ClConvolution2dFloatWorkload.cpp | 2 + .../ClWorkloads/ClConvolution2dFloatWorkload.hpp | 5 +- .../ClWorkloads/ClConvolution2dUint8Workload.cpp | 2 + .../ClWorkloads/ClConvolution2dUint8Workload.hpp | 5 +- .../ClDepthwiseConvolutionBaseWorkload.hpp | 5 +- .../ClDepthwiseConvolutionFloatWorkload.cpp | 3 +- .../ClDepthwiseConvolutionFloatWorkload.hpp | 2 - .../ClDepthwiseConvolutionUint8Workload.cpp | 2 + .../ClDepthwiseConvolutionUint8Workload.hpp | 2 - .../ClWorkloads/ClDivisionFloatWorkload.cpp | 2 + .../ClWorkloads/ClDivisionFloatWorkload.hpp | 4 +- .../backends/ClWorkloads/ClFloorFloatWorkload.cpp | 2 + .../backends/ClWorkloads/ClFloorFloatWorkload.hpp | 4 +- .../ClWorkloads/ClFullyConnectedWorkload.cpp | 2 + .../ClWorkloads/ClFullyConnectedWorkload.hpp | 5 +- .../ClWorkloads/ClL2NormalizationFloatWorkload.cpp | 2 + .../ClWorkloads/ClL2NormalizationFloatWorkload.hpp | 4 +- .../backends/ClWorkloads/ClLstmFloatWorkload.cpp | 5 +- .../backends/ClWorkloads/ClLstmFloatWorkload.hpp | 3 +- .../backends/ClWorkloads/ClMergerFloatWorkload.cpp | 1 + .../backends/ClWorkloads/ClMergerUint8Workload.cpp | 1 + .../ClWorkloads/ClMultiplicationFloatWorkload.cpp | 1 + .../ClWorkloads/ClMultiplicationFloatWorkload.hpp | 4 +- .../ClWorkloads/ClNormalizationFloatWorkload.cpp | 3 +- .../ClWorkloads/ClNormalizationFloatWorkload.hpp | 6 +- .../backends/ClWorkloads/ClPermuteWorkload.cpp | 2 + .../backends/ClWorkloads/ClPermuteWorkload.hpp | 1 - .../ClWorkloads/ClPooling2dBaseWorkload.hpp | 4 +- .../ClWorkloads/ClPooling2dFloatWorkload.cpp | 2 + .../ClWorkloads/ClPooling2dFloatWorkload.hpp | 5 +- .../ClWorkloads/ClPooling2dUint8Workload.cpp | 2 + .../ClWorkloads/ClPooling2dUint8Workload.hpp | 5 +- .../ClWorkloads/ClReshapeFloatWorkload.cpp | 2 + .../ClWorkloads/ClReshapeFloatWorkload.hpp | 4 +- .../ClWorkloads/ClReshapeUint8Workload.cpp | 4 +- .../ClWorkloads/ClReshapeUint8Workload.hpp | 4 +- .../ClWorkloads/ClResizeBilinearFloatWorkload.cpp | 4 +- .../ClWorkloads/ClResizeBilinearFloatWorkload.hpp | 6 +- .../backends/ClWorkloads/ClSoftmaxBaseWorkload.cpp | 2 + .../backends/ClWorkloads/ClSoftmaxBaseWorkload.hpp | 3 +- .../ClWorkloads/ClSoftmaxFloatWorkload.cpp | 2 + .../ClWorkloads/ClSoftmaxFloatWorkload.hpp | 3 +- .../ClWorkloads/ClSoftmaxUint8Workload.cpp | 2 + .../ClWorkloads/ClSoftmaxUint8Workload.hpp | 3 +- .../ClWorkloads/ClSplitterFloatWorkload.cpp | 2 + .../ClWorkloads/ClSplitterUint8Workload.cpp | 2 + .../backends/ClWorkloads/ClSubtractionWorkload.cpp | 2 + .../backends/ClWorkloads/ClSubtractionWorkload.hpp | 4 +- src/armnn/backends/ClWorkloads/ClWorkloadUtils.hpp | 67 ++++++++++++++++++++++ src/armnn/backends/test/ArmComputeCl.cpp | 2 +- src/armnn/backends/test/CreateWorkloadCl.cpp | 2 +- 73 files changed, 239 insertions(+), 124 deletions(-) delete mode 100644 src/armnn/backends/ClWorkloadUtils.hpp create mode 100644 src/armnn/backends/ClWorkloads/ClWorkloadUtils.hpp (limited to 'src/armnn') diff --git a/src/armnn/backends/ClWorkloadUtils.hpp b/src/armnn/backends/ClWorkloadUtils.hpp deleted file mode 100644 index 82cd37de2c..0000000000 --- a/src/armnn/backends/ClWorkloadUtils.hpp +++ /dev/null @@ -1,65 +0,0 @@ -// -// Copyright © 2017 Arm Ltd. All rights reserved. -// SPDX-License-Identifier: MIT -// -#pragma once - -#include "Workload.hpp" -#include -#include -#include -#include "ArmComputeTensorUtils.hpp" -#include "OpenClTimer.hpp" -#include "CpuTensorHandle.hpp" -#include "Half.hpp" - -#define ARMNN_SCOPED_PROFILING_EVENT_CL(name) \ - ARMNN_SCOPED_PROFILING_EVENT_WITH_INSTRUMENTS(armnn::Compute::GpuAcc, \ - name, \ - armnn::OpenClTimer(), \ - armnn::WallClockTimer()) - -namespace armnn -{ - -template -void CopyArmComputeClTensorData(const T* srcData, arm_compute::CLTensor& dstTensor) -{ - { - ARMNN_SCOPED_PROFILING_EVENT_CL("MapClTensorForWriting"); - dstTensor.map(true); - } - - { - ARMNN_SCOPED_PROFILING_EVENT_CL("CopyToClTensor"); - armcomputetensorutils::CopyArmComputeITensorData(srcData, dstTensor); - } - - dstTensor.unmap(); -} - -template -void InitialiseArmComputeClTensorData(arm_compute::CLTensor& clTensor, const T* data) -{ - armcomputetensorutils::InitialiseArmComputeTensorEmpty(clTensor); - CopyArmComputeClTensorData(data, clTensor); -} - -inline void InitializeArmComputeClTensorDataForFloatTypes(arm_compute::CLTensor& clTensor, - const ConstCpuTensorHandle *handle) -{ - BOOST_ASSERT(handle); - switch(handle->GetTensorInfo().GetDataType()) - { - case DataType::Float16: - InitialiseArmComputeClTensorData(clTensor, handle->GetConstTensor()); - break; - case DataType::Float32: - InitialiseArmComputeClTensorData(clTensor, handle->GetConstTensor()); - break; - default: - BOOST_ASSERT_MSG(false, "Unexpected floating point type."); - } -}; - -} //namespace armnn diff --git a/src/armnn/backends/ClWorkloads/ClActivationFloatWorkload.cpp b/src/armnn/backends/ClWorkloads/ClActivationFloatWorkload.cpp index a69f6c5d51..97078bddd8 100644 --- a/src/armnn/backends/ClWorkloads/ClActivationFloatWorkload.cpp +++ b/src/armnn/backends/ClWorkloads/ClActivationFloatWorkload.cpp @@ -7,6 +7,8 @@ #include "backends/ClTensorHandle.hpp" #include "backends/ArmComputeUtils.hpp" +#include "ClWorkloadUtils.hpp" + namespace armnn { arm_compute::Status ClActivationWorkloadValidate(const TensorInfo& input, @@ -51,4 +53,4 @@ void ClActivationFloatWorkload::Execute() const m_ActivationLayer.run(); } -} //namespace armnn \ No newline at end of file +} //namespace armnn diff --git a/src/armnn/backends/ClWorkloads/ClActivationFloatWorkload.hpp b/src/armnn/backends/ClWorkloads/ClActivationFloatWorkload.hpp index 4f283a908f..e1b6fe13d8 100644 --- a/src/armnn/backends/ClWorkloads/ClActivationFloatWorkload.hpp +++ b/src/armnn/backends/ClWorkloads/ClActivationFloatWorkload.hpp @@ -5,7 +5,9 @@ #pragma once -#include "backends/ClWorkloadUtils.hpp" +#include "backends/Workload.hpp" + +#include namespace armnn { @@ -24,4 +26,4 @@ private: mutable arm_compute::CLActivationLayer m_ActivationLayer; }; -} //namespace armnn \ No newline at end of file +} //namespace armnn diff --git a/src/armnn/backends/ClWorkloads/ClActivationUint8Workload.cpp b/src/armnn/backends/ClWorkloads/ClActivationUint8Workload.cpp index 07826b843c..f39c856aa9 100644 --- a/src/armnn/backends/ClWorkloads/ClActivationUint8Workload.cpp +++ b/src/armnn/backends/ClWorkloads/ClActivationUint8Workload.cpp @@ -9,6 +9,9 @@ #include "backends/ArmComputeUtils.hpp" #include "backends/ClTensorHandle.hpp" #include "backends/CpuTensorHandle.hpp" + +#include "ClWorkloadUtils.hpp" + namespace armnn { diff --git a/src/armnn/backends/ClWorkloads/ClActivationUint8Workload.hpp b/src/armnn/backends/ClWorkloads/ClActivationUint8Workload.hpp index f133f9c62a..bb2ff58853 100644 --- a/src/armnn/backends/ClWorkloads/ClActivationUint8Workload.hpp +++ b/src/armnn/backends/ClWorkloads/ClActivationUint8Workload.hpp @@ -5,7 +5,9 @@ #pragma once -#include "backends/ClWorkloadUtils.hpp" +#include "backends/Workload.hpp" + +#include namespace armnn { diff --git a/src/armnn/backends/ClWorkloads/ClAdditionWorkload.cpp b/src/armnn/backends/ClWorkloads/ClAdditionWorkload.cpp index 0bba327bef..dd439d59a9 100644 --- a/src/armnn/backends/ClWorkloads/ClAdditionWorkload.cpp +++ b/src/armnn/backends/ClWorkloads/ClAdditionWorkload.cpp @@ -9,6 +9,8 @@ #include "backends/CpuTensorHandle.hpp" #include "backends/ArmComputeTensorUtils.hpp" +#include "ClWorkloadUtils.hpp" + namespace armnn { using namespace armcomputetensorutils; diff --git a/src/armnn/backends/ClWorkloads/ClAdditionWorkload.hpp b/src/armnn/backends/ClWorkloads/ClAdditionWorkload.hpp index 8af8f23788..b4706890d1 100644 --- a/src/armnn/backends/ClWorkloads/ClAdditionWorkload.hpp +++ b/src/armnn/backends/ClWorkloads/ClAdditionWorkload.hpp @@ -5,7 +5,9 @@ #pragma once -#include "backends/ClWorkloadUtils.hpp" +#include "backends/Workload.hpp" + +#include namespace armnn { diff --git a/src/armnn/backends/ClWorkloads/ClBaseConstantWorkload.cpp b/src/armnn/backends/ClWorkloads/ClBaseConstantWorkload.cpp index 735b0535c7..021d17512f 100644 --- a/src/armnn/backends/ClWorkloads/ClBaseConstantWorkload.cpp +++ b/src/armnn/backends/ClWorkloads/ClBaseConstantWorkload.cpp @@ -9,6 +9,8 @@ #include "backends/CpuTensorHandle.hpp" #include "Half.hpp" +#include "ClWorkloadUtils.hpp" + namespace armnn { @@ -59,4 +61,4 @@ void ClBaseConstantWorkload::Execute() const } -} //namespace armnn \ No newline at end of file +} //namespace armnn diff --git a/src/armnn/backends/ClWorkloads/ClBaseConstantWorkload.hpp b/src/armnn/backends/ClWorkloads/ClBaseConstantWorkload.hpp index 7304879389..ca1db389dc 100644 --- a/src/armnn/backends/ClWorkloads/ClBaseConstantWorkload.hpp +++ b/src/armnn/backends/ClWorkloads/ClBaseConstantWorkload.hpp @@ -5,7 +5,9 @@ #pragma once -#include "backends/ClWorkloadUtils.hpp" +#include "backends/Workload.hpp" + +#include namespace armnn { @@ -25,4 +27,4 @@ private: mutable bool m_RanOnce; }; -} //namespace armnn \ No newline at end of file +} //namespace armnn diff --git a/src/armnn/backends/ClWorkloads/ClBaseMergerWorkload.hpp b/src/armnn/backends/ClWorkloads/ClBaseMergerWorkload.hpp index 9f55779663..420e074217 100644 --- a/src/armnn/backends/ClWorkloads/ClBaseMergerWorkload.hpp +++ b/src/armnn/backends/ClWorkloads/ClBaseMergerWorkload.hpp @@ -5,7 +5,9 @@ #pragma once -#include "backends/ClWorkloadUtils.hpp" +#include "backends/Workload.hpp" + +#include namespace armnn { diff --git a/src/armnn/backends/ClWorkloads/ClBaseSplitterWorkload.hpp b/src/armnn/backends/ClWorkloads/ClBaseSplitterWorkload.hpp index 30792e4dc3..41f382cac8 100644 --- a/src/armnn/backends/ClWorkloads/ClBaseSplitterWorkload.hpp +++ b/src/armnn/backends/ClWorkloads/ClBaseSplitterWorkload.hpp @@ -5,7 +5,9 @@ #pragma once -#include "backends/ClWorkloadUtils.hpp" +#include "backends/Workload.hpp" + +#include namespace armnn { diff --git a/src/armnn/backends/ClWorkloads/ClBatchNormalizationFloatWorkload.cpp b/src/armnn/backends/ClWorkloads/ClBatchNormalizationFloatWorkload.cpp index 4433a2a4b2..021734aaa6 100644 --- a/src/armnn/backends/ClWorkloads/ClBatchNormalizationFloatWorkload.cpp +++ b/src/armnn/backends/ClWorkloads/ClBatchNormalizationFloatWorkload.cpp @@ -9,6 +9,8 @@ #include "backends/ArmComputeTensorUtils.hpp" #include "backends/ClLayerSupport.hpp" +#include "ClWorkloadUtils.hpp" + namespace armnn { using namespace armcomputetensorutils; @@ -91,4 +93,4 @@ void ClBatchNormalizationFloatWorkload::FreeUnusedTensors() FreeTensorIfUnused(m_Beta); } -} //namespace armnn \ No newline at end of file +} //namespace armnn diff --git a/src/armnn/backends/ClWorkloads/ClBatchNormalizationFloatWorkload.hpp b/src/armnn/backends/ClWorkloads/ClBatchNormalizationFloatWorkload.hpp index 7af2550e9c..22c71b1073 100644 --- a/src/armnn/backends/ClWorkloads/ClBatchNormalizationFloatWorkload.hpp +++ b/src/armnn/backends/ClWorkloads/ClBatchNormalizationFloatWorkload.hpp @@ -5,7 +5,9 @@ #pragma once -#include "backends/ClWorkloadUtils.hpp" +#include "backends/Workload.hpp" + +#include namespace armnn { diff --git a/src/armnn/backends/ClWorkloads/ClConstantFloatWorkload.cpp b/src/armnn/backends/ClWorkloads/ClConstantFloatWorkload.cpp index eaa433a471..1565047c22 100644 --- a/src/armnn/backends/ClWorkloads/ClConstantFloatWorkload.cpp +++ b/src/armnn/backends/ClWorkloads/ClConstantFloatWorkload.cpp @@ -4,6 +4,8 @@ // #include "ClConstantFloatWorkload.hpp" +#include "ClWorkloadUtils.hpp" + namespace armnn { @@ -13,4 +15,4 @@ void ClConstantFloatWorkload::Execute() const ClBaseConstantWorkload::Execute(); } -} //namespace armnn \ No newline at end of file +} //namespace armnn diff --git a/src/armnn/backends/ClWorkloads/ClConstantFloatWorkload.hpp b/src/armnn/backends/ClWorkloads/ClConstantFloatWorkload.hpp index c702f2bf0f..0cbeaad9ea 100644 --- a/src/armnn/backends/ClWorkloads/ClConstantFloatWorkload.hpp +++ b/src/armnn/backends/ClWorkloads/ClConstantFloatWorkload.hpp @@ -17,4 +17,4 @@ public: }; -} //namespace armnn \ No newline at end of file +} //namespace armnn diff --git a/src/armnn/backends/ClWorkloads/ClConstantUint8Workload.cpp b/src/armnn/backends/ClWorkloads/ClConstantUint8Workload.cpp index d9dfaa20b0..a5ef0321cd 100644 --- a/src/armnn/backends/ClWorkloads/ClConstantUint8Workload.cpp +++ b/src/armnn/backends/ClWorkloads/ClConstantUint8Workload.cpp @@ -4,6 +4,8 @@ // #include "ClConstantUint8Workload.hpp" +#include "ClWorkloadUtils.hpp" + namespace armnn { @@ -13,4 +15,4 @@ void ClConstantUint8Workload::Execute() const ClBaseConstantWorkload::Execute(); } -} //namespace armnn \ No newline at end of file +} //namespace armnn diff --git a/src/armnn/backends/ClWorkloads/ClConvertFp16ToFp32Workload.cpp b/src/armnn/backends/ClWorkloads/ClConvertFp16ToFp32Workload.cpp index 9408288f2d..534249aeac 100644 --- a/src/armnn/backends/ClWorkloads/ClConvertFp16ToFp32Workload.cpp +++ b/src/armnn/backends/ClWorkloads/ClConvertFp16ToFp32Workload.cpp @@ -6,6 +6,8 @@ #include "ClConvertFp16ToFp32Workload.hpp" #include "backends/ClTensorHandle.hpp" +#include "ClWorkloadUtils.hpp" + namespace armnn { using namespace armcomputetensorutils; diff --git a/src/armnn/backends/ClWorkloads/ClConvertFp16ToFp32Workload.hpp b/src/armnn/backends/ClWorkloads/ClConvertFp16ToFp32Workload.hpp index 6b7279d29b..c72d2262b3 100644 --- a/src/armnn/backends/ClWorkloads/ClConvertFp16ToFp32Workload.hpp +++ b/src/armnn/backends/ClWorkloads/ClConvertFp16ToFp32Workload.hpp @@ -5,7 +5,9 @@ #pragma once -#include "backends/ClWorkloadUtils.hpp" +#include "backends/Workload.hpp" + +#include namespace armnn { diff --git a/src/armnn/backends/ClWorkloads/ClConvertFp32ToFp16Workload.cpp b/src/armnn/backends/ClWorkloads/ClConvertFp32ToFp16Workload.cpp index 8633548cb9..73b3cbc542 100644 --- a/src/armnn/backends/ClWorkloads/ClConvertFp32ToFp16Workload.cpp +++ b/src/armnn/backends/ClWorkloads/ClConvertFp32ToFp16Workload.cpp @@ -6,6 +6,8 @@ #include "ClConvertFp32ToFp16Workload.hpp" #include "backends/ClTensorHandle.hpp" +#include "ClWorkloadUtils.hpp" + namespace armnn { using namespace armcomputetensorutils; @@ -61,4 +63,4 @@ arm_compute::Status ClConvertFp32ToFp16WorkloadValidate(const TensorInfo& input, } -} //namespace armnn \ No newline at end of file +} //namespace armnn diff --git a/src/armnn/backends/ClWorkloads/ClConvertFp32ToFp16Workload.hpp b/src/armnn/backends/ClWorkloads/ClConvertFp32ToFp16Workload.hpp index 9c602ae038..fb6af02070 100644 --- a/src/armnn/backends/ClWorkloads/ClConvertFp32ToFp16Workload.hpp +++ b/src/armnn/backends/ClWorkloads/ClConvertFp32ToFp16Workload.hpp @@ -5,7 +5,9 @@ #pragma once -#include "backends/ClWorkloadUtils.hpp" +#include "backends/Workload.hpp" + +#include namespace armnn { diff --git a/src/armnn/backends/ClWorkloads/ClConvolution2dBaseWorkload.cpp b/src/armnn/backends/ClWorkloads/ClConvolution2dBaseWorkload.cpp index f11132326d..228f17d54e 100644 --- a/src/armnn/backends/ClWorkloads/ClConvolution2dBaseWorkload.cpp +++ b/src/armnn/backends/ClWorkloads/ClConvolution2dBaseWorkload.cpp @@ -9,6 +9,8 @@ #include "backends/ArmComputeUtils.hpp" #include "backends/ArmComputeTensorUtils.hpp" +#include + namespace armnn { using namespace armcomputetensorutils; diff --git a/src/armnn/backends/ClWorkloads/ClConvolution2dBaseWorkload.hpp b/src/armnn/backends/ClWorkloads/ClConvolution2dBaseWorkload.hpp index 5796dfbbb2..a983dba79a 100644 --- a/src/armnn/backends/ClWorkloads/ClConvolution2dBaseWorkload.hpp +++ b/src/armnn/backends/ClWorkloads/ClConvolution2dBaseWorkload.hpp @@ -5,10 +5,13 @@ #pragma once -#include "backends/ClWorkloadUtils.hpp" +#include +#include #include +#include + namespace armnn { diff --git a/src/armnn/backends/ClWorkloads/ClConvolution2dFloatWorkload.cpp b/src/armnn/backends/ClWorkloads/ClConvolution2dFloatWorkload.cpp index c4e9f59f1c..029f41d5dc 100644 --- a/src/armnn/backends/ClWorkloads/ClConvolution2dFloatWorkload.cpp +++ b/src/armnn/backends/ClWorkloads/ClConvolution2dFloatWorkload.cpp @@ -9,6 +9,8 @@ #include "backends/ArmComputeTensorUtils.hpp" #include "backends/ClLayerSupport.hpp" +#include "ClWorkloadUtils.hpp" + namespace armnn { using namespace armcomputetensorutils; diff --git a/src/armnn/backends/ClWorkloads/ClConvolution2dFloatWorkload.hpp b/src/armnn/backends/ClWorkloads/ClConvolution2dFloatWorkload.hpp index ddf2d7bd05..28ba53f38a 100644 --- a/src/armnn/backends/ClWorkloads/ClConvolution2dFloatWorkload.hpp +++ b/src/armnn/backends/ClWorkloads/ClConvolution2dFloatWorkload.hpp @@ -5,9 +5,10 @@ #pragma once -#include "backends/ClWorkloadUtils.hpp" +#include "backends/Workload.hpp" -#include "arm_compute/runtime/MemoryManagerOnDemand.h" +#include +#include #include diff --git a/src/armnn/backends/ClWorkloads/ClConvolution2dUint8Workload.cpp b/src/armnn/backends/ClWorkloads/ClConvolution2dUint8Workload.cpp index b1df78a614..e6783b698a 100644 --- a/src/armnn/backends/ClWorkloads/ClConvolution2dUint8Workload.cpp +++ b/src/armnn/backends/ClWorkloads/ClConvolution2dUint8Workload.cpp @@ -9,6 +9,8 @@ #include "backends/ArmComputeTensorUtils.hpp" #include "backends/ClLayerSupport.hpp" +#include "ClWorkloadUtils.hpp" + namespace armnn { using namespace armcomputetensorutils; diff --git a/src/armnn/backends/ClWorkloads/ClConvolution2dUint8Workload.hpp b/src/armnn/backends/ClWorkloads/ClConvolution2dUint8Workload.hpp index f1cfbcf22b..f1f008b1b9 100644 --- a/src/armnn/backends/ClWorkloads/ClConvolution2dUint8Workload.hpp +++ b/src/armnn/backends/ClWorkloads/ClConvolution2dUint8Workload.hpp @@ -5,9 +5,10 @@ #pragma once -#include "backends/ClWorkloadUtils.hpp" +#include "backends/Workload.hpp" -#include "arm_compute/runtime/MemoryManagerOnDemand.h" +#include +#include #include diff --git a/src/armnn/backends/ClWorkloads/ClDepthwiseConvolutionBaseWorkload.hpp b/src/armnn/backends/ClWorkloads/ClDepthwiseConvolutionBaseWorkload.hpp index 446746caf7..49a8b5d357 100644 --- a/src/armnn/backends/ClWorkloads/ClDepthwiseConvolutionBaseWorkload.hpp +++ b/src/armnn/backends/ClWorkloads/ClDepthwiseConvolutionBaseWorkload.hpp @@ -5,10 +5,11 @@ #pragma once -#include "backends/ClWorkloadUtils.hpp" - +#include "backends/Workload.hpp" #include +#include + namespace armnn { diff --git a/src/armnn/backends/ClWorkloads/ClDepthwiseConvolutionFloatWorkload.cpp b/src/armnn/backends/ClWorkloads/ClDepthwiseConvolutionFloatWorkload.cpp index 6aa4d21af1..635ae1f327 100644 --- a/src/armnn/backends/ClWorkloads/ClDepthwiseConvolutionFloatWorkload.cpp +++ b/src/armnn/backends/ClWorkloads/ClDepthwiseConvolutionFloatWorkload.cpp @@ -5,9 +5,10 @@ #include "ClDepthwiseConvolutionFloatWorkload.hpp" -#include "backends/ClWorkloadUtils.hpp" #include "backends/CpuTensorHandle.hpp" +#include "ClWorkloadUtils.hpp" + namespace armnn { diff --git a/src/armnn/backends/ClWorkloads/ClDepthwiseConvolutionFloatWorkload.hpp b/src/armnn/backends/ClWorkloads/ClDepthwiseConvolutionFloatWorkload.hpp index 86aacd0647..4f9d5f332e 100644 --- a/src/armnn/backends/ClWorkloads/ClDepthwiseConvolutionFloatWorkload.hpp +++ b/src/armnn/backends/ClWorkloads/ClDepthwiseConvolutionFloatWorkload.hpp @@ -7,8 +7,6 @@ #include "ClDepthwiseConvolutionBaseWorkload.hpp" -#include "backends/ClWorkloadUtils.hpp" - namespace armnn { diff --git a/src/armnn/backends/ClWorkloads/ClDepthwiseConvolutionUint8Workload.cpp b/src/armnn/backends/ClWorkloads/ClDepthwiseConvolutionUint8Workload.cpp index a648d01fed..af5836e908 100644 --- a/src/armnn/backends/ClWorkloads/ClDepthwiseConvolutionUint8Workload.cpp +++ b/src/armnn/backends/ClWorkloads/ClDepthwiseConvolutionUint8Workload.cpp @@ -7,6 +7,8 @@ #include "backends/CpuTensorHandle.hpp" +#include "ClWorkloadUtils.hpp" + namespace armnn { diff --git a/src/armnn/backends/ClWorkloads/ClDepthwiseConvolutionUint8Workload.hpp b/src/armnn/backends/ClWorkloads/ClDepthwiseConvolutionUint8Workload.hpp index c13a104ab0..b9f676de94 100644 --- a/src/armnn/backends/ClWorkloads/ClDepthwiseConvolutionUint8Workload.hpp +++ b/src/armnn/backends/ClWorkloads/ClDepthwiseConvolutionUint8Workload.hpp @@ -7,8 +7,6 @@ #include "ClDepthwiseConvolutionBaseWorkload.hpp" -#include "backends/ClWorkloadUtils.hpp" - namespace armnn { diff --git a/src/armnn/backends/ClWorkloads/ClDivisionFloatWorkload.cpp b/src/armnn/backends/ClWorkloads/ClDivisionFloatWorkload.cpp index ad9a1aee68..2371789035 100644 --- a/src/armnn/backends/ClWorkloads/ClDivisionFloatWorkload.cpp +++ b/src/armnn/backends/ClWorkloads/ClDivisionFloatWorkload.cpp @@ -7,6 +7,8 @@ #include "backends/ClTensorHandle.hpp" #include "backends/CpuTensorHandle.hpp" +#include "ClWorkloadUtils.hpp" + namespace armnn { diff --git a/src/armnn/backends/ClWorkloads/ClDivisionFloatWorkload.hpp b/src/armnn/backends/ClWorkloads/ClDivisionFloatWorkload.hpp index 850ae940fb..d34e11dab8 100644 --- a/src/armnn/backends/ClWorkloads/ClDivisionFloatWorkload.hpp +++ b/src/armnn/backends/ClWorkloads/ClDivisionFloatWorkload.hpp @@ -5,7 +5,9 @@ #pragma once -#include "backends/ClWorkloadUtils.hpp" +#include "backends/Workload.hpp" + +#include namespace armnn { diff --git a/src/armnn/backends/ClWorkloads/ClFloorFloatWorkload.cpp b/src/armnn/backends/ClWorkloads/ClFloorFloatWorkload.cpp index 701d8c6f3e..d090a7da81 100644 --- a/src/armnn/backends/ClWorkloads/ClFloorFloatWorkload.cpp +++ b/src/armnn/backends/ClWorkloads/ClFloorFloatWorkload.cpp @@ -6,6 +6,8 @@ #include "ClFloorFloatWorkload.hpp" #include "backends/ClTensorHandle.hpp" +#include "ClWorkloadUtils.hpp" + namespace armnn { diff --git a/src/armnn/backends/ClWorkloads/ClFloorFloatWorkload.hpp b/src/armnn/backends/ClWorkloads/ClFloorFloatWorkload.hpp index 1c8427327a..f269bcf30c 100644 --- a/src/armnn/backends/ClWorkloads/ClFloorFloatWorkload.hpp +++ b/src/armnn/backends/ClWorkloads/ClFloorFloatWorkload.hpp @@ -5,7 +5,9 @@ #pragma once -#include "backends/ClWorkloadUtils.hpp" +#include "backends/Workload.hpp" + +#include namespace armnn { diff --git a/src/armnn/backends/ClWorkloads/ClFullyConnectedWorkload.cpp b/src/armnn/backends/ClWorkloads/ClFullyConnectedWorkload.cpp index 5307fab062..8d2fd0e909 100644 --- a/src/armnn/backends/ClWorkloads/ClFullyConnectedWorkload.cpp +++ b/src/armnn/backends/ClWorkloads/ClFullyConnectedWorkload.cpp @@ -10,6 +10,8 @@ #include "backends/ArmComputeUtils.hpp" #include "backends/ClLayerSupport.hpp" +#include "ClWorkloadUtils.hpp" + namespace armnn { using namespace armcomputetensorutils; diff --git a/src/armnn/backends/ClWorkloads/ClFullyConnectedWorkload.hpp b/src/armnn/backends/ClWorkloads/ClFullyConnectedWorkload.hpp index 7aa9b86e15..a61610992e 100644 --- a/src/armnn/backends/ClWorkloads/ClFullyConnectedWorkload.hpp +++ b/src/armnn/backends/ClWorkloads/ClFullyConnectedWorkload.hpp @@ -5,9 +5,10 @@ #pragma once -#include "backends/ClWorkloadUtils.hpp" +#include "backends/Workload.hpp" -#include "arm_compute/runtime/MemoryManagerOnDemand.h" +#include +#include #include diff --git a/src/armnn/backends/ClWorkloads/ClL2NormalizationFloatWorkload.cpp b/src/armnn/backends/ClWorkloads/ClL2NormalizationFloatWorkload.cpp index 23b2f4e1b5..4ccaae3430 100644 --- a/src/armnn/backends/ClWorkloads/ClL2NormalizationFloatWorkload.cpp +++ b/src/armnn/backends/ClWorkloads/ClL2NormalizationFloatWorkload.cpp @@ -8,6 +8,8 @@ #include "backends/CpuTensorHandle.hpp" #include "backends/ArmComputeUtils.hpp" +#include "ClWorkloadUtils.hpp" + namespace armnn { using namespace armcomputetensorutils; diff --git a/src/armnn/backends/ClWorkloads/ClL2NormalizationFloatWorkload.hpp b/src/armnn/backends/ClWorkloads/ClL2NormalizationFloatWorkload.hpp index 32cf5e8fd4..f3f7de110a 100644 --- a/src/armnn/backends/ClWorkloads/ClL2NormalizationFloatWorkload.hpp +++ b/src/armnn/backends/ClWorkloads/ClL2NormalizationFloatWorkload.hpp @@ -5,7 +5,9 @@ #pragma once -#include "backends/ClWorkloadUtils.hpp" +#include "backends/Workload.hpp" + +#include namespace armnn { diff --git a/src/armnn/backends/ClWorkloads/ClLstmFloatWorkload.cpp b/src/armnn/backends/ClWorkloads/ClLstmFloatWorkload.cpp index 249a861b6e..09a34c2d02 100644 --- a/src/armnn/backends/ClWorkloads/ClLstmFloatWorkload.cpp +++ b/src/armnn/backends/ClWorkloads/ClLstmFloatWorkload.cpp @@ -8,7 +8,10 @@ #include "backends/CpuTensorHandle.hpp" #include "backends/ArmComputeTensorUtils.hpp" #include "backends/ClLayerSupport.hpp" -#include "arm_compute/runtime/CL/functions/CLLSTMLayer.h" + +#include + +#include "ClWorkloadUtils.hpp" namespace armnn { diff --git a/src/armnn/backends/ClWorkloads/ClLstmFloatWorkload.hpp b/src/armnn/backends/ClWorkloads/ClLstmFloatWorkload.hpp index 5ced2416bc..61d8fc3e6c 100644 --- a/src/armnn/backends/ClWorkloads/ClLstmFloatWorkload.hpp +++ b/src/armnn/backends/ClWorkloads/ClLstmFloatWorkload.hpp @@ -5,10 +5,11 @@ #pragma once -#include "backends/ClWorkloadUtils.hpp" #include "backends/Workload.hpp" #include "backends/WorkloadData.hpp" +#include + namespace armnn { diff --git a/src/armnn/backends/ClWorkloads/ClMergerFloatWorkload.cpp b/src/armnn/backends/ClWorkloads/ClMergerFloatWorkload.cpp index fedbaeef8b..151f1e0ee7 100644 --- a/src/armnn/backends/ClWorkloads/ClMergerFloatWorkload.cpp +++ b/src/armnn/backends/ClWorkloads/ClMergerFloatWorkload.cpp @@ -5,6 +5,7 @@ #include "ClMergerFloatWorkload.hpp" +#include "ClWorkloadUtils.hpp" namespace armnn { diff --git a/src/armnn/backends/ClWorkloads/ClMergerUint8Workload.cpp b/src/armnn/backends/ClWorkloads/ClMergerUint8Workload.cpp index c7f3b75e90..9d1060d857 100644 --- a/src/armnn/backends/ClWorkloads/ClMergerUint8Workload.cpp +++ b/src/armnn/backends/ClWorkloads/ClMergerUint8Workload.cpp @@ -5,6 +5,7 @@ #include "ClMergerUint8Workload.hpp" +#include "ClWorkloadUtils.hpp" namespace armnn { diff --git a/src/armnn/backends/ClWorkloads/ClMultiplicationFloatWorkload.cpp b/src/armnn/backends/ClWorkloads/ClMultiplicationFloatWorkload.cpp index cc9ec35133..c3330a98e8 100644 --- a/src/armnn/backends/ClWorkloads/ClMultiplicationFloatWorkload.cpp +++ b/src/armnn/backends/ClWorkloads/ClMultiplicationFloatWorkload.cpp @@ -6,6 +6,7 @@ #include "ClMultiplicationFloatWorkload.hpp" #include "backends/ClTensorHandle.hpp" #include "backends/CpuTensorHandle.hpp" +#include "ClWorkloadUtils.hpp" namespace armnn { diff --git a/src/armnn/backends/ClWorkloads/ClMultiplicationFloatWorkload.hpp b/src/armnn/backends/ClWorkloads/ClMultiplicationFloatWorkload.hpp index 6782027c8d..c2d6b7697a 100644 --- a/src/armnn/backends/ClWorkloads/ClMultiplicationFloatWorkload.hpp +++ b/src/armnn/backends/ClWorkloads/ClMultiplicationFloatWorkload.hpp @@ -5,7 +5,9 @@ #pragma once -#include "backends/ClWorkloadUtils.hpp" +#include "backends/Workload.hpp" + +#include namespace armnn { diff --git a/src/armnn/backends/ClWorkloads/ClNormalizationFloatWorkload.cpp b/src/armnn/backends/ClWorkloads/ClNormalizationFloatWorkload.cpp index 38e2fa8425..d2625354ef 100644 --- a/src/armnn/backends/ClWorkloads/ClNormalizationFloatWorkload.cpp +++ b/src/armnn/backends/ClWorkloads/ClNormalizationFloatWorkload.cpp @@ -9,6 +9,7 @@ #include "backends/ClLayerSupport.hpp" #include "backends/ArmComputeUtils.hpp" #include "backends/ArmComputeTensorUtils.hpp" +#include "ClWorkloadUtils.hpp" namespace armnn { @@ -46,4 +47,4 @@ void ClNormalizationFloatWorkload::Execute() const m_NormalizationLayer.run(); } -} //namespace armnn \ No newline at end of file +} //namespace armnn diff --git a/src/armnn/backends/ClWorkloads/ClNormalizationFloatWorkload.hpp b/src/armnn/backends/ClWorkloads/ClNormalizationFloatWorkload.hpp index 40534fa1cd..f02d0adb70 100644 --- a/src/armnn/backends/ClWorkloads/ClNormalizationFloatWorkload.hpp +++ b/src/armnn/backends/ClWorkloads/ClNormalizationFloatWorkload.hpp @@ -5,7 +5,9 @@ #pragma once -#include "backends/ClWorkloadUtils.hpp" +#include "backends/Workload.hpp" + +#include namespace armnn { @@ -24,4 +26,4 @@ private: mutable arm_compute::CLNormalizationLayer m_NormalizationLayer; }; -} //namespace armnn \ No newline at end of file +} //namespace armnn diff --git a/src/armnn/backends/ClWorkloads/ClPermuteWorkload.cpp b/src/armnn/backends/ClWorkloads/ClPermuteWorkload.cpp index c2c15874e3..29d98bf0eb 100644 --- a/src/armnn/backends/ClWorkloads/ClPermuteWorkload.cpp +++ b/src/armnn/backends/ClWorkloads/ClPermuteWorkload.cpp @@ -9,6 +9,8 @@ #include +#include "ClWorkloadUtils.hpp" + namespace armnn { diff --git a/src/armnn/backends/ClWorkloads/ClPermuteWorkload.hpp b/src/armnn/backends/ClWorkloads/ClPermuteWorkload.hpp index a848955a92..a1f3161921 100644 --- a/src/armnn/backends/ClWorkloads/ClPermuteWorkload.hpp +++ b/src/armnn/backends/ClWorkloads/ClPermuteWorkload.hpp @@ -7,7 +7,6 @@ #include "backends/Workload.hpp" #include "backends/WorkloadData.hpp" -#include "backends/ClWorkloadUtils.hpp" #include #include diff --git a/src/armnn/backends/ClWorkloads/ClPooling2dBaseWorkload.hpp b/src/armnn/backends/ClWorkloads/ClPooling2dBaseWorkload.hpp index 3c61b0ddb9..ea7ddfb41b 100644 --- a/src/armnn/backends/ClWorkloads/ClPooling2dBaseWorkload.hpp +++ b/src/armnn/backends/ClWorkloads/ClPooling2dBaseWorkload.hpp @@ -5,7 +5,9 @@ #pragma once -#include "backends/ClWorkloadUtils.hpp" +#include "backends/Workload.hpp" + +#include namespace armnn { diff --git a/src/armnn/backends/ClWorkloads/ClPooling2dFloatWorkload.cpp b/src/armnn/backends/ClWorkloads/ClPooling2dFloatWorkload.cpp index 1b8f68bce4..dc9d17f0ae 100644 --- a/src/armnn/backends/ClWorkloads/ClPooling2dFloatWorkload.cpp +++ b/src/armnn/backends/ClWorkloads/ClPooling2dFloatWorkload.cpp @@ -5,6 +5,8 @@ #include "ClPooling2dFloatWorkload.hpp" +#include "ClWorkloadUtils.hpp" + namespace armnn { diff --git a/src/armnn/backends/ClWorkloads/ClPooling2dFloatWorkload.hpp b/src/armnn/backends/ClWorkloads/ClPooling2dFloatWorkload.hpp index 61d27ca694..71648d40f4 100644 --- a/src/armnn/backends/ClWorkloads/ClPooling2dFloatWorkload.hpp +++ b/src/armnn/backends/ClWorkloads/ClPooling2dFloatWorkload.hpp @@ -5,8 +5,9 @@ #pragma once -#include "backends/ClWorkloadUtils.hpp" -#include "backends/ClWorkloads//ClPooling2dBaseWorkload.hpp" +#include "backends/Workload.hpp" + +#include "ClPooling2dBaseWorkload.hpp" namespace armnn { diff --git a/src/armnn/backends/ClWorkloads/ClPooling2dUint8Workload.cpp b/src/armnn/backends/ClWorkloads/ClPooling2dUint8Workload.cpp index 3d2b8eb626..0b4b15f806 100644 --- a/src/armnn/backends/ClWorkloads/ClPooling2dUint8Workload.cpp +++ b/src/armnn/backends/ClWorkloads/ClPooling2dUint8Workload.cpp @@ -5,6 +5,8 @@ #include "ClPooling2dUint8Workload.hpp" +#include "ClWorkloadUtils.hpp" + namespace armnn { diff --git a/src/armnn/backends/ClWorkloads/ClPooling2dUint8Workload.hpp b/src/armnn/backends/ClWorkloads/ClPooling2dUint8Workload.hpp index f4097a3753..2baf2aa708 100644 --- a/src/armnn/backends/ClWorkloads/ClPooling2dUint8Workload.hpp +++ b/src/armnn/backends/ClWorkloads/ClPooling2dUint8Workload.hpp @@ -5,8 +5,9 @@ #pragma once -#include "backends/ClWorkloadUtils.hpp" -#include "backends/ClWorkloads/ClPooling2dBaseWorkload.hpp" +#include "backends/Workload.hpp" + +#include "ClPooling2dBaseWorkload.hpp" namespace armnn { diff --git a/src/armnn/backends/ClWorkloads/ClReshapeFloatWorkload.cpp b/src/armnn/backends/ClWorkloads/ClReshapeFloatWorkload.cpp index 66888d6018..ea50436a66 100644 --- a/src/armnn/backends/ClWorkloads/ClReshapeFloatWorkload.cpp +++ b/src/armnn/backends/ClWorkloads/ClReshapeFloatWorkload.cpp @@ -7,6 +7,8 @@ #include "backends/ClTensorHandle.hpp" #include "backends/CpuTensorHandle.hpp" +#include "ClWorkloadUtils.hpp" + namespace armnn { diff --git a/src/armnn/backends/ClWorkloads/ClReshapeFloatWorkload.hpp b/src/armnn/backends/ClWorkloads/ClReshapeFloatWorkload.hpp index 290f540fb9..48265143e5 100644 --- a/src/armnn/backends/ClWorkloads/ClReshapeFloatWorkload.hpp +++ b/src/armnn/backends/ClWorkloads/ClReshapeFloatWorkload.hpp @@ -5,7 +5,9 @@ #pragma once -#include "backends/ClWorkloadUtils.hpp" +#include "backends/Workload.hpp" + +#include namespace armnn { diff --git a/src/armnn/backends/ClWorkloads/ClReshapeUint8Workload.cpp b/src/armnn/backends/ClWorkloads/ClReshapeUint8Workload.cpp index 5d2404e54e..82bd93ef9c 100644 --- a/src/armnn/backends/ClWorkloads/ClReshapeUint8Workload.cpp +++ b/src/armnn/backends/ClWorkloads/ClReshapeUint8Workload.cpp @@ -7,6 +7,8 @@ #include "backends/ClTensorHandle.hpp" #include "backends/CpuTensorHandle.hpp" +#include "ClWorkloadUtils.hpp" + namespace armnn { ClReshapeUint8Workload::ClReshapeUint8Workload(const ReshapeQueueDescriptor& descriptor, const WorkloadInfo& info) @@ -26,4 +28,4 @@ void ClReshapeUint8Workload::Execute() const m_Layer.run(); } -} //namespace armnn \ No newline at end of file +} //namespace armnn diff --git a/src/armnn/backends/ClWorkloads/ClReshapeUint8Workload.hpp b/src/armnn/backends/ClWorkloads/ClReshapeUint8Workload.hpp index 73915f5efe..c9801a3ae1 100644 --- a/src/armnn/backends/ClWorkloads/ClReshapeUint8Workload.hpp +++ b/src/armnn/backends/ClWorkloads/ClReshapeUint8Workload.hpp @@ -5,7 +5,9 @@ #pragma once -#include "backends/ClWorkloadUtils.hpp" +#include "backends/Workload.hpp" + +#include namespace armnn { diff --git a/src/armnn/backends/ClWorkloads/ClResizeBilinearFloatWorkload.cpp b/src/armnn/backends/ClWorkloads/ClResizeBilinearFloatWorkload.cpp index 39aa868239..8348afb76a 100644 --- a/src/armnn/backends/ClWorkloads/ClResizeBilinearFloatWorkload.cpp +++ b/src/armnn/backends/ClWorkloads/ClResizeBilinearFloatWorkload.cpp @@ -9,6 +9,8 @@ #include "backends/ClLayerSupport.hpp" #include "backends/ArmComputeUtils.hpp" +#include "ClWorkloadUtils.hpp" + namespace armnn { @@ -33,4 +35,4 @@ void ClResizeBilinearFloatWorkload::Execute() const } -} //namespace armnn \ No newline at end of file +} //namespace armnn diff --git a/src/armnn/backends/ClWorkloads/ClResizeBilinearFloatWorkload.hpp b/src/armnn/backends/ClWorkloads/ClResizeBilinearFloatWorkload.hpp index 9478c1a55c..f2ee67f5dd 100644 --- a/src/armnn/backends/ClWorkloads/ClResizeBilinearFloatWorkload.hpp +++ b/src/armnn/backends/ClWorkloads/ClResizeBilinearFloatWorkload.hpp @@ -5,7 +5,9 @@ #pragma once -#include "backends/ClWorkloadUtils.hpp" +#include "backends/Workload.hpp" + +#include namespace armnn { @@ -20,4 +22,4 @@ private: mutable arm_compute::CLScale m_ResizeBilinearLayer; }; -} //namespace armnn \ No newline at end of file +} //namespace armnn diff --git a/src/armnn/backends/ClWorkloads/ClSoftmaxBaseWorkload.cpp b/src/armnn/backends/ClWorkloads/ClSoftmaxBaseWorkload.cpp index 70abe75b30..b4ea236d49 100644 --- a/src/armnn/backends/ClWorkloads/ClSoftmaxBaseWorkload.cpp +++ b/src/armnn/backends/ClWorkloads/ClSoftmaxBaseWorkload.cpp @@ -7,6 +7,8 @@ #include "backends/ArmComputeTensorUtils.hpp" +#include + namespace armnn { diff --git a/src/armnn/backends/ClWorkloads/ClSoftmaxBaseWorkload.hpp b/src/armnn/backends/ClWorkloads/ClSoftmaxBaseWorkload.hpp index 751d8ff1a4..b800056cdf 100644 --- a/src/armnn/backends/ClWorkloads/ClSoftmaxBaseWorkload.hpp +++ b/src/armnn/backends/ClWorkloads/ClSoftmaxBaseWorkload.hpp @@ -5,7 +5,8 @@ #pragma once -#include "backends/ClWorkloadUtils.hpp" +#include +#include namespace armnn { diff --git a/src/armnn/backends/ClWorkloads/ClSoftmaxFloatWorkload.cpp b/src/armnn/backends/ClWorkloads/ClSoftmaxFloatWorkload.cpp index d809f9a418..c34b5a2a74 100644 --- a/src/armnn/backends/ClWorkloads/ClSoftmaxFloatWorkload.cpp +++ b/src/armnn/backends/ClWorkloads/ClSoftmaxFloatWorkload.cpp @@ -7,6 +7,8 @@ #include "backends/ClTensorHandle.hpp" #include "backends/CpuTensorHandle.hpp" +#include "ClWorkloadUtils.hpp" + namespace armnn { diff --git a/src/armnn/backends/ClWorkloads/ClSoftmaxFloatWorkload.hpp b/src/armnn/backends/ClWorkloads/ClSoftmaxFloatWorkload.hpp index de8ff7e17e..965b845cf8 100644 --- a/src/armnn/backends/ClWorkloads/ClSoftmaxFloatWorkload.hpp +++ b/src/armnn/backends/ClWorkloads/ClSoftmaxFloatWorkload.hpp @@ -5,8 +5,9 @@ #pragma once -#include "backends/ClWorkloadUtils.hpp" +#include "backends/Workload.hpp" +#include #include "arm_compute/runtime/MemoryManagerOnDemand.h" #include diff --git a/src/armnn/backends/ClWorkloads/ClSoftmaxUint8Workload.cpp b/src/armnn/backends/ClWorkloads/ClSoftmaxUint8Workload.cpp index 123f7c6c9f..1bb9628d74 100644 --- a/src/armnn/backends/ClWorkloads/ClSoftmaxUint8Workload.cpp +++ b/src/armnn/backends/ClWorkloads/ClSoftmaxUint8Workload.cpp @@ -7,6 +7,8 @@ #include "backends/ClTensorHandle.hpp" #include "backends/CpuTensorHandle.hpp" +#include "ClWorkloadUtils.hpp" + namespace armnn { diff --git a/src/armnn/backends/ClWorkloads/ClSoftmaxUint8Workload.hpp b/src/armnn/backends/ClWorkloads/ClSoftmaxUint8Workload.hpp index f5eba719bb..29427a5976 100644 --- a/src/armnn/backends/ClWorkloads/ClSoftmaxUint8Workload.hpp +++ b/src/armnn/backends/ClWorkloads/ClSoftmaxUint8Workload.hpp @@ -5,8 +5,9 @@ #pragma once -#include "backends/ClWorkloadUtils.hpp" +#include "backends/Workload.hpp" +#include #include "arm_compute/runtime/MemoryManagerOnDemand.h" #include diff --git a/src/armnn/backends/ClWorkloads/ClSplitterFloatWorkload.cpp b/src/armnn/backends/ClWorkloads/ClSplitterFloatWorkload.cpp index a95c062c2a..5fd634bdb6 100644 --- a/src/armnn/backends/ClWorkloads/ClSplitterFloatWorkload.cpp +++ b/src/armnn/backends/ClWorkloads/ClSplitterFloatWorkload.cpp @@ -5,6 +5,8 @@ #include "ClSplitterFloatWorkload.hpp" +#include "ClWorkloadUtils.hpp" + namespace armnn { diff --git a/src/armnn/backends/ClWorkloads/ClSplitterUint8Workload.cpp b/src/armnn/backends/ClWorkloads/ClSplitterUint8Workload.cpp index 207a3c45e2..50a251ada7 100644 --- a/src/armnn/backends/ClWorkloads/ClSplitterUint8Workload.cpp +++ b/src/armnn/backends/ClWorkloads/ClSplitterUint8Workload.cpp @@ -5,6 +5,8 @@ #include "ClSplitterUint8Workload.hpp" +#include "ClWorkloadUtils.hpp" + namespace armnn { diff --git a/src/armnn/backends/ClWorkloads/ClSubtractionWorkload.cpp b/src/armnn/backends/ClWorkloads/ClSubtractionWorkload.cpp index ec8bfc6351..1c70130fa4 100644 --- a/src/armnn/backends/ClWorkloads/ClSubtractionWorkload.cpp +++ b/src/armnn/backends/ClWorkloads/ClSubtractionWorkload.cpp @@ -9,6 +9,8 @@ #include "backends/CpuTensorHandle.hpp" #include "backends/ArmComputeTensorUtils.hpp" +#include "ClWorkloadUtils.hpp" + namespace armnn { using namespace armcomputetensorutils; diff --git a/src/armnn/backends/ClWorkloads/ClSubtractionWorkload.hpp b/src/armnn/backends/ClWorkloads/ClSubtractionWorkload.hpp index 422e6a7379..59a5f01e73 100644 --- a/src/armnn/backends/ClWorkloads/ClSubtractionWorkload.hpp +++ b/src/armnn/backends/ClWorkloads/ClSubtractionWorkload.hpp @@ -5,7 +5,9 @@ #pragma once -#include "backends/ClWorkloadUtils.hpp" +#include "backends/Workload.hpp" + +#include namespace armnn { diff --git a/src/armnn/backends/ClWorkloads/ClWorkloadUtils.hpp b/src/armnn/backends/ClWorkloads/ClWorkloadUtils.hpp new file mode 100644 index 0000000000..a42e48c97d --- /dev/null +++ b/src/armnn/backends/ClWorkloads/ClWorkloadUtils.hpp @@ -0,0 +1,67 @@ +// +// Copyright © 2017 Arm Ltd. All rights reserved. +// SPDX-License-Identifier: MIT +// +#pragma once + +#include "OpenClTimer.hpp" +#include "backends/Workload.hpp" +#include "backends/ArmComputeTensorUtils.hpp" +#include "backends/CpuTensorHandle.hpp" + +#include +#include +#include + +#include + +#define ARMNN_SCOPED_PROFILING_EVENT_CL(name) \ + ARMNN_SCOPED_PROFILING_EVENT_WITH_INSTRUMENTS(armnn::Compute::GpuAcc, \ + name, \ + armnn::OpenClTimer(), \ + armnn::WallClockTimer()) + +namespace armnn +{ + +template +void CopyArmComputeClTensorData(const T* srcData, arm_compute::CLTensor& dstTensor) +{ + { + ARMNN_SCOPED_PROFILING_EVENT_CL("MapClTensorForWriting"); + dstTensor.map(true); + } + + { + ARMNN_SCOPED_PROFILING_EVENT_CL("CopyToClTensor"); + armcomputetensorutils::CopyArmComputeITensorData(srcData, dstTensor); + } + + dstTensor.unmap(); +} + +template +void InitialiseArmComputeClTensorData(arm_compute::CLTensor& clTensor, const T* data) +{ + armcomputetensorutils::InitialiseArmComputeTensorEmpty(clTensor); + CopyArmComputeClTensorData(data, clTensor); +} + +inline void InitializeArmComputeClTensorDataForFloatTypes(arm_compute::CLTensor& clTensor, + const ConstCpuTensorHandle *handle) +{ + BOOST_ASSERT(handle); + switch(handle->GetTensorInfo().GetDataType()) + { + case DataType::Float16: + InitialiseArmComputeClTensorData(clTensor, handle->GetConstTensor()); + break; + case DataType::Float32: + InitialiseArmComputeClTensorData(clTensor, handle->GetConstTensor()); + break; + default: + BOOST_ASSERT_MSG(false, "Unexpected floating point type."); + } +}; + +} //namespace armnn diff --git a/src/armnn/backends/test/ArmComputeCl.cpp b/src/armnn/backends/test/ArmComputeCl.cpp index d8a70f03c0..9a516b6d60 100644 --- a/src/armnn/backends/test/ArmComputeCl.cpp +++ b/src/armnn/backends/test/ArmComputeCl.cpp @@ -8,7 +8,7 @@ #include "backends/CpuTensorHandle.hpp" #include "backends/ClWorkloadFactory.hpp" -#include "backends/ClWorkloadUtils.hpp" +#include "backends/ClWorkloads/ClWorkloadUtils.hpp" #include "backends/RefWorkloadFactory.hpp" #include "backends/ClLayerSupport.hpp" #include "ActivationFixture.hpp" diff --git a/src/armnn/backends/test/CreateWorkloadCl.cpp b/src/armnn/backends/test/CreateWorkloadCl.cpp index bce265c7d0..af3192cae2 100644 --- a/src/armnn/backends/test/CreateWorkloadCl.cpp +++ b/src/armnn/backends/test/CreateWorkloadCl.cpp @@ -5,7 +5,7 @@ #include "backends/ClWorkloadFactory.hpp" #include "backends/RefWorkloadFactory.hpp" #include "backends/MemCopyWorkload.hpp" -#include "backends/ClWorkloadUtils.hpp" +#include "backends/ClWorkloads/ClWorkloadUtils.hpp" #include "backends/ClWorkloads.hpp" #include "backends/ClTensorHandle.hpp" #include "ClContextControlFixture.hpp" -- cgit v1.2.1