diff options
Diffstat (limited to 'src/backends/NeonWorkloads')
18 files changed, 46 insertions, 49 deletions
diff --git a/src/backends/NeonWorkloads/NeonActivationFloatWorkload.cpp b/src/backends/NeonWorkloads/NeonActivationFloatWorkload.cpp index bedf3dcb02..1d6bf70431 100644 --- a/src/backends/NeonWorkloads/NeonActivationFloatWorkload.cpp +++ b/src/backends/NeonWorkloads/NeonActivationFloatWorkload.cpp @@ -4,7 +4,7 @@ // #include "NeonActivationFloatWorkload.hpp" -#include "backends/ArmComputeUtils.hpp" +#include <backends/aclCommon/ArmComputeUtils.hpp> namespace armnn diff --git a/src/backends/NeonWorkloads/NeonActivationUint8Workload.cpp b/src/backends/NeonWorkloads/NeonActivationUint8Workload.cpp index a9b94d2916..a5bba48156 100644 --- a/src/backends/NeonWorkloads/NeonActivationUint8Workload.cpp +++ b/src/backends/NeonWorkloads/NeonActivationUint8Workload.cpp @@ -4,8 +4,8 @@ // #include "NeonActivationUint8Workload.hpp" -#include "backends/ArmComputeUtils.hpp" -#include "backends/NeonLayerSupport.hpp" +#include <backends/aclCommon/ArmComputeUtils.hpp> +#include <backends/NeonLayerSupport.hpp> namespace armnn { diff --git a/src/backends/NeonWorkloads/NeonAdditionFloatWorkload.cpp b/src/backends/NeonWorkloads/NeonAdditionFloatWorkload.cpp index adc34e91c4..445e32ea44 100644 --- a/src/backends/NeonWorkloads/NeonAdditionFloatWorkload.cpp +++ b/src/backends/NeonWorkloads/NeonAdditionFloatWorkload.cpp @@ -4,8 +4,8 @@ // #include "NeonAdditionFloatWorkload.hpp" -#include "backends/ArmComputeTensorUtils.hpp" -#include "backends/CpuTensorHandle.hpp" +#include <backends/aclCommon/ArmComputeTensorUtils.hpp> +#include <backends/CpuTensorHandle.hpp> namespace armnn { diff --git a/src/backends/NeonWorkloads/NeonBaseConstantWorkload.hpp b/src/backends/NeonWorkloads/NeonBaseConstantWorkload.hpp index f4a09d4aed..59afc7022a 100644 --- a/src/backends/NeonWorkloads/NeonBaseConstantWorkload.hpp +++ b/src/backends/NeonWorkloads/NeonBaseConstantWorkload.hpp @@ -6,7 +6,7 @@ #pragma once #include <arm_compute/core/Types.h> -#include <backends/ArmComputeTensorUtils.hpp> +#include <backends/aclCommon/ArmComputeTensorUtils.hpp> #include <backends/CpuTensorHandle.hpp> #include <backends/NeonTensorHandle.hpp> #include <backends/NeonWorkloadUtils.hpp> @@ -14,7 +14,6 @@ #include <Half.hpp> #include <boost/cast.hpp> -#include "Half.hpp" namespace armnn { diff --git a/src/backends/NeonWorkloads/NeonBatchNormalizationFloatWorkload.cpp b/src/backends/NeonWorkloads/NeonBatchNormalizationFloatWorkload.cpp index 6f5c948084..2383e78df3 100644 --- a/src/backends/NeonWorkloads/NeonBatchNormalizationFloatWorkload.cpp +++ b/src/backends/NeonWorkloads/NeonBatchNormalizationFloatWorkload.cpp @@ -4,9 +4,9 @@ // #include "NeonBatchNormalizationFloatWorkload.hpp" -#include "backends/CpuTensorHandle.hpp" -#include "backends/ArmComputeTensorUtils.hpp" -#include "armnn/ArmNN.hpp" +#include <backends/CpuTensorHandle.hpp> +#include <backends/aclCommon/ArmComputeTensorUtils.hpp> +#include <armnn/ArmNN.hpp> namespace armnn { diff --git a/src/backends/NeonWorkloads/NeonConvolution2dBaseWorkload.cpp b/src/backends/NeonWorkloads/NeonConvolution2dBaseWorkload.cpp index 912e2d5b69..ee69088691 100644 --- a/src/backends/NeonWorkloads/NeonConvolution2dBaseWorkload.cpp +++ b/src/backends/NeonWorkloads/NeonConvolution2dBaseWorkload.cpp @@ -3,14 +3,14 @@ // SPDX-License-Identifier: MIT // -#include "backends/CpuTensorHandle.hpp" -#include "backends/ArmComputeTensorUtils.hpp" -#include "backends/NeonLayerSupport.hpp" +#include <backends/CpuTensorHandle.hpp> +#include <backends/aclCommon/ArmComputeTensorUtils.hpp> +#include <backends/NeonLayerSupport.hpp> #include "NeonConvolution2dBaseWorkload.hpp" -#include "armnn/Types.hpp" -#include "Half.hpp" +#include <armnn/Types.hpp> +#include <Half.hpp> namespace armnn { diff --git a/src/backends/NeonWorkloads/NeonConvolution2dBaseWorkload.hpp b/src/backends/NeonWorkloads/NeonConvolution2dBaseWorkload.hpp index 77d90cd84b..93f71c3ac2 100644 --- a/src/backends/NeonWorkloads/NeonConvolution2dBaseWorkload.hpp +++ b/src/backends/NeonWorkloads/NeonConvolution2dBaseWorkload.hpp @@ -5,13 +5,13 @@ #pragma once -#include "backends/ArmComputeTensorUtils.hpp" -#include "backends/CpuTensorHandle.hpp" -#include "backends/NeonLayerSupport.hpp" -#include "backends/NeonWorkloadUtils.hpp" -#include "backends/Workload.hpp" +#include <backends/aclCommon/ArmComputeTensorUtils.hpp> +#include <backends/CpuTensorHandle.hpp> +#include <backends/NeonLayerSupport.hpp> +#include <backends/NeonWorkloadUtils.hpp> +#include <backends/Workload.hpp> -#include "arm_compute/runtime/MemoryManagerOnDemand.h" +#include <arm_compute/runtime/MemoryManagerOnDemand.h> #include <boost/optional.hpp> diff --git a/src/backends/NeonWorkloads/NeonConvolution2dFloatWorkload.cpp b/src/backends/NeonWorkloads/NeonConvolution2dFloatWorkload.cpp index ca7a0c575a..ea7a843468 100644 --- a/src/backends/NeonWorkloads/NeonConvolution2dFloatWorkload.cpp +++ b/src/backends/NeonWorkloads/NeonConvolution2dFloatWorkload.cpp @@ -4,9 +4,9 @@ // #include "NeonConvolution2dFloatWorkload.hpp" -#include "backends/CpuTensorHandle.hpp" -#include "backends/ArmComputeTensorUtils.hpp" -#include "backends/NeonLayerSupport.hpp" +#include <backends/CpuTensorHandle.hpp> +#include <backends/aclCommon/ArmComputeTensorUtils.hpp> +#include <backends/NeonLayerSupport.hpp> namespace armnn { diff --git a/src/backends/NeonWorkloads/NeonDepthwiseConvolutionBaseWorkload.cpp b/src/backends/NeonWorkloads/NeonDepthwiseConvolutionBaseWorkload.cpp index e79e14f2ed..ec6c97700b 100644 --- a/src/backends/NeonWorkloads/NeonDepthwiseConvolutionBaseWorkload.cpp +++ b/src/backends/NeonWorkloads/NeonDepthwiseConvolutionBaseWorkload.cpp @@ -5,7 +5,7 @@ #include "NeonDepthwiseConvolutionBaseWorkload.hpp" -#include "backends/ArmComputeTensorUtils.hpp" +#include <backends/aclCommon/ArmComputeTensorUtils.hpp> namespace armnn { diff --git a/src/backends/NeonWorkloads/NeonDepthwiseConvolutionFloatWorkload.cpp b/src/backends/NeonWorkloads/NeonDepthwiseConvolutionFloatWorkload.cpp index 1ec1417a58..b3f7da41b5 100644 --- a/src/backends/NeonWorkloads/NeonDepthwiseConvolutionFloatWorkload.cpp +++ b/src/backends/NeonWorkloads/NeonDepthwiseConvolutionFloatWorkload.cpp @@ -4,10 +4,9 @@ // #include "NeonDepthwiseConvolutionFloatWorkload.hpp" -#include "backends/NeonLayerSupport.hpp" -#include "backends/CpuTensorHandle.hpp" -#include "backends/ArmComputeTensorUtils.hpp" - +#include <backends/NeonLayerSupport.hpp> +#include <backends/CpuTensorHandle.hpp> +#include <backends/aclCommon/ArmComputeTensorUtils.hpp> namespace armnn { diff --git a/src/backends/NeonWorkloads/NeonDepthwiseConvolutionUint8Workload.cpp b/src/backends/NeonWorkloads/NeonDepthwiseConvolutionUint8Workload.cpp index b7813a59c5..de8a2aeedb 100644 --- a/src/backends/NeonWorkloads/NeonDepthwiseConvolutionUint8Workload.cpp +++ b/src/backends/NeonWorkloads/NeonDepthwiseConvolutionUint8Workload.cpp @@ -4,10 +4,9 @@ // #include "NeonDepthwiseConvolutionUint8Workload.hpp" -#include "backends/NeonLayerSupport.hpp" -#include "backends/CpuTensorHandle.hpp" -#include "backends/ArmComputeTensorUtils.hpp" - +#include <backends/NeonLayerSupport.hpp> +#include <backends/CpuTensorHandle.hpp> +#include <backends/aclCommon/ArmComputeTensorUtils.hpp> namespace armnn { diff --git a/src/backends/NeonWorkloads/NeonFullyConnectedFloatWorkload.cpp b/src/backends/NeonWorkloads/NeonFullyConnectedFloatWorkload.cpp index 2036ecb203..8fcc0956e2 100644 --- a/src/backends/NeonWorkloads/NeonFullyConnectedFloatWorkload.cpp +++ b/src/backends/NeonWorkloads/NeonFullyConnectedFloatWorkload.cpp @@ -5,9 +5,9 @@ #include "NeonFullyConnectedFloatWorkload.hpp" -#include "backends/ArmComputeTensorUtils.hpp" -#include "backends/ArmComputeUtils.hpp" -#include "backends/CpuTensorHandle.hpp" +#include <backends/aclCommon/ArmComputeTensorUtils.hpp> +#include <backends/aclCommon/ArmComputeUtils.hpp> +#include <backends/CpuTensorHandle.hpp> namespace armnn { diff --git a/src/backends/NeonWorkloads/NeonL2NormalizationFloatWorkload.cpp b/src/backends/NeonWorkloads/NeonL2NormalizationFloatWorkload.cpp index 7296e67179..dee789af85 100644 --- a/src/backends/NeonWorkloads/NeonL2NormalizationFloatWorkload.cpp +++ b/src/backends/NeonWorkloads/NeonL2NormalizationFloatWorkload.cpp @@ -4,7 +4,7 @@ // #include "NeonL2NormalizationFloatWorkload.hpp" -#include "backends/ArmComputeUtils.hpp" +#include <backends/aclCommon/ArmComputeUtils.hpp> namespace armnn { diff --git a/src/backends/NeonWorkloads/NeonNormalizationFloatWorkload.cpp b/src/backends/NeonWorkloads/NeonNormalizationFloatWorkload.cpp index 4534c376d8..ee9785686b 100644 --- a/src/backends/NeonWorkloads/NeonNormalizationFloatWorkload.cpp +++ b/src/backends/NeonWorkloads/NeonNormalizationFloatWorkload.cpp @@ -4,9 +4,9 @@ // #include "NeonNormalizationFloatWorkload.hpp" -#include "backends/NeonLayerSupport.hpp" -#include "backends/ArmComputeUtils.hpp" -#include "backends/ArmComputeTensorUtils.hpp" +#include <backends/NeonLayerSupport.hpp> +#include <backends/aclCommon/ArmComputeUtils.hpp> +#include <backends/aclCommon/ArmComputeTensorUtils.hpp> namespace armnn { diff --git a/src/backends/NeonWorkloads/NeonPermuteWorkload.cpp b/src/backends/NeonWorkloads/NeonPermuteWorkload.cpp index 9bc76ba853..7a20c70cfa 100644 --- a/src/backends/NeonWorkloads/NeonPermuteWorkload.cpp +++ b/src/backends/NeonWorkloads/NeonPermuteWorkload.cpp @@ -4,8 +4,8 @@ // #include "NeonPermuteWorkload.hpp" -#include "backends/NeonTensorHandle.hpp" -#include "backends/ArmComputeTensorUtils.hpp" +#include <backends/NeonTensorHandle.hpp> +#include <backends/aclCommon/ArmComputeTensorUtils.hpp> #include <arm_compute/core/Error.h> diff --git a/src/backends/NeonWorkloads/NeonPooling2dBaseWorkload.cpp b/src/backends/NeonWorkloads/NeonPooling2dBaseWorkload.cpp index 208d08c4c5..95286f48c8 100644 --- a/src/backends/NeonWorkloads/NeonPooling2dBaseWorkload.cpp +++ b/src/backends/NeonWorkloads/NeonPooling2dBaseWorkload.cpp @@ -4,10 +4,10 @@ // #include "NeonPooling2dBaseWorkload.hpp" -#include "backends/NeonLayerSupport.hpp" -#include "backends/NeonTensorHandle.hpp" -#include "backends/ArmComputeUtils.hpp" -#include "backends/ArmComputeTensorUtils.hpp" +#include <backends/NeonLayerSupport.hpp> +#include <backends/NeonTensorHandle.hpp> +#include <backends/aclCommon/ArmComputeUtils.hpp> +#include <backends/aclCommon/ArmComputeTensorUtils.hpp> namespace armnn { diff --git a/src/backends/NeonWorkloads/NeonSoftmaxBaseWorkload.cpp b/src/backends/NeonWorkloads/NeonSoftmaxBaseWorkload.cpp index ca9e4f058d..0e11d8249f 100644 --- a/src/backends/NeonWorkloads/NeonSoftmaxBaseWorkload.cpp +++ b/src/backends/NeonWorkloads/NeonSoftmaxBaseWorkload.cpp @@ -5,7 +5,7 @@ #include "NeonSoftmaxBaseWorkload.hpp" -#include "backends/ArmComputeTensorUtils.hpp" +#include <backends/aclCommon/ArmComputeTensorUtils.hpp> namespace armnn { diff --git a/src/backends/NeonWorkloads/NeonSubtractionFloatWorkload.cpp b/src/backends/NeonWorkloads/NeonSubtractionFloatWorkload.cpp index 3f37d82d22..2acb829e3d 100644 --- a/src/backends/NeonWorkloads/NeonSubtractionFloatWorkload.cpp +++ b/src/backends/NeonWorkloads/NeonSubtractionFloatWorkload.cpp @@ -4,8 +4,8 @@ // #include "NeonSubtractionFloatWorkload.hpp" -#include "backends/ArmComputeTensorUtils.hpp" -#include "backends/CpuTensorHandle.hpp" +#include <backends/aclCommon/ArmComputeTensorUtils.hpp> +#include <backends/CpuTensorHandle.hpp> namespace armnn { |