From 711fa31d5d43b904d28bcd407cd7e921529a37ca Mon Sep 17 00:00:00 2001 From: David Beck Date: Mon, 24 Sep 2018 10:46:38 +0100 Subject: IVGCVSW-1921: move common Acl code to a separate folder Change-Id: I400be8e7c0cc5a31eb9d2a7396da145d50d51b6e --- src/backends/ClWorkloads/ClActivationFloatWorkload.cpp | 4 ++-- src/backends/ClWorkloads/ClActivationUint8Workload.cpp | 8 ++++---- src/backends/ClWorkloads/ClAdditionWorkload.cpp | 6 +++--- src/backends/ClWorkloads/ClBaseConstantWorkload.cpp | 8 ++++---- src/backends/ClWorkloads/ClBatchNormalizationFloatWorkload.cpp | 8 ++++---- src/backends/ClWorkloads/ClConvolution2dBaseWorkload.cpp | 8 ++++---- src/backends/ClWorkloads/ClConvolution2dFloatWorkload.cpp | 8 ++++---- src/backends/ClWorkloads/ClConvolution2dUint8Workload.cpp | 8 ++++---- .../ClWorkloads/ClDepthwiseConvolutionBaseWorkload.cpp | 8 ++++---- src/backends/ClWorkloads/ClFullyConnectedWorkload.cpp | 10 +++++----- src/backends/ClWorkloads/ClL2NormalizationFloatWorkload.cpp | 6 +++--- src/backends/ClWorkloads/ClLstmFloatWorkload.cpp | 8 ++++---- src/backends/ClWorkloads/ClNormalizationFloatWorkload.cpp | 10 +++++----- src/backends/ClWorkloads/ClPermuteWorkload.cpp | 4 ++-- src/backends/ClWorkloads/ClPooling2dBaseWorkload.cpp | 8 ++++---- src/backends/ClWorkloads/ClResizeBilinearFloatWorkload.cpp | 8 ++++---- src/backends/ClWorkloads/ClSoftmaxBaseWorkload.cpp | 2 +- src/backends/ClWorkloads/ClSubtractionWorkload.cpp | 6 +++--- src/backends/ClWorkloads/ClWorkloadUtils.hpp | 4 ++-- 19 files changed, 66 insertions(+), 66 deletions(-) (limited to 'src/backends/ClWorkloads') diff --git a/src/backends/ClWorkloads/ClActivationFloatWorkload.cpp b/src/backends/ClWorkloads/ClActivationFloatWorkload.cpp index 97078bddd8..10eef66ef2 100644 --- a/src/backends/ClWorkloads/ClActivationFloatWorkload.cpp +++ b/src/backends/ClWorkloads/ClActivationFloatWorkload.cpp @@ -4,8 +4,8 @@ // #include "ClActivationFloatWorkload.hpp" -#include "backends/ClTensorHandle.hpp" -#include "backends/ArmComputeUtils.hpp" +#include +#include #include "ClWorkloadUtils.hpp" diff --git a/src/backends/ClWorkloads/ClActivationUint8Workload.cpp b/src/backends/ClWorkloads/ClActivationUint8Workload.cpp index f39c856aa9..f41a97ae24 100644 --- a/src/backends/ClWorkloads/ClActivationUint8Workload.cpp +++ b/src/backends/ClWorkloads/ClActivationUint8Workload.cpp @@ -4,11 +4,11 @@ // #include "ClActivationUint8Workload.hpp" -#include "backends/ClLayerSupport.hpp" +#include -#include "backends/ArmComputeUtils.hpp" -#include "backends/ClTensorHandle.hpp" -#include "backends/CpuTensorHandle.hpp" +#include +#include +#include #include "ClWorkloadUtils.hpp" diff --git a/src/backends/ClWorkloads/ClAdditionWorkload.cpp b/src/backends/ClWorkloads/ClAdditionWorkload.cpp index dd439d59a9..f43d3c126a 100644 --- a/src/backends/ClWorkloads/ClAdditionWorkload.cpp +++ b/src/backends/ClWorkloads/ClAdditionWorkload.cpp @@ -5,9 +5,9 @@ #include "ClAdditionWorkload.hpp" -#include "backends/ClTensorHandle.hpp" -#include "backends/CpuTensorHandle.hpp" -#include "backends/ArmComputeTensorUtils.hpp" +#include +#include +#include #include "ClWorkloadUtils.hpp" diff --git a/src/backends/ClWorkloads/ClBaseConstantWorkload.cpp b/src/backends/ClWorkloads/ClBaseConstantWorkload.cpp index 97ddfd6352..56af3b3baa 100644 --- a/src/backends/ClWorkloads/ClBaseConstantWorkload.cpp +++ b/src/backends/ClWorkloads/ClBaseConstantWorkload.cpp @@ -4,10 +4,10 @@ // #include "ClBaseConstantWorkload.hpp" -#include "backends/ArmComputeTensorUtils.hpp" -#include "backends/ClTensorHandle.hpp" -#include "backends/CpuTensorHandle.hpp" -#include "Half.hpp" +#include +#include +#include +#include #include "ClWorkloadUtils.hpp" diff --git a/src/backends/ClWorkloads/ClBatchNormalizationFloatWorkload.cpp b/src/backends/ClWorkloads/ClBatchNormalizationFloatWorkload.cpp index d05349b819..4d5c20f9bd 100644 --- a/src/backends/ClWorkloads/ClBatchNormalizationFloatWorkload.cpp +++ b/src/backends/ClWorkloads/ClBatchNormalizationFloatWorkload.cpp @@ -4,10 +4,10 @@ // #include "ClBatchNormalizationFloatWorkload.hpp" -#include "backends/ClTensorHandle.hpp" -#include "backends/CpuTensorHandle.hpp" -#include "backends/ArmComputeTensorUtils.hpp" -#include "backends/ClLayerSupport.hpp" +#include +#include +#include +#include #include "ClWorkloadUtils.hpp" diff --git a/src/backends/ClWorkloads/ClConvolution2dBaseWorkload.cpp b/src/backends/ClWorkloads/ClConvolution2dBaseWorkload.cpp index 110a2dab3a..1f5094e143 100644 --- a/src/backends/ClWorkloads/ClConvolution2dBaseWorkload.cpp +++ b/src/backends/ClWorkloads/ClConvolution2dBaseWorkload.cpp @@ -4,10 +4,10 @@ // #include "ClConvolution2dBaseWorkload.hpp" -#include "backends/ClLayerSupport.hpp" -#include "backends/ClTensorHandle.hpp" -#include "backends/ArmComputeUtils.hpp" -#include "backends/ArmComputeTensorUtils.hpp" +#include +#include +#include +#include #include diff --git a/src/backends/ClWorkloads/ClConvolution2dFloatWorkload.cpp b/src/backends/ClWorkloads/ClConvolution2dFloatWorkload.cpp index 3da6fa7d8f..72565966b8 100644 --- a/src/backends/ClWorkloads/ClConvolution2dFloatWorkload.cpp +++ b/src/backends/ClWorkloads/ClConvolution2dFloatWorkload.cpp @@ -4,10 +4,10 @@ // #include "ClConvolution2dFloatWorkload.hpp" -#include "backends/ClTensorHandle.hpp" -#include "backends/CpuTensorHandle.hpp" -#include "backends/ArmComputeTensorUtils.hpp" -#include "backends/ClLayerSupport.hpp" +#include +#include +#include +#include #include "ClWorkloadUtils.hpp" diff --git a/src/backends/ClWorkloads/ClConvolution2dUint8Workload.cpp b/src/backends/ClWorkloads/ClConvolution2dUint8Workload.cpp index 3949a74c96..a9faec0d77 100644 --- a/src/backends/ClWorkloads/ClConvolution2dUint8Workload.cpp +++ b/src/backends/ClWorkloads/ClConvolution2dUint8Workload.cpp @@ -4,10 +4,10 @@ // #include "ClConvolution2dUint8Workload.hpp" -#include "backends/ClTensorHandle.hpp" -#include "backends/CpuTensorHandle.hpp" -#include "backends/ArmComputeTensorUtils.hpp" -#include "backends/ClLayerSupport.hpp" +#include +#include +#include +#include #include "ClWorkloadUtils.hpp" diff --git a/src/backends/ClWorkloads/ClDepthwiseConvolutionBaseWorkload.cpp b/src/backends/ClWorkloads/ClDepthwiseConvolutionBaseWorkload.cpp index 0e89a68118..68f9cd6733 100644 --- a/src/backends/ClWorkloads/ClDepthwiseConvolutionBaseWorkload.cpp +++ b/src/backends/ClWorkloads/ClDepthwiseConvolutionBaseWorkload.cpp @@ -7,10 +7,10 @@ #include "TypeUtils.hpp" -#include "backends/ArmComputeUtils.hpp" -#include "backends/ArmComputeTensorUtils.hpp" -#include "backends/ClTensorHandle.hpp" -#include "backends/CpuTensorHandle.hpp" +#include +#include +#include +#include namespace armnn { diff --git a/src/backends/ClWorkloads/ClFullyConnectedWorkload.cpp b/src/backends/ClWorkloads/ClFullyConnectedWorkload.cpp index 4686d1c8ee..1ec39926ad 100644 --- a/src/backends/ClWorkloads/ClFullyConnectedWorkload.cpp +++ b/src/backends/ClWorkloads/ClFullyConnectedWorkload.cpp @@ -4,11 +4,11 @@ // #include "ClFullyConnectedWorkload.hpp" -#include "backends/ClTensorHandle.hpp" -#include "backends/CpuTensorHandle.hpp" -#include "backends/ArmComputeTensorUtils.hpp" -#include "backends/ArmComputeUtils.hpp" -#include "backends/ClLayerSupport.hpp" +#include +#include +#include +#include +#include #include "ClWorkloadUtils.hpp" diff --git a/src/backends/ClWorkloads/ClL2NormalizationFloatWorkload.cpp b/src/backends/ClWorkloads/ClL2NormalizationFloatWorkload.cpp index 4ccaae3430..8f5ed5feca 100644 --- a/src/backends/ClWorkloads/ClL2NormalizationFloatWorkload.cpp +++ b/src/backends/ClWorkloads/ClL2NormalizationFloatWorkload.cpp @@ -4,9 +4,9 @@ // #include "ClL2NormalizationFloatWorkload.hpp" -#include "backends/ClTensorHandle.hpp" -#include "backends/CpuTensorHandle.hpp" -#include "backends/ArmComputeUtils.hpp" +#include +#include +#include #include "ClWorkloadUtils.hpp" diff --git a/src/backends/ClWorkloads/ClLstmFloatWorkload.cpp b/src/backends/ClWorkloads/ClLstmFloatWorkload.cpp index 8e2c875bab..9e2563a3a5 100644 --- a/src/backends/ClWorkloads/ClLstmFloatWorkload.cpp +++ b/src/backends/ClWorkloads/ClLstmFloatWorkload.cpp @@ -4,10 +4,10 @@ // #include "ClLstmFloatWorkload.hpp" -#include "backends/ClTensorHandle.hpp" -#include "backends/CpuTensorHandle.hpp" -#include "backends/ArmComputeTensorUtils.hpp" -#include "backends/ClLayerSupport.hpp" +#include +#include +#include +#include #include diff --git a/src/backends/ClWorkloads/ClNormalizationFloatWorkload.cpp b/src/backends/ClWorkloads/ClNormalizationFloatWorkload.cpp index d2625354ef..cf2cad16aa 100644 --- a/src/backends/ClWorkloads/ClNormalizationFloatWorkload.cpp +++ b/src/backends/ClWorkloads/ClNormalizationFloatWorkload.cpp @@ -4,11 +4,11 @@ // #include "ClNormalizationFloatWorkload.hpp" -#include "backends/ClTensorHandle.hpp" -#include "backends/CpuTensorHandle.hpp" -#include "backends/ClLayerSupport.hpp" -#include "backends/ArmComputeUtils.hpp" -#include "backends/ArmComputeTensorUtils.hpp" +#include +#include +#include +#include +#include #include "ClWorkloadUtils.hpp" namespace armnn diff --git a/src/backends/ClWorkloads/ClPermuteWorkload.cpp b/src/backends/ClWorkloads/ClPermuteWorkload.cpp index 29d98bf0eb..11b0df80dd 100644 --- a/src/backends/ClWorkloads/ClPermuteWorkload.cpp +++ b/src/backends/ClWorkloads/ClPermuteWorkload.cpp @@ -4,8 +4,8 @@ // #include "ClPermuteWorkload.hpp" -#include "backends/ClTensorHandle.hpp" -#include "backends/ArmComputeTensorUtils.hpp" +#include +#include #include diff --git a/src/backends/ClWorkloads/ClPooling2dBaseWorkload.cpp b/src/backends/ClWorkloads/ClPooling2dBaseWorkload.cpp index a1ee50b39f..57b056a05c 100644 --- a/src/backends/ClWorkloads/ClPooling2dBaseWorkload.cpp +++ b/src/backends/ClWorkloads/ClPooling2dBaseWorkload.cpp @@ -4,10 +4,10 @@ // #include "ClPooling2dBaseWorkload.hpp" -#include "backends/ClLayerSupport.hpp" -#include "backends/ClTensorHandle.hpp" -#include "backends/ArmComputeUtils.hpp" -#include "backends/ArmComputeTensorUtils.hpp" +#include +#include +#include +#include namespace armnn { diff --git a/src/backends/ClWorkloads/ClResizeBilinearFloatWorkload.cpp b/src/backends/ClWorkloads/ClResizeBilinearFloatWorkload.cpp index 8348afb76a..7c05bbf33d 100644 --- a/src/backends/ClWorkloads/ClResizeBilinearFloatWorkload.cpp +++ b/src/backends/ClWorkloads/ClResizeBilinearFloatWorkload.cpp @@ -4,10 +4,10 @@ // #include "ClResizeBilinearFloatWorkload.hpp" -#include "backends/ClTensorHandle.hpp" -#include "backends/CpuTensorHandle.hpp" -#include "backends/ClLayerSupport.hpp" -#include "backends/ArmComputeUtils.hpp" +#include +#include +#include +#include #include "ClWorkloadUtils.hpp" diff --git a/src/backends/ClWorkloads/ClSoftmaxBaseWorkload.cpp b/src/backends/ClWorkloads/ClSoftmaxBaseWorkload.cpp index b4ea236d49..eb05a19670 100644 --- a/src/backends/ClWorkloads/ClSoftmaxBaseWorkload.cpp +++ b/src/backends/ClWorkloads/ClSoftmaxBaseWorkload.cpp @@ -5,7 +5,7 @@ #include "ClSoftmaxBaseWorkload.hpp" -#include "backends/ArmComputeTensorUtils.hpp" +#include #include diff --git a/src/backends/ClWorkloads/ClSubtractionWorkload.cpp b/src/backends/ClWorkloads/ClSubtractionWorkload.cpp index 1c70130fa4..e5d5702389 100644 --- a/src/backends/ClWorkloads/ClSubtractionWorkload.cpp +++ b/src/backends/ClWorkloads/ClSubtractionWorkload.cpp @@ -5,9 +5,9 @@ #include "ClSubtractionWorkload.hpp" -#include "backends/ClTensorHandle.hpp" -#include "backends/CpuTensorHandle.hpp" -#include "backends/ArmComputeTensorUtils.hpp" +#include +#include +#include #include "ClWorkloadUtils.hpp" diff --git a/src/backends/ClWorkloads/ClWorkloadUtils.hpp b/src/backends/ClWorkloads/ClWorkloadUtils.hpp index 9c415b2267..3a8ff00bb6 100644 --- a/src/backends/ClWorkloads/ClWorkloadUtils.hpp +++ b/src/backends/ClWorkloads/ClWorkloadUtils.hpp @@ -5,8 +5,8 @@ #pragma once #include "OpenClTimer.hpp" -#include "backends/ArmComputeTensorUtils.hpp" -#include "backends/CpuTensorHandle.hpp" +#include +#include #include -- cgit v1.2.1