From 1f58f03d82c482626b1b4673b6c0e25da4338fb5 Mon Sep 17 00:00:00 2001 From: James Conroy Date: Tue, 27 Apr 2021 17:13:27 +0100 Subject: IVGCVSW-5815 Generalise ConstCpuTensorHandle * Generalises ConstCpuTensorHandle and inherited classes by removing 'Cpu' from aliases. * New renamed classes: ConstTensorHandle, TensorHandle, ScopedTensorHandle, PassthroughTensorHandle, ConstPassthroughTensorHandle. Signed-off-by: James Conroy Change-Id: I1824e0e134202735fb77051f20a7252f161dfe16 --- src/backends/cl/ClWorkloadFactory.cpp | 2 +- src/backends/cl/test/ClCreateWorkloadTests.cpp | 4 ++-- src/backends/cl/test/ClLayerSupportTests.cpp | 2 +- src/backends/cl/test/Fp16SupportTest.cpp | 2 +- src/backends/cl/test/OpenClTimerTest.cpp | 10 +++++----- src/backends/cl/workloads/ClActivationWorkload.cpp | 2 +- src/backends/cl/workloads/ClAdditionWorkload.cpp | 2 +- src/backends/cl/workloads/ClArgMinMaxWorkload.cpp | 2 +- .../cl/workloads/ClBatchNormalizationFloatWorkload.cpp | 2 +- src/backends/cl/workloads/ClBatchToSpaceNdWorkload.cpp | 2 +- src/backends/cl/workloads/ClComparisonWorkload.cpp | 2 +- src/backends/cl/workloads/ClConcatWorkload.cpp | 2 +- src/backends/cl/workloads/ClConstantWorkload.cpp | 2 +- src/backends/cl/workloads/ClConvolution2dWorkload.cpp | 2 +- src/backends/cl/workloads/ClDepthwiseConvolutionWorkload.cpp | 4 ++-- src/backends/cl/workloads/ClDequantizeWorkload.cpp | 2 +- src/backends/cl/workloads/ClDivisionWorkload.cpp | 2 +- src/backends/cl/workloads/ClFullyConnectedWorkload.cpp | 2 +- src/backends/cl/workloads/ClL2NormalizationFloatWorkload.cpp | 2 +- src/backends/cl/workloads/ClLstmFloatWorkload.cpp | 2 +- src/backends/cl/workloads/ClMaximumWorkload.cpp | 2 +- src/backends/cl/workloads/ClMinimumWorkload.cpp | 2 +- src/backends/cl/workloads/ClMultiplicationWorkload.cpp | 2 +- src/backends/cl/workloads/ClNormalizationFloatWorkload.cpp | 2 +- src/backends/cl/workloads/ClPreluWorkload.cpp | 2 +- src/backends/cl/workloads/ClQuantizeWorkload.cpp | 2 +- src/backends/cl/workloads/ClQuantizedLstmWorkload.cpp | 2 +- src/backends/cl/workloads/ClReshapeWorkload.cpp | 2 +- src/backends/cl/workloads/ClResizeWorkload.cpp | 2 +- src/backends/cl/workloads/ClSpaceToBatchNdWorkload.cpp | 2 +- src/backends/cl/workloads/ClSpaceToDepthWorkload.cpp | 2 +- src/backends/cl/workloads/ClSplitterWorkload.cpp | 2 +- src/backends/cl/workloads/ClStackWorkload.cpp | 2 +- src/backends/cl/workloads/ClStridedSliceWorkload.cpp | 2 +- src/backends/cl/workloads/ClSubtractionWorkload.cpp | 2 +- src/backends/cl/workloads/ClTransposeConvolution2dWorkload.cpp | 2 +- src/backends/cl/workloads/ClWorkloadUtils.hpp | 4 ++-- 37 files changed, 44 insertions(+), 44 deletions(-) (limited to 'src/backends/cl') diff --git a/src/backends/cl/ClWorkloadFactory.cpp b/src/backends/cl/ClWorkloadFactory.cpp index 19ad773338..0d8d0a7c28 100644 --- a/src/backends/cl/ClWorkloadFactory.cpp +++ b/src/backends/cl/ClWorkloadFactory.cpp @@ -16,10 +16,10 @@ #include #include -#include #include #include #include +#include #include #include diff --git a/src/backends/cl/test/ClCreateWorkloadTests.cpp b/src/backends/cl/test/ClCreateWorkloadTests.cpp index e22479c25b..47e2f4e8d7 100644 --- a/src/backends/cl/test/ClCreateWorkloadTests.cpp +++ b/src/backends/cl/test/ClCreateWorkloadTests.cpp @@ -395,8 +395,8 @@ BOOST_AUTO_TEST_CASE(CreateConvolution2dClCompiledContextWorkload) WorkloadInfo workloadInfo; - ScopedCpuTensorHandle weightTensor(kernelInfo); - ScopedCpuTensorHandle biasTensor(biasInfo); + ScopedTensorHandle weightTensor(kernelInfo); + ScopedTensorHandle biasTensor(biasInfo); AllocateAndCopyDataToITensorHandle(&weightTensor, kernelData.data()); AllocateAndCopyDataToITensorHandle(&biasTensor, biasData.data()); diff --git a/src/backends/cl/test/ClLayerSupportTests.cpp b/src/backends/cl/test/ClLayerSupportTests.cpp index 2b8b0d48a7..794a45fa48 100644 --- a/src/backends/cl/test/ClLayerSupportTests.cpp +++ b/src/backends/cl/test/ClLayerSupportTests.cpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/backends/cl/test/Fp16SupportTest.cpp b/src/backends/cl/test/Fp16SupportTest.cpp index b7d274fdca..5afafcb783 100644 --- a/src/backends/cl/test/Fp16SupportTest.cpp +++ b/src/backends/cl/test/Fp16SupportTest.cpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include #include diff --git a/src/backends/cl/test/OpenClTimerTest.cpp b/src/backends/cl/test/OpenClTimerTest.cpp index 0e1f28ec4e..1b86d2e304 100644 --- a/src/backends/cl/test/OpenClTimerTest.cpp +++ b/src/backends/cl/test/OpenClTimerTest.cpp @@ -9,7 +9,7 @@ #include -#include +#include #include #include @@ -79,10 +79,10 @@ BOOST_AUTO_TEST_CASE(OpenClTimerBatchNorm) BatchNormalizationQueueDescriptor data; WorkloadInfo info; - ScopedCpuTensorHandle meanTensor(tensorInfo); - ScopedCpuTensorHandle varianceTensor(tensorInfo); - ScopedCpuTensorHandle betaTensor(tensorInfo); - ScopedCpuTensorHandle gammaTensor(tensorInfo); + ScopedTensorHandle meanTensor(tensorInfo); + ScopedTensorHandle varianceTensor(tensorInfo); + ScopedTensorHandle betaTensor(tensorInfo); + ScopedTensorHandle gammaTensor(tensorInfo); AllocateAndCopyDataToITensorHandle(&meanTensor, &mean[0]); AllocateAndCopyDataToITensorHandle(&varianceTensor, &variance[0]); diff --git a/src/backends/cl/workloads/ClActivationWorkload.cpp b/src/backends/cl/workloads/ClActivationWorkload.cpp index 8997a9720d..e2f64a9d7e 100644 --- a/src/backends/cl/workloads/ClActivationWorkload.cpp +++ b/src/backends/cl/workloads/ClActivationWorkload.cpp @@ -7,7 +7,7 @@ #include "ClWorkloadUtils.hpp" -#include +#include #include #include #include diff --git a/src/backends/cl/workloads/ClAdditionWorkload.cpp b/src/backends/cl/workloads/ClAdditionWorkload.cpp index 0ab7446026..4793cc6f8f 100644 --- a/src/backends/cl/workloads/ClAdditionWorkload.cpp +++ b/src/backends/cl/workloads/ClAdditionWorkload.cpp @@ -6,7 +6,7 @@ #include "ClAdditionWorkload.hpp" #include -#include +#include #include #include diff --git a/src/backends/cl/workloads/ClArgMinMaxWorkload.cpp b/src/backends/cl/workloads/ClArgMinMaxWorkload.cpp index 8974930afa..7475cfa315 100644 --- a/src/backends/cl/workloads/ClArgMinMaxWorkload.cpp +++ b/src/backends/cl/workloads/ClArgMinMaxWorkload.cpp @@ -8,7 +8,7 @@ #include -#include +#include #include #include diff --git a/src/backends/cl/workloads/ClBatchNormalizationFloatWorkload.cpp b/src/backends/cl/workloads/ClBatchNormalizationFloatWorkload.cpp index daaed17a90..361d6f87a5 100644 --- a/src/backends/cl/workloads/ClBatchNormalizationFloatWorkload.cpp +++ b/src/backends/cl/workloads/ClBatchNormalizationFloatWorkload.cpp @@ -8,7 +8,7 @@ #include #include -#include +#include #include #include diff --git a/src/backends/cl/workloads/ClBatchToSpaceNdWorkload.cpp b/src/backends/cl/workloads/ClBatchToSpaceNdWorkload.cpp index 8978c5a66e..b9736db642 100644 --- a/src/backends/cl/workloads/ClBatchToSpaceNdWorkload.cpp +++ b/src/backends/cl/workloads/ClBatchToSpaceNdWorkload.cpp @@ -6,7 +6,7 @@ #include "ClBatchToSpaceNdWorkload.hpp" #include -#include +#include #include #include diff --git a/src/backends/cl/workloads/ClComparisonWorkload.cpp b/src/backends/cl/workloads/ClComparisonWorkload.cpp index 20e5669807..35e6d68733 100644 --- a/src/backends/cl/workloads/ClComparisonWorkload.cpp +++ b/src/backends/cl/workloads/ClComparisonWorkload.cpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include #include diff --git a/src/backends/cl/workloads/ClConcatWorkload.cpp b/src/backends/cl/workloads/ClConcatWorkload.cpp index 3c5f23742a..1c2d476e0c 100644 --- a/src/backends/cl/workloads/ClConcatWorkload.cpp +++ b/src/backends/cl/workloads/ClConcatWorkload.cpp @@ -6,7 +6,7 @@ #include "ClWorkloadUtils.hpp" #include #include -#include +#include #include #include diff --git a/src/backends/cl/workloads/ClConstantWorkload.cpp b/src/backends/cl/workloads/ClConstantWorkload.cpp index 40acb8ebd0..60dcd59268 100644 --- a/src/backends/cl/workloads/ClConstantWorkload.cpp +++ b/src/backends/cl/workloads/ClConstantWorkload.cpp @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include "ClWorkloadUtils.hpp" diff --git a/src/backends/cl/workloads/ClConvolution2dWorkload.cpp b/src/backends/cl/workloads/ClConvolution2dWorkload.cpp index 99a981bd0c..5c731aa0a1 100644 --- a/src/backends/cl/workloads/ClConvolution2dWorkload.cpp +++ b/src/backends/cl/workloads/ClConvolution2dWorkload.cpp @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include diff --git a/src/backends/cl/workloads/ClDepthwiseConvolutionWorkload.cpp b/src/backends/cl/workloads/ClDepthwiseConvolutionWorkload.cpp index 655f0c9c35..50cdb0a626 100644 --- a/src/backends/cl/workloads/ClDepthwiseConvolutionWorkload.cpp +++ b/src/backends/cl/workloads/ClDepthwiseConvolutionWorkload.cpp @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include @@ -137,7 +137,7 @@ ClDepthwiseConvolutionWorkload::ClDepthwiseConvolutionWorkload( ARMNN_ASSERT(m_DepthwiseConvolutionLayer); - ScopedCpuTensorHandle weightsPermutedHandle(weightPermuted); + ScopedTensorHandle weightsPermutedHandle(weightPermuted); InitializeArmComputeClTensorData(*m_KernelTensor, &weightsPermutedHandle); if (m_BiasTensor) diff --git a/src/backends/cl/workloads/ClDequantizeWorkload.cpp b/src/backends/cl/workloads/ClDequantizeWorkload.cpp index 52d8fab93c..42cc579a8c 100644 --- a/src/backends/cl/workloads/ClDequantizeWorkload.cpp +++ b/src/backends/cl/workloads/ClDequantizeWorkload.cpp @@ -8,7 +8,7 @@ #include #include -#include +#include #include diff --git a/src/backends/cl/workloads/ClDivisionWorkload.cpp b/src/backends/cl/workloads/ClDivisionWorkload.cpp index be5f3b8225..76220a1b64 100644 --- a/src/backends/cl/workloads/ClDivisionWorkload.cpp +++ b/src/backends/cl/workloads/ClDivisionWorkload.cpp @@ -6,7 +6,7 @@ #include "ClDivisionWorkload.hpp" #include -#include +#include #include diff --git a/src/backends/cl/workloads/ClFullyConnectedWorkload.cpp b/src/backends/cl/workloads/ClFullyConnectedWorkload.cpp index 9135d27376..d1d911ac13 100644 --- a/src/backends/cl/workloads/ClFullyConnectedWorkload.cpp +++ b/src/backends/cl/workloads/ClFullyConnectedWorkload.cpp @@ -5,7 +5,7 @@ #include "ClFullyConnectedWorkload.hpp" #include -#include +#include #include #include #include diff --git a/src/backends/cl/workloads/ClL2NormalizationFloatWorkload.cpp b/src/backends/cl/workloads/ClL2NormalizationFloatWorkload.cpp index bd38219a3e..984f21a4db 100644 --- a/src/backends/cl/workloads/ClL2NormalizationFloatWorkload.cpp +++ b/src/backends/cl/workloads/ClL2NormalizationFloatWorkload.cpp @@ -5,7 +5,7 @@ #include "ClL2NormalizationFloatWorkload.hpp" #include -#include +#include #include #include "ClWorkloadUtils.hpp" diff --git a/src/backends/cl/workloads/ClLstmFloatWorkload.cpp b/src/backends/cl/workloads/ClLstmFloatWorkload.cpp index 58cc735704..908f20bfe5 100644 --- a/src/backends/cl/workloads/ClLstmFloatWorkload.cpp +++ b/src/backends/cl/workloads/ClLstmFloatWorkload.cpp @@ -5,7 +5,7 @@ #include "ClLstmFloatWorkload.hpp" #include -#include +#include #include #include diff --git a/src/backends/cl/workloads/ClMaximumWorkload.cpp b/src/backends/cl/workloads/ClMaximumWorkload.cpp index 85bea47f21..0aa15e5dd3 100644 --- a/src/backends/cl/workloads/ClMaximumWorkload.cpp +++ b/src/backends/cl/workloads/ClMaximumWorkload.cpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include #include diff --git a/src/backends/cl/workloads/ClMinimumWorkload.cpp b/src/backends/cl/workloads/ClMinimumWorkload.cpp index 07a78b5008..4924002432 100644 --- a/src/backends/cl/workloads/ClMinimumWorkload.cpp +++ b/src/backends/cl/workloads/ClMinimumWorkload.cpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include #include diff --git a/src/backends/cl/workloads/ClMultiplicationWorkload.cpp b/src/backends/cl/workloads/ClMultiplicationWorkload.cpp index 31e9d022cc..2bd1e1615a 100644 --- a/src/backends/cl/workloads/ClMultiplicationWorkload.cpp +++ b/src/backends/cl/workloads/ClMultiplicationWorkload.cpp @@ -6,7 +6,7 @@ #include "ClMultiplicationWorkload.hpp" #include -#include +#include #include diff --git a/src/backends/cl/workloads/ClNormalizationFloatWorkload.cpp b/src/backends/cl/workloads/ClNormalizationFloatWorkload.cpp index 290d29ae52..e9b2caf6ee 100644 --- a/src/backends/cl/workloads/ClNormalizationFloatWorkload.cpp +++ b/src/backends/cl/workloads/ClNormalizationFloatWorkload.cpp @@ -5,7 +5,7 @@ #include "ClNormalizationFloatWorkload.hpp" #include -#include +#include #include #include #include diff --git a/src/backends/cl/workloads/ClPreluWorkload.cpp b/src/backends/cl/workloads/ClPreluWorkload.cpp index 73fa887532..9b45441b02 100644 --- a/src/backends/cl/workloads/ClPreluWorkload.cpp +++ b/src/backends/cl/workloads/ClPreluWorkload.cpp @@ -5,7 +5,7 @@ #include "ClPreluWorkload.hpp" #include "ClWorkloadUtils.hpp" -#include +#include #include #include #include diff --git a/src/backends/cl/workloads/ClQuantizeWorkload.cpp b/src/backends/cl/workloads/ClQuantizeWorkload.cpp index 5c945e0921..527c64013b 100644 --- a/src/backends/cl/workloads/ClQuantizeWorkload.cpp +++ b/src/backends/cl/workloads/ClQuantizeWorkload.cpp @@ -9,7 +9,7 @@ #include #include -#include +#include #include #include diff --git a/src/backends/cl/workloads/ClQuantizedLstmWorkload.cpp b/src/backends/cl/workloads/ClQuantizedLstmWorkload.cpp index 636bdecbeb..d50414b1cf 100644 --- a/src/backends/cl/workloads/ClQuantizedLstmWorkload.cpp +++ b/src/backends/cl/workloads/ClQuantizedLstmWorkload.cpp @@ -6,7 +6,7 @@ #include "ClQuantizedLstmWorkload.hpp" #include "ClWorkloadUtils.hpp" -#include +#include #include #include diff --git a/src/backends/cl/workloads/ClReshapeWorkload.cpp b/src/backends/cl/workloads/ClReshapeWorkload.cpp index 0988babf23..1f82cfbee2 100644 --- a/src/backends/cl/workloads/ClReshapeWorkload.cpp +++ b/src/backends/cl/workloads/ClReshapeWorkload.cpp @@ -5,7 +5,7 @@ #include "ClReshapeWorkload.hpp" #include -#include +#include #include "ClWorkloadUtils.hpp" diff --git a/src/backends/cl/workloads/ClResizeWorkload.cpp b/src/backends/cl/workloads/ClResizeWorkload.cpp index e47740624e..3406011d04 100644 --- a/src/backends/cl/workloads/ClResizeWorkload.cpp +++ b/src/backends/cl/workloads/ClResizeWorkload.cpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include diff --git a/src/backends/cl/workloads/ClSpaceToBatchNdWorkload.cpp b/src/backends/cl/workloads/ClSpaceToBatchNdWorkload.cpp index 7b29cded0f..3aa8ebd2a8 100644 --- a/src/backends/cl/workloads/ClSpaceToBatchNdWorkload.cpp +++ b/src/backends/cl/workloads/ClSpaceToBatchNdWorkload.cpp @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/backends/cl/workloads/ClSpaceToDepthWorkload.cpp b/src/backends/cl/workloads/ClSpaceToDepthWorkload.cpp index 7a590d26b6..67487c4bf1 100644 --- a/src/backends/cl/workloads/ClSpaceToDepthWorkload.cpp +++ b/src/backends/cl/workloads/ClSpaceToDepthWorkload.cpp @@ -8,7 +8,7 @@ #include #include -#include +#include #include #include diff --git a/src/backends/cl/workloads/ClSplitterWorkload.cpp b/src/backends/cl/workloads/ClSplitterWorkload.cpp index 70a817825e..8eb58c967e 100644 --- a/src/backends/cl/workloads/ClSplitterWorkload.cpp +++ b/src/backends/cl/workloads/ClSplitterWorkload.cpp @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include diff --git a/src/backends/cl/workloads/ClStackWorkload.cpp b/src/backends/cl/workloads/ClStackWorkload.cpp index 749282f53a..38c76eb648 100644 --- a/src/backends/cl/workloads/ClStackWorkload.cpp +++ b/src/backends/cl/workloads/ClStackWorkload.cpp @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/backends/cl/workloads/ClStridedSliceWorkload.cpp b/src/backends/cl/workloads/ClStridedSliceWorkload.cpp index 92e860fc42..adf32ce1fc 100644 --- a/src/backends/cl/workloads/ClStridedSliceWorkload.cpp +++ b/src/backends/cl/workloads/ClStridedSliceWorkload.cpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include #include diff --git a/src/backends/cl/workloads/ClSubtractionWorkload.cpp b/src/backends/cl/workloads/ClSubtractionWorkload.cpp index 31e0becfd8..e320fec342 100644 --- a/src/backends/cl/workloads/ClSubtractionWorkload.cpp +++ b/src/backends/cl/workloads/ClSubtractionWorkload.cpp @@ -6,7 +6,7 @@ #include "ClSubtractionWorkload.hpp" #include -#include +#include #include #include diff --git a/src/backends/cl/workloads/ClTransposeConvolution2dWorkload.cpp b/src/backends/cl/workloads/ClTransposeConvolution2dWorkload.cpp index ff0fd5c168..b40b4b10ca 100644 --- a/src/backends/cl/workloads/ClTransposeConvolution2dWorkload.cpp +++ b/src/backends/cl/workloads/ClTransposeConvolution2dWorkload.cpp @@ -14,7 +14,7 @@ #include #include -#include +#include #include diff --git a/src/backends/cl/workloads/ClWorkloadUtils.hpp b/src/backends/cl/workloads/ClWorkloadUtils.hpp index b0cc8b4ed5..467505d55b 100644 --- a/src/backends/cl/workloads/ClWorkloadUtils.hpp +++ b/src/backends/cl/workloads/ClWorkloadUtils.hpp @@ -8,7 +8,7 @@ #include #include -#include +#include #include @@ -88,7 +88,7 @@ inline auto SetClSliceData(const std::vector& m_begin, } inline void InitializeArmComputeClTensorData(arm_compute::CLTensor& clTensor, - const ConstCpuTensorHandle* handle) + const ConstTensorHandle* handle) { ARMNN_ASSERT(handle); -- cgit v1.2.1