diff options
author | Colm Donelan <colm.donelan@arm.com> | 2021-12-10 12:43:54 +0000 |
---|---|---|
committer | Colm Donelan <colm.donelan@arm.com> | 2021-12-15 12:53:20 +0000 |
commit | 0c47974f1800e8770904aecaef15d6f105758c4e (patch) | |
tree | f5424858c6fe6f33376b3432580179958ab8ac5a /src/backends/neon/workloads | |
parent | cdbb09f6e15ea6698a62197cf76ecba87b81cb9d (diff) | |
download | armnn-0c47974f1800e8770904aecaef15d6f105758c4e.tar.gz |
IVGCVSW-6626 Promote backend headers in backendCommon to armnn/backends
Move the following header files from backendsCommon to armnn/backends.
* MemCopyWorkload.hpp
* TensorHandle.hpp
* Workload.hpp
* WorkloadData.hpp
* WorkloadFactory.hpp
Replace them with forwarding headers and a pragma deprecation message.
Resolve the deprecation messages in Arm NN code.
Signed-off-by: Colm Donelan <colm.donelan@arm.com>
Change-Id: I47f116b30f86e478c9057795bc518c391a8ae514
Diffstat (limited to 'src/backends/neon/workloads')
80 files changed, 95 insertions, 95 deletions
diff --git a/src/backends/neon/workloads/NeonAbsWorkload.hpp b/src/backends/neon/workloads/NeonAbsWorkload.hpp index 0024d19cac..3440af5a05 100644 --- a/src/backends/neon/workloads/NeonAbsWorkload.hpp +++ b/src/backends/neon/workloads/NeonAbsWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backendsCommon/Workload.hpp> +#include <armnn/backends/Workload.hpp> #include <arm_compute/core/Error.h> #include <arm_compute/runtime/NEON/functions/NEElementwiseUnaryLayer.h> diff --git a/src/backends/neon/workloads/NeonActivationWorkload.hpp b/src/backends/neon/workloads/NeonActivationWorkload.hpp index eefbfb6522..c3d6cc1bce 100644 --- a/src/backends/neon/workloads/NeonActivationWorkload.hpp +++ b/src/backends/neon/workloads/NeonActivationWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backendsCommon/Workload.hpp> +#include <armnn/backends/Workload.hpp> #include <arm_compute/core/Error.h> #include <arm_compute/runtime/IFunction.h> diff --git a/src/backends/neon/workloads/NeonAdditionWorkload.cpp b/src/backends/neon/workloads/NeonAdditionWorkload.cpp index dfbb992e05..fdfe8b5b55 100644 --- a/src/backends/neon/workloads/NeonAdditionWorkload.cpp +++ b/src/backends/neon/workloads/NeonAdditionWorkload.cpp @@ -10,7 +10,7 @@ #include <aclCommon/ArmComputeUtils.hpp> #include <armnn/utility/PolymorphicDowncast.hpp> -#include <backendsCommon/TensorHandle.hpp> +#include <armnn/backends/TensorHandle.hpp> #include <arm_compute/runtime/NEON/functions/NEArithmeticAddition.h> diff --git a/src/backends/neon/workloads/NeonAdditionWorkload.hpp b/src/backends/neon/workloads/NeonAdditionWorkload.hpp index 8e43cbdb6d..b691e66a06 100644 --- a/src/backends/neon/workloads/NeonAdditionWorkload.hpp +++ b/src/backends/neon/workloads/NeonAdditionWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backendsCommon/Workload.hpp> +#include <armnn/backends/Workload.hpp> #include <arm_compute/core/Error.h> #include <arm_compute/core/Types.h> diff --git a/src/backends/neon/workloads/NeonArgMinMaxWorkload.cpp b/src/backends/neon/workloads/NeonArgMinMaxWorkload.cpp index 7e9d2c7ec6..aea5fe5abe 100644 --- a/src/backends/neon/workloads/NeonArgMinMaxWorkload.cpp +++ b/src/backends/neon/workloads/NeonArgMinMaxWorkload.cpp @@ -8,7 +8,7 @@ #include <aclCommon/ArmComputeTensorUtils.hpp> -#include <backendsCommon/TensorHandle.hpp> +#include <armnn/backends/TensorHandle.hpp> #include <armnn/utility/NumericCast.hpp> #include <armnn/utility/PolymorphicDowncast.hpp> diff --git a/src/backends/neon/workloads/NeonArgMinMaxWorkload.hpp b/src/backends/neon/workloads/NeonArgMinMaxWorkload.hpp index 6e1cc46c13..f5d33b3eae 100644 --- a/src/backends/neon/workloads/NeonArgMinMaxWorkload.hpp +++ b/src/backends/neon/workloads/NeonArgMinMaxWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backendsCommon/Workload.hpp> +#include <armnn/backends/Workload.hpp> #include <arm_compute/core/Error.h> #include <arm_compute/runtime/IFunction.h> diff --git a/src/backends/neon/workloads/NeonBatchNormalizationWorkload.cpp b/src/backends/neon/workloads/NeonBatchNormalizationWorkload.cpp index 3d0a90bc7d..897a54d0d6 100644 --- a/src/backends/neon/workloads/NeonBatchNormalizationWorkload.cpp +++ b/src/backends/neon/workloads/NeonBatchNormalizationWorkload.cpp @@ -12,7 +12,7 @@ #include <armnn/utility/PolymorphicDowncast.hpp> -#include <backendsCommon/TensorHandle.hpp> +#include <armnn/backends/TensorHandle.hpp> #include <arm_compute/runtime/NEON/functions/NEBatchNormalizationLayer.h> diff --git a/src/backends/neon/workloads/NeonBatchNormalizationWorkload.hpp b/src/backends/neon/workloads/NeonBatchNormalizationWorkload.hpp index fea778fb1c..3cceefe615 100644 --- a/src/backends/neon/workloads/NeonBatchNormalizationWorkload.hpp +++ b/src/backends/neon/workloads/NeonBatchNormalizationWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backendsCommon/Workload.hpp> +#include <armnn/backends/Workload.hpp> #include <arm_compute/runtime/IFunction.h> #include <arm_compute/runtime/Tensor.h> diff --git a/src/backends/neon/workloads/NeonBatchToSpaceNdWorkload.hpp b/src/backends/neon/workloads/NeonBatchToSpaceNdWorkload.hpp index dd146e5681..21eebe0a0f 100644 --- a/src/backends/neon/workloads/NeonBatchToSpaceNdWorkload.hpp +++ b/src/backends/neon/workloads/NeonBatchToSpaceNdWorkload.hpp @@ -8,7 +8,7 @@ #include <armnn/Tensor.hpp> #include <armnn/Descriptors.hpp> -#include <backendsCommon/Workload.hpp> +#include <armnn/backends/Workload.hpp> #include <arm_compute/runtime/NEON/functions/NEBatchToSpaceLayer.h> diff --git a/src/backends/neon/workloads/NeonCastWorkload.hpp b/src/backends/neon/workloads/NeonCastWorkload.hpp index 4247c2e712..86edd90dc1 100644 --- a/src/backends/neon/workloads/NeonCastWorkload.hpp +++ b/src/backends/neon/workloads/NeonCastWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backendsCommon/Workload.hpp> +#include <armnn/backends/Workload.hpp> #include <arm_compute/core/Error.h> #include <arm_compute/runtime/NEON/functions/NECast.h> diff --git a/src/backends/neon/workloads/NeonChannelShuffleWorkload.hpp b/src/backends/neon/workloads/NeonChannelShuffleWorkload.hpp index f0f20ae711..73d645f7b3 100644 --- a/src/backends/neon/workloads/NeonChannelShuffleWorkload.hpp +++ b/src/backends/neon/workloads/NeonChannelShuffleWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backendsCommon/Workload.hpp> +#include <armnn/backends/Workload.hpp> #include <arm_compute/core/Error.h> #include <arm_compute/runtime/NEON/functions/NEChannelShuffleLayer.h> diff --git a/src/backends/neon/workloads/NeonComparisonWorkload.cpp b/src/backends/neon/workloads/NeonComparisonWorkload.cpp index 129921abe2..bd66c2f59a 100644 --- a/src/backends/neon/workloads/NeonComparisonWorkload.cpp +++ b/src/backends/neon/workloads/NeonComparisonWorkload.cpp @@ -7,7 +7,7 @@ #include <aclCommon/ArmComputeUtils.hpp> #include <aclCommon/ArmComputeTensorUtils.hpp> #include <armnn/utility/PolymorphicDowncast.hpp> -#include <backendsCommon/TensorHandle.hpp> +#include <armnn/backends/TensorHandle.hpp> namespace armnn { diff --git a/src/backends/neon/workloads/NeonConcatWorkload.cpp b/src/backends/neon/workloads/NeonConcatWorkload.cpp index 657a9402ef..88e0e8d118 100644 --- a/src/backends/neon/workloads/NeonConcatWorkload.cpp +++ b/src/backends/neon/workloads/NeonConcatWorkload.cpp @@ -9,7 +9,7 @@ #include <aclCommon/ArmComputeTensorUtils.hpp> #include <armnn/utility/PolymorphicDowncast.hpp> -#include <backendsCommon/TensorHandle.hpp> +#include <armnn/backends/TensorHandle.hpp> #include <neon/NeonTensorHandle.hpp> namespace armnn diff --git a/src/backends/neon/workloads/NeonConcatWorkload.hpp b/src/backends/neon/workloads/NeonConcatWorkload.hpp index bf0733b431..cf93035548 100644 --- a/src/backends/neon/workloads/NeonConcatWorkload.hpp +++ b/src/backends/neon/workloads/NeonConcatWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backendsCommon/Workload.hpp> +#include <armnn/backends/Workload.hpp> #include <arm_compute/core/Error.h> #include <arm_compute/runtime/IFunction.h> diff --git a/src/backends/neon/workloads/NeonConstantWorkload.cpp b/src/backends/neon/workloads/NeonConstantWorkload.cpp index 16bb211816..471a0bb0fc 100644 --- a/src/backends/neon/workloads/NeonConstantWorkload.cpp +++ b/src/backends/neon/workloads/NeonConstantWorkload.cpp @@ -11,8 +11,8 @@ #include <aclCommon/ArmComputeTensorUtils.hpp> #include <armnn/utility/PolymorphicDowncast.hpp> #include <neon/NeonTensorHandle.hpp> -#include <backendsCommon/TensorHandle.hpp> -#include <backendsCommon/Workload.hpp> +#include <armnn/backends/TensorHandle.hpp> +#include <armnn/backends/Workload.hpp> namespace armnn { diff --git a/src/backends/neon/workloads/NeonConvertBf16ToFp32Workload.hpp b/src/backends/neon/workloads/NeonConvertBf16ToFp32Workload.hpp index 0969088b92..eb2091264c 100644 --- a/src/backends/neon/workloads/NeonConvertBf16ToFp32Workload.hpp +++ b/src/backends/neon/workloads/NeonConvertBf16ToFp32Workload.hpp @@ -5,8 +5,8 @@ #pragma once -#include <backendsCommon/Workload.hpp> -#include <backendsCommon/WorkloadData.hpp> +#include <armnn/backends/Workload.hpp> +#include <armnn/backends/WorkloadData.hpp> #include <neon/workloads/NeonWorkloadUtils.hpp> namespace armnn diff --git a/src/backends/neon/workloads/NeonConvertFp16ToFp32Workload.hpp b/src/backends/neon/workloads/NeonConvertFp16ToFp32Workload.hpp index 6db370174a..9d98f92ec4 100644 --- a/src/backends/neon/workloads/NeonConvertFp16ToFp32Workload.hpp +++ b/src/backends/neon/workloads/NeonConvertFp16ToFp32Workload.hpp @@ -5,8 +5,8 @@ #pragma once -#include <backendsCommon/Workload.hpp> -#include <backendsCommon/WorkloadData.hpp> +#include <armnn/backends/Workload.hpp> +#include <armnn/backends/WorkloadData.hpp> #include <neon/workloads/NeonWorkloadUtils.hpp> namespace armnn diff --git a/src/backends/neon/workloads/NeonConvertFp32ToBf16Workload.hpp b/src/backends/neon/workloads/NeonConvertFp32ToBf16Workload.hpp index bc96c16287..7c8d45d253 100644 --- a/src/backends/neon/workloads/NeonConvertFp32ToBf16Workload.hpp +++ b/src/backends/neon/workloads/NeonConvertFp32ToBf16Workload.hpp @@ -5,8 +5,8 @@ #pragma once -#include <backendsCommon/Workload.hpp> -#include <backendsCommon/WorkloadData.hpp> +#include <armnn/backends/Workload.hpp> +#include <armnn/backends/WorkloadData.hpp> #include <neon/workloads/NeonWorkloadUtils.hpp> namespace armnn diff --git a/src/backends/neon/workloads/NeonConvertFp32ToFp16Workload.hpp b/src/backends/neon/workloads/NeonConvertFp32ToFp16Workload.hpp index 29cac85d88..71a71590d1 100644 --- a/src/backends/neon/workloads/NeonConvertFp32ToFp16Workload.hpp +++ b/src/backends/neon/workloads/NeonConvertFp32ToFp16Workload.hpp @@ -5,8 +5,8 @@ #pragma once -#include <backendsCommon/Workload.hpp> -#include <backendsCommon/WorkloadData.hpp> +#include <armnn/backends/Workload.hpp> +#include <armnn/backends/WorkloadData.hpp> #include <neon/workloads/NeonWorkloadUtils.hpp> namespace armnn diff --git a/src/backends/neon/workloads/NeonConvolution2dWorkload.cpp b/src/backends/neon/workloads/NeonConvolution2dWorkload.cpp index 0b0a72cb46..6fb34d7218 100644 --- a/src/backends/neon/workloads/NeonConvolution2dWorkload.cpp +++ b/src/backends/neon/workloads/NeonConvolution2dWorkload.cpp @@ -8,7 +8,7 @@ #include <aclCommon/ArmComputeTensorUtils.hpp> #include <aclCommon/ArmComputeUtils.hpp> #include <armnn/utility/PolymorphicDowncast.hpp> -#include <backendsCommon/TensorHandle.hpp> +#include <armnn/backends/TensorHandle.hpp> #include <neon/workloads/NeonWorkloadUtils.hpp> #include <arm_compute/runtime/NEON/functions/NEConvolutionLayer.h> diff --git a/src/backends/neon/workloads/NeonConvolution2dWorkload.hpp b/src/backends/neon/workloads/NeonConvolution2dWorkload.hpp index 4b6e58ce41..a28321d041 100644 --- a/src/backends/neon/workloads/NeonConvolution2dWorkload.hpp +++ b/src/backends/neon/workloads/NeonConvolution2dWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backendsCommon/Workload.hpp> +#include <armnn/backends/Workload.hpp> #include <arm_compute/runtime/IFunction.h> #include <arm_compute/runtime/Tensor.h> diff --git a/src/backends/neon/workloads/NeonConvolution3dWorkload.cpp b/src/backends/neon/workloads/NeonConvolution3dWorkload.cpp index 1891981162..5d19737b06 100644 --- a/src/backends/neon/workloads/NeonConvolution3dWorkload.cpp +++ b/src/backends/neon/workloads/NeonConvolution3dWorkload.cpp @@ -8,7 +8,7 @@ #include <aclCommon/ArmComputeTensorUtils.hpp> #include <aclCommon/ArmComputeUtils.hpp> #include <armnn/utility/PolymorphicDowncast.hpp> -#include <backendsCommon/TensorHandle.hpp> +#include <armnn/backends/TensorHandle.hpp> #include <neon/workloads/NeonWorkloadUtils.hpp> #include <arm_compute/runtime/NEON/functions/NEConv3D.h> diff --git a/src/backends/neon/workloads/NeonConvolution3dWorkload.hpp b/src/backends/neon/workloads/NeonConvolution3dWorkload.hpp index b5175e963f..a14dc24cc4 100644 --- a/src/backends/neon/workloads/NeonConvolution3dWorkload.hpp +++ b/src/backends/neon/workloads/NeonConvolution3dWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backendsCommon/Workload.hpp> +#include <armnn/backends/Workload.hpp> #include <arm_compute/runtime/IFunction.h> #include <arm_compute/runtime/Tensor.h> diff --git a/src/backends/neon/workloads/NeonDepthToSpaceWorkload.hpp b/src/backends/neon/workloads/NeonDepthToSpaceWorkload.hpp index 95b5e44e4d..09d9293307 100644 --- a/src/backends/neon/workloads/NeonDepthToSpaceWorkload.hpp +++ b/src/backends/neon/workloads/NeonDepthToSpaceWorkload.hpp @@ -7,7 +7,7 @@ #include <armnn/Descriptors.hpp> -#include <backendsCommon/Workload.hpp> +#include <armnn/backends/Workload.hpp> #include <arm_compute/runtime/NEON/functions/NEDepthToSpaceLayer.h> diff --git a/src/backends/neon/workloads/NeonDepthwiseConvolutionWorkload.cpp b/src/backends/neon/workloads/NeonDepthwiseConvolutionWorkload.cpp index 138c237aba..cdb3368699 100644 --- a/src/backends/neon/workloads/NeonDepthwiseConvolutionWorkload.cpp +++ b/src/backends/neon/workloads/NeonDepthwiseConvolutionWorkload.cpp @@ -14,7 +14,7 @@ #include <neon/NeonLayerSupport.hpp> -#include <backendsCommon/TensorHandle.hpp> +#include <armnn/backends/TensorHandle.hpp> #include <backendsCommon/WorkloadUtils.hpp> #include <arm_compute/runtime/NEON/functions/NEDepthwiseConvolutionLayer.h> diff --git a/src/backends/neon/workloads/NeonDepthwiseConvolutionWorkload.hpp b/src/backends/neon/workloads/NeonDepthwiseConvolutionWorkload.hpp index d257b91638..acb190f384 100644 --- a/src/backends/neon/workloads/NeonDepthwiseConvolutionWorkload.hpp +++ b/src/backends/neon/workloads/NeonDepthwiseConvolutionWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backendsCommon/Workload.hpp> +#include <armnn/backends/Workload.hpp> #include <arm_compute/runtime/IFunction.h> #include <arm_compute/runtime/Tensor.h> diff --git a/src/backends/neon/workloads/NeonDequantizeWorkload.cpp b/src/backends/neon/workloads/NeonDequantizeWorkload.cpp index 32c1134c35..62c76fcd06 100644 --- a/src/backends/neon/workloads/NeonDequantizeWorkload.cpp +++ b/src/backends/neon/workloads/NeonDequantizeWorkload.cpp @@ -11,7 +11,7 @@ #include <aclCommon/ArmComputeTensorUtils.hpp> #include <armnn/utility/PolymorphicDowncast.hpp> -#include <backendsCommon/TensorHandle.hpp> +#include <armnn/backends/TensorHandle.hpp> #include <neon/NeonTensorHandle.hpp> namespace armnn diff --git a/src/backends/neon/workloads/NeonDequantizeWorkload.hpp b/src/backends/neon/workloads/NeonDequantizeWorkload.hpp index 63ea783474..f9ffb7860c 100644 --- a/src/backends/neon/workloads/NeonDequantizeWorkload.hpp +++ b/src/backends/neon/workloads/NeonDequantizeWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backendsCommon/Workload.hpp> +#include <armnn/backends/Workload.hpp> #include <arm_compute/core/Error.h> #include <arm_compute/runtime/IFunction.h> diff --git a/src/backends/neon/workloads/NeonDetectionPostProcessWorkload.hpp b/src/backends/neon/workloads/NeonDetectionPostProcessWorkload.hpp index 82ef1e2f19..fd26bef334 100644 --- a/src/backends/neon/workloads/NeonDetectionPostProcessWorkload.hpp +++ b/src/backends/neon/workloads/NeonDetectionPostProcessWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backendsCommon/Workload.hpp> +#include <armnn/backends/Workload.hpp> #include <arm_compute/core/Error.h> #include <arm_compute/runtime/NEON/functions/NEDetectionPostProcessLayer.h> diff --git a/src/backends/neon/workloads/NeonDivisionWorkload.cpp b/src/backends/neon/workloads/NeonDivisionWorkload.cpp index 8c5d2b80f6..08caef6a7e 100644 --- a/src/backends/neon/workloads/NeonDivisionWorkload.cpp +++ b/src/backends/neon/workloads/NeonDivisionWorkload.cpp @@ -10,7 +10,7 @@ #include <armnn/utility/PolymorphicDowncast.hpp> -#include <backendsCommon/TensorHandle.hpp> +#include <armnn/backends/TensorHandle.hpp> namespace armnn { diff --git a/src/backends/neon/workloads/NeonExpWorkload.hpp b/src/backends/neon/workloads/NeonExpWorkload.hpp index d64340cb6d..d7053effd6 100644 --- a/src/backends/neon/workloads/NeonExpWorkload.hpp +++ b/src/backends/neon/workloads/NeonExpWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backendsCommon/Workload.hpp> +#include <armnn/backends/Workload.hpp> #include <arm_compute/core/Error.h> #include <arm_compute/runtime/NEON/functions/NEElementwiseUnaryLayer.h> diff --git a/src/backends/neon/workloads/NeonFillWorkload.hpp b/src/backends/neon/workloads/NeonFillWorkload.hpp index 40e4aa68c4..adffaa37ee 100644 --- a/src/backends/neon/workloads/NeonFillWorkload.hpp +++ b/src/backends/neon/workloads/NeonFillWorkload.hpp @@ -5,8 +5,8 @@ #pragma once -#include <backendsCommon/WorkloadData.hpp> -#include <backendsCommon/Workload.hpp> +#include <armnn/backends/WorkloadData.hpp> +#include <armnn/backends/Workload.hpp> #include <arm_compute/runtime/IFunction.h> #include <arm_compute/core/Error.h> diff --git a/src/backends/neon/workloads/NeonFloorFloatWorkload.hpp b/src/backends/neon/workloads/NeonFloorFloatWorkload.hpp index 01b86a6706..75b3546c5d 100644 --- a/src/backends/neon/workloads/NeonFloorFloatWorkload.hpp +++ b/src/backends/neon/workloads/NeonFloorFloatWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backendsCommon/Workload.hpp> +#include <armnn/backends/Workload.hpp> #include <arm_compute/runtime/IFunction.h> #include <arm_compute/runtime/Tensor.h> diff --git a/src/backends/neon/workloads/NeonFullyConnectedWorkload.cpp b/src/backends/neon/workloads/NeonFullyConnectedWorkload.cpp index 94dc07704d..39927889cf 100644 --- a/src/backends/neon/workloads/NeonFullyConnectedWorkload.cpp +++ b/src/backends/neon/workloads/NeonFullyConnectedWorkload.cpp @@ -12,7 +12,7 @@ #include <armnn/utility/PolymorphicDowncast.hpp> -#include <backendsCommon/TensorHandle.hpp> +#include <armnn/backends/TensorHandle.hpp> #include <arm_compute/runtime/NEON/functions/NEFullyConnectedLayer.h> diff --git a/src/backends/neon/workloads/NeonFullyConnectedWorkload.hpp b/src/backends/neon/workloads/NeonFullyConnectedWorkload.hpp index 8dc7fdcd6c..129fb73323 100644 --- a/src/backends/neon/workloads/NeonFullyConnectedWorkload.hpp +++ b/src/backends/neon/workloads/NeonFullyConnectedWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backendsCommon/Workload.hpp> +#include <armnn/backends/Workload.hpp> #include <arm_compute/core/Error.h> #include <arm_compute/runtime/IFunction.h> diff --git a/src/backends/neon/workloads/NeonGatherWorkload.hpp b/src/backends/neon/workloads/NeonGatherWorkload.hpp index e5b7b57629..4c208fe35c 100644 --- a/src/backends/neon/workloads/NeonGatherWorkload.hpp +++ b/src/backends/neon/workloads/NeonGatherWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backendsCommon/Workload.hpp> +#include <armnn/backends/Workload.hpp> #include <arm_compute/runtime/NEON/functions/NEGather.h> diff --git a/src/backends/neon/workloads/NeonInstanceNormalizationWorkload.cpp b/src/backends/neon/workloads/NeonInstanceNormalizationWorkload.cpp index a68ea65602..8ece5b00e0 100644 --- a/src/backends/neon/workloads/NeonInstanceNormalizationWorkload.cpp +++ b/src/backends/neon/workloads/NeonInstanceNormalizationWorkload.cpp @@ -8,7 +8,7 @@ #include "NeonWorkloadUtils.hpp" #include <aclCommon/ArmComputeTensorUtils.hpp> -#include <backendsCommon/TensorHandle.hpp> +#include <armnn/backends/TensorHandle.hpp> #include <neon/NeonTensorHandle.hpp> using namespace armnn::armcomputetensorutils; diff --git a/src/backends/neon/workloads/NeonL2NormalizationFloatWorkload.hpp b/src/backends/neon/workloads/NeonL2NormalizationFloatWorkload.hpp index 2a8eb38ef9..d87e5d067c 100644 --- a/src/backends/neon/workloads/NeonL2NormalizationFloatWorkload.hpp +++ b/src/backends/neon/workloads/NeonL2NormalizationFloatWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backendsCommon/Workload.hpp> +#include <armnn/backends/Workload.hpp> #include <arm_compute/core/Error.h> #include <arm_compute/runtime/IFunction.h> diff --git a/src/backends/neon/workloads/NeonLogSoftmaxWorkload.hpp b/src/backends/neon/workloads/NeonLogSoftmaxWorkload.hpp index dbfa28dd11..4cae08e758 100644 --- a/src/backends/neon/workloads/NeonLogSoftmaxWorkload.hpp +++ b/src/backends/neon/workloads/NeonLogSoftmaxWorkload.hpp @@ -6,7 +6,7 @@ #pragma once #include <armnn/Descriptors.hpp> -#include <backendsCommon/Workload.hpp> +#include <armnn/backends/Workload.hpp> #include <arm_compute/core/Error.h> #include <arm_compute/runtime/IFunction.h> diff --git a/src/backends/neon/workloads/NeonLogWorkload.hpp b/src/backends/neon/workloads/NeonLogWorkload.hpp index 965a845ea8..d505aa8300 100644 --- a/src/backends/neon/workloads/NeonLogWorkload.hpp +++ b/src/backends/neon/workloads/NeonLogWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backendsCommon/Workload.hpp> +#include <armnn/backends/Workload.hpp> #include <arm_compute/core/Error.h> #include <arm_compute/runtime/NEON/functions/NEElementwiseUnaryLayer.h> diff --git a/src/backends/neon/workloads/NeonLogicalAndWorkload.hpp b/src/backends/neon/workloads/NeonLogicalAndWorkload.hpp index 1daadab9bb..550266867e 100644 --- a/src/backends/neon/workloads/NeonLogicalAndWorkload.hpp +++ b/src/backends/neon/workloads/NeonLogicalAndWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backendsCommon/Workload.hpp> +#include <armnn/backends/Workload.hpp> #include <arm_compute/core/Error.h> #include <arm_compute/runtime/NEON/functions/NELogical.h> diff --git a/src/backends/neon/workloads/NeonLogicalNotWorkload.hpp b/src/backends/neon/workloads/NeonLogicalNotWorkload.hpp index 31420f7e9b..74da027394 100644 --- a/src/backends/neon/workloads/NeonLogicalNotWorkload.hpp +++ b/src/backends/neon/workloads/NeonLogicalNotWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backendsCommon/Workload.hpp> +#include <armnn/backends/Workload.hpp> #include <arm_compute/core/Error.h> #include <arm_compute/runtime/NEON/functions/NELogical.h> diff --git a/src/backends/neon/workloads/NeonLogicalOrWorkload.hpp b/src/backends/neon/workloads/NeonLogicalOrWorkload.hpp index 3b4ddb2d86..40df557563 100644 --- a/src/backends/neon/workloads/NeonLogicalOrWorkload.hpp +++ b/src/backends/neon/workloads/NeonLogicalOrWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backendsCommon/Workload.hpp> +#include <armnn/backends/Workload.hpp> #include <arm_compute/core/Error.h> #include <arm_compute/runtime/NEON/functions/NELogical.h> diff --git a/src/backends/neon/workloads/NeonLstmFloatWorkload.hpp b/src/backends/neon/workloads/NeonLstmFloatWorkload.hpp index 9a9a878574..84194b625d 100644 --- a/src/backends/neon/workloads/NeonLstmFloatWorkload.hpp +++ b/src/backends/neon/workloads/NeonLstmFloatWorkload.hpp @@ -7,8 +7,8 @@ #include <armnn/Descriptors.hpp> #include <armnn/LstmParams.hpp> -#include <backendsCommon/Workload.hpp> -#include <backendsCommon/WorkloadData.hpp> +#include <armnn/backends/Workload.hpp> +#include <armnn/backends/WorkloadData.hpp> #include "arm_compute/graph/Tensor.h" #include "arm_compute/runtime/NEON/functions/NELSTMLayer.h" diff --git a/src/backends/neon/workloads/NeonMaximumWorkload.cpp b/src/backends/neon/workloads/NeonMaximumWorkload.cpp index 0f95af5f98..e24063616c 100644 --- a/src/backends/neon/workloads/NeonMaximumWorkload.cpp +++ b/src/backends/neon/workloads/NeonMaximumWorkload.cpp @@ -6,7 +6,7 @@ #include "NeonMaximumWorkload.hpp" #include <aclCommon/ArmComputeTensorUtils.hpp> #include <armnn/utility/PolymorphicDowncast.hpp> -#include <backendsCommon/TensorHandle.hpp> +#include <armnn/backends/TensorHandle.hpp> namespace armnn { diff --git a/src/backends/neon/workloads/NeonMeanWorkload.hpp b/src/backends/neon/workloads/NeonMeanWorkload.hpp index 5d16588da2..e5b9edb918 100644 --- a/src/backends/neon/workloads/NeonMeanWorkload.hpp +++ b/src/backends/neon/workloads/NeonMeanWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backendsCommon/Workload.hpp> +#include <armnn/backends/Workload.hpp> #include <arm_compute/runtime/NEON/functions/NEReduceMean.h> diff --git a/src/backends/neon/workloads/NeonMinimumWorkload.cpp b/src/backends/neon/workloads/NeonMinimumWorkload.cpp index 5212947022..228b856ed0 100644 --- a/src/backends/neon/workloads/NeonMinimumWorkload.cpp +++ b/src/backends/neon/workloads/NeonMinimumWorkload.cpp @@ -7,7 +7,7 @@ #include <aclCommon/ArmComputeTensorUtils.hpp> #include <armnn/utility/PolymorphicDowncast.hpp> -#include <backendsCommon/TensorHandle.hpp> +#include <armnn/backends/TensorHandle.hpp> namespace armnn { diff --git a/src/backends/neon/workloads/NeonMultiplicationWorkload.hpp b/src/backends/neon/workloads/NeonMultiplicationWorkload.hpp index d2bcd04482..a5d7b76d67 100644 --- a/src/backends/neon/workloads/NeonMultiplicationWorkload.hpp +++ b/src/backends/neon/workloads/NeonMultiplicationWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backendsCommon/Workload.hpp> +#include <armnn/backends/Workload.hpp> #include <arm_compute/core/Error.h> #include <arm_compute/core/Types.h> diff --git a/src/backends/neon/workloads/NeonNegWorkload.hpp b/src/backends/neon/workloads/NeonNegWorkload.hpp index 7b2ed17a3e..0b081a1c84 100644 --- a/src/backends/neon/workloads/NeonNegWorkload.hpp +++ b/src/backends/neon/workloads/NeonNegWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backendsCommon/Workload.hpp> +#include <armnn/backends/Workload.hpp> #include <arm_compute/core/Error.h> #include <arm_compute/runtime/NEON/functions/NEElementwiseUnaryLayer.h> diff --git a/src/backends/neon/workloads/NeonNormalizationFloatWorkload.hpp b/src/backends/neon/workloads/NeonNormalizationFloatWorkload.hpp index 17bbeb41ab..892722c4ca 100644 --- a/src/backends/neon/workloads/NeonNormalizationFloatWorkload.hpp +++ b/src/backends/neon/workloads/NeonNormalizationFloatWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backendsCommon/Workload.hpp> +#include <armnn/backends/Workload.hpp> #include <arm_compute/core/Error.h> #include <arm_compute/runtime/IFunction.h> diff --git a/src/backends/neon/workloads/NeonPadWorkload.hpp b/src/backends/neon/workloads/NeonPadWorkload.hpp index ab0e821ae5..76c5c572c9 100644 --- a/src/backends/neon/workloads/NeonPadWorkload.hpp +++ b/src/backends/neon/workloads/NeonPadWorkload.hpp @@ -5,8 +5,8 @@ #pragma once -#include <backendsCommon/WorkloadData.hpp> -#include <backendsCommon/Workload.hpp> +#include <armnn/backends/WorkloadData.hpp> +#include <armnn/backends/Workload.hpp> #include <arm_compute/runtime/IFunction.h> #include <arm_compute/core/Error.h> diff --git a/src/backends/neon/workloads/NeonPermuteWorkload.hpp b/src/backends/neon/workloads/NeonPermuteWorkload.hpp index 37db490b95..934dda0762 100644 --- a/src/backends/neon/workloads/NeonPermuteWorkload.hpp +++ b/src/backends/neon/workloads/NeonPermuteWorkload.hpp @@ -5,8 +5,8 @@ #pragma once -#include <backendsCommon/Workload.hpp> -#include <backendsCommon/WorkloadData.hpp> +#include <armnn/backends/Workload.hpp> +#include <armnn/backends/WorkloadData.hpp> #include <neon/workloads/NeonWorkloadUtils.hpp> #include <armnn/TypesUtils.hpp> diff --git a/src/backends/neon/workloads/NeonPooling2dWorkload.hpp b/src/backends/neon/workloads/NeonPooling2dWorkload.hpp index b0e3aa8c59..705f6ede21 100644 --- a/src/backends/neon/workloads/NeonPooling2dWorkload.hpp +++ b/src/backends/neon/workloads/NeonPooling2dWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backendsCommon/Workload.hpp> +#include <armnn/backends/Workload.hpp> #include <arm_compute/core/Error.h> #include <arm_compute/runtime/IFunction.h> diff --git a/src/backends/neon/workloads/NeonPreluWorkload.hpp b/src/backends/neon/workloads/NeonPreluWorkload.hpp index a0d46c2e94..f6267938d9 100644 --- a/src/backends/neon/workloads/NeonPreluWorkload.hpp +++ b/src/backends/neon/workloads/NeonPreluWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backendsCommon/Workload.hpp> +#include <armnn/backends/Workload.hpp> #include <arm_compute/core/Error.h> #include <arm_compute/runtime/IFunction.h> diff --git a/src/backends/neon/workloads/NeonQLstmWorkload.hpp b/src/backends/neon/workloads/NeonQLstmWorkload.hpp index 5da1518a85..ec01919578 100644 --- a/src/backends/neon/workloads/NeonQLstmWorkload.hpp +++ b/src/backends/neon/workloads/NeonQLstmWorkload.hpp @@ -7,8 +7,8 @@ #include <armnn/Descriptors.hpp> #include <armnn/LstmParams.hpp> -#include <backendsCommon/Workload.hpp> -#include <backendsCommon/WorkloadData.hpp> +#include <armnn/backends/Workload.hpp> +#include <armnn/backends/WorkloadData.hpp> #include "arm_compute/graph/Tensor.h" #include "arm_compute/runtime/NEON/functions/NEQLSTMLayer.h" diff --git a/src/backends/neon/workloads/NeonQuantizeWorkload.hpp b/src/backends/neon/workloads/NeonQuantizeWorkload.hpp index 7f5a145371..f0d4a3ccce 100644 --- a/src/backends/neon/workloads/NeonQuantizeWorkload.hpp +++ b/src/backends/neon/workloads/NeonQuantizeWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backendsCommon/Workload.hpp> +#include <armnn/backends/Workload.hpp> #include <arm_compute/runtime/NEON/functions/NEQuantizationLayer.h> diff --git a/src/backends/neon/workloads/NeonQuantizedLstmWorkload.cpp b/src/backends/neon/workloads/NeonQuantizedLstmWorkload.cpp index e36fde4d89..6771418af2 100644 --- a/src/backends/neon/workloads/NeonQuantizedLstmWorkload.cpp +++ b/src/backends/neon/workloads/NeonQuantizedLstmWorkload.cpp @@ -7,7 +7,7 @@ #include "NeonWorkloadUtils.hpp" #include <aclCommon/ArmComputeTensorUtils.hpp> -#include <backendsCommon/TensorHandle.hpp> +#include <armnn/backends/TensorHandle.hpp> #include <neon/NeonTensorHandle.hpp> namespace armnn diff --git a/src/backends/neon/workloads/NeonQuantizedLstmWorkload.hpp b/src/backends/neon/workloads/NeonQuantizedLstmWorkload.hpp index 740cb4a316..9f769841ed 100644 --- a/src/backends/neon/workloads/NeonQuantizedLstmWorkload.hpp +++ b/src/backends/neon/workloads/NeonQuantizedLstmWorkload.hpp @@ -6,8 +6,8 @@ #pragma once #include <armnn/QuantizedLstmParams.hpp> -#include <backendsCommon/Workload.hpp> -#include <backendsCommon/WorkloadData.hpp> +#include <armnn/backends/Workload.hpp> +#include <armnn/backends/WorkloadData.hpp> #include <arm_compute/graph/Tensor.h> #include <arm_compute/runtime/NEON/functions/NELSTMLayerQuantized.h> diff --git a/src/backends/neon/workloads/NeonRankWorkload.hpp b/src/backends/neon/workloads/NeonRankWorkload.hpp index e9c7dab283..b8b83af886 100644 --- a/src/backends/neon/workloads/NeonRankWorkload.hpp +++ b/src/backends/neon/workloads/NeonRankWorkload.hpp @@ -5,8 +5,8 @@ #pragma once -#include <backendsCommon/Workload.hpp> -#include <backendsCommon/WorkloadData.hpp> +#include <armnn/backends/Workload.hpp> +#include <armnn/backends/WorkloadData.hpp> #include "NeonWorkloadUtils.hpp" diff --git a/src/backends/neon/workloads/NeonReduceWorkload.hpp b/src/backends/neon/workloads/NeonReduceWorkload.hpp index ddeac1267c..026cc8b12c 100644 --- a/src/backends/neon/workloads/NeonReduceWorkload.hpp +++ b/src/backends/neon/workloads/NeonReduceWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backendsCommon/Workload.hpp> +#include <armnn/backends/Workload.hpp> #include <arm_compute/runtime/NEON/functions/NEReductionOperation.h> diff --git a/src/backends/neon/workloads/NeonReshapeWorkload.hpp b/src/backends/neon/workloads/NeonReshapeWorkload.hpp index 186a02ba26..7c71f1404b 100644 --- a/src/backends/neon/workloads/NeonReshapeWorkload.hpp +++ b/src/backends/neon/workloads/NeonReshapeWorkload.hpp @@ -5,8 +5,8 @@ #pragma once -#include <backendsCommon/Workload.hpp> -#include <backendsCommon/WorkloadData.hpp> +#include <armnn/backends/Workload.hpp> +#include <armnn/backends/WorkloadData.hpp> #include <neon/workloads/NeonWorkloadUtils.hpp> #include <armnn/TypesUtils.hpp> diff --git a/src/backends/neon/workloads/NeonResizeWorkload.cpp b/src/backends/neon/workloads/NeonResizeWorkload.cpp index ecb43ae740..e21352e28b 100644 --- a/src/backends/neon/workloads/NeonResizeWorkload.cpp +++ b/src/backends/neon/workloads/NeonResizeWorkload.cpp @@ -10,7 +10,7 @@ #include <aclCommon/ArmComputeUtils.hpp> #include <aclCommon/ArmComputeTensorUtils.hpp> #include <armnn/utility/PolymorphicDowncast.hpp> -#include <backendsCommon/TensorHandle.hpp> +#include <armnn/backends/TensorHandle.hpp> #include <neon/NeonTensorHandle.hpp> diff --git a/src/backends/neon/workloads/NeonResizeWorkload.hpp b/src/backends/neon/workloads/NeonResizeWorkload.hpp index 69995c6311..feef7eb781 100644 --- a/src/backends/neon/workloads/NeonResizeWorkload.hpp +++ b/src/backends/neon/workloads/NeonResizeWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backendsCommon/Workload.hpp> +#include <armnn/backends/Workload.hpp> #include <arm_compute/runtime/NEON/functions/NEScale.h> diff --git a/src/backends/neon/workloads/NeonRsqrtWorkload.hpp b/src/backends/neon/workloads/NeonRsqrtWorkload.hpp index 6f6031ef77..104a556ef8 100644 --- a/src/backends/neon/workloads/NeonRsqrtWorkload.hpp +++ b/src/backends/neon/workloads/NeonRsqrtWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backendsCommon/Workload.hpp> +#include <armnn/backends/Workload.hpp> #include <arm_compute/core/Error.h> #include <arm_compute/runtime/NEON/functions/NEElementwiseUnaryLayer.h> diff --git a/src/backends/neon/workloads/NeonSinWorkload.hpp b/src/backends/neon/workloads/NeonSinWorkload.hpp index 9405c3c734..a1a8965e45 100644 --- a/src/backends/neon/workloads/NeonSinWorkload.hpp +++ b/src/backends/neon/workloads/NeonSinWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backendsCommon/Workload.hpp> +#include <armnn/backends/Workload.hpp> #include <arm_compute/core/Error.h> #include <arm_compute/runtime/NEON/functions/NEElementwiseUnaryLayer.h> diff --git a/src/backends/neon/workloads/NeonSliceWorkload.hpp b/src/backends/neon/workloads/NeonSliceWorkload.hpp index d1f32a9d7e..303f46f6b1 100644 --- a/src/backends/neon/workloads/NeonSliceWorkload.hpp +++ b/src/backends/neon/workloads/NeonSliceWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backendsCommon/Workload.hpp> +#include <armnn/backends/Workload.hpp> #include <arm_compute/core/Error.h> #include <arm_compute/runtime/IFunction.h> diff --git a/src/backends/neon/workloads/NeonSoftmaxWorkload.hpp b/src/backends/neon/workloads/NeonSoftmaxWorkload.hpp index 26081e10fb..747aaba85b 100644 --- a/src/backends/neon/workloads/NeonSoftmaxWorkload.hpp +++ b/src/backends/neon/workloads/NeonSoftmaxWorkload.hpp @@ -6,7 +6,7 @@ #pragma once #include <armnn/Descriptors.hpp> -#include <backendsCommon/Workload.hpp> +#include <armnn/backends/Workload.hpp> #include <arm_compute/core/Error.h> #include <arm_compute/runtime/IFunction.h> diff --git a/src/backends/neon/workloads/NeonSpaceToBatchNdWorkload.hpp b/src/backends/neon/workloads/NeonSpaceToBatchNdWorkload.hpp index feb8dba16f..d82b065821 100644 --- a/src/backends/neon/workloads/NeonSpaceToBatchNdWorkload.hpp +++ b/src/backends/neon/workloads/NeonSpaceToBatchNdWorkload.hpp @@ -8,7 +8,7 @@ #include <armnn/Tensor.hpp> #include <armnn/Descriptors.hpp> -#include <backendsCommon/Workload.hpp> +#include <armnn/backends/Workload.hpp> #include <arm_compute/runtime/NEON/functions/NESpaceToBatchLayer.h> diff --git a/src/backends/neon/workloads/NeonSpaceToDepthWorkload.hpp b/src/backends/neon/workloads/NeonSpaceToDepthWorkload.hpp index f2de26b3c6..613eea6863 100644 --- a/src/backends/neon/workloads/NeonSpaceToDepthWorkload.hpp +++ b/src/backends/neon/workloads/NeonSpaceToDepthWorkload.hpp @@ -7,7 +7,7 @@ #include <armnn/TypesUtils.hpp> -#include <backendsCommon/Workload.hpp> +#include <armnn/backends/Workload.hpp> #include <arm_compute/runtime/NEON/functions/NESpaceToDepthLayer.h> diff --git a/src/backends/neon/workloads/NeonSplitterWorkload.cpp b/src/backends/neon/workloads/NeonSplitterWorkload.cpp index ea1def63d6..f5a55d64c2 100644 --- a/src/backends/neon/workloads/NeonSplitterWorkload.cpp +++ b/src/backends/neon/workloads/NeonSplitterWorkload.cpp @@ -10,7 +10,7 @@ #include <aclCommon/ArmComputeTensorUtils.hpp> #include <aclCommon/ArmComputeUtils.hpp> #include <armnn/utility/PolymorphicDowncast.hpp> -#include <backendsCommon/TensorHandle.hpp> +#include <armnn/backends/TensorHandle.hpp> #include <neon/NeonTensorHandle.hpp> #include "NeonWorkloadUtils.hpp" diff --git a/src/backends/neon/workloads/NeonSplitterWorkload.hpp b/src/backends/neon/workloads/NeonSplitterWorkload.hpp index 66349f947f..88102bc477 100644 --- a/src/backends/neon/workloads/NeonSplitterWorkload.hpp +++ b/src/backends/neon/workloads/NeonSplitterWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backendsCommon/Workload.hpp> +#include <armnn/backends/Workload.hpp> #include <arm_compute/core/Error.h> #include <arm_compute/runtime/IFunction.h> diff --git a/src/backends/neon/workloads/NeonStackWorkload.cpp b/src/backends/neon/workloads/NeonStackWorkload.cpp index ad9bea1554..75c57399dd 100644 --- a/src/backends/neon/workloads/NeonStackWorkload.cpp +++ b/src/backends/neon/workloads/NeonStackWorkload.cpp @@ -8,7 +8,7 @@ #include <aclCommon/ArmComputeTensorUtils.hpp> #include <armnn/utility/NumericCast.hpp> #include <armnn/utility/PolymorphicDowncast.hpp> -#include <backendsCommon/TensorHandle.hpp> +#include <armnn/backends/TensorHandle.hpp> #include <neon/NeonTensorHandle.hpp> namespace armnn diff --git a/src/backends/neon/workloads/NeonStackWorkload.hpp b/src/backends/neon/workloads/NeonStackWorkload.hpp index 24808bfe2d..b4017c6bd3 100644 --- a/src/backends/neon/workloads/NeonStackWorkload.hpp +++ b/src/backends/neon/workloads/NeonStackWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backendsCommon/Workload.hpp> +#include <armnn/backends/Workload.hpp> #include <arm_compute/runtime/NEON/functions/NEStackLayer.h> diff --git a/src/backends/neon/workloads/NeonStridedSliceWorkload.hpp b/src/backends/neon/workloads/NeonStridedSliceWorkload.hpp index 458db3f7b4..29c40620d4 100644 --- a/src/backends/neon/workloads/NeonStridedSliceWorkload.hpp +++ b/src/backends/neon/workloads/NeonStridedSliceWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backendsCommon/Workload.hpp> +#include <armnn/backends/Workload.hpp> #include <arm_compute/core/Error.h> #include <arm_compute/runtime/IFunction.h> diff --git a/src/backends/neon/workloads/NeonSubtractionWorkload.cpp b/src/backends/neon/workloads/NeonSubtractionWorkload.cpp index 68bf15435f..369d6e0c22 100644 --- a/src/backends/neon/workloads/NeonSubtractionWorkload.cpp +++ b/src/backends/neon/workloads/NeonSubtractionWorkload.cpp @@ -12,7 +12,7 @@ #include <armnn/utility/PolymorphicDowncast.hpp> -#include <backendsCommon/TensorHandle.hpp> +#include <armnn/backends/TensorHandle.hpp> #include <arm_compute/runtime/NEON/functions/NEArithmeticSubtraction.h> diff --git a/src/backends/neon/workloads/NeonSubtractionWorkload.hpp b/src/backends/neon/workloads/NeonSubtractionWorkload.hpp index 19d0811a18..41992dd22a 100644 --- a/src/backends/neon/workloads/NeonSubtractionWorkload.hpp +++ b/src/backends/neon/workloads/NeonSubtractionWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backendsCommon/Workload.hpp> +#include <armnn/backends/Workload.hpp> #include <arm_compute/core/Error.h> #include <arm_compute/core/Types.h> diff --git a/src/backends/neon/workloads/NeonTransposeConvolution2dWorkload.cpp b/src/backends/neon/workloads/NeonTransposeConvolution2dWorkload.cpp index f9e1b36306..2b4b513f3d 100644 --- a/src/backends/neon/workloads/NeonTransposeConvolution2dWorkload.cpp +++ b/src/backends/neon/workloads/NeonTransposeConvolution2dWorkload.cpp @@ -13,7 +13,7 @@ #include <aclCommon/ArmComputeTensorUtils.hpp> -#include <backendsCommon/TensorHandle.hpp> +#include <armnn/backends/TensorHandle.hpp> #include <neon/workloads/NeonWorkloadUtils.hpp> diff --git a/src/backends/neon/workloads/NeonTransposeConvolution2dWorkload.hpp b/src/backends/neon/workloads/NeonTransposeConvolution2dWorkload.hpp index 995495e2ab..1c6ec26bd1 100644 --- a/src/backends/neon/workloads/NeonTransposeConvolution2dWorkload.hpp +++ b/src/backends/neon/workloads/NeonTransposeConvolution2dWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backendsCommon/Workload.hpp> +#include <armnn/backends/Workload.hpp> #include <arm_compute/runtime/IFunction.h> #include <arm_compute/runtime/Tensor.h> diff --git a/src/backends/neon/workloads/NeonTransposeWorkload.hpp b/src/backends/neon/workloads/NeonTransposeWorkload.hpp index aab7b705e3..ae6118f04a 100644 --- a/src/backends/neon/workloads/NeonTransposeWorkload.hpp +++ b/src/backends/neon/workloads/NeonTransposeWorkload.hpp @@ -5,8 +5,8 @@ #pragma once -#include <backendsCommon/Workload.hpp> -#include <backendsCommon/WorkloadData.hpp> +#include <armnn/backends/Workload.hpp> +#include <armnn/backends/WorkloadData.hpp> #include <neon/workloads/NeonWorkloadUtils.hpp> #include <armnn/TypesUtils.hpp> diff --git a/src/backends/neon/workloads/NeonWorkloadUtils.hpp b/src/backends/neon/workloads/NeonWorkloadUtils.hpp index f51493d383..59be03a707 100644 --- a/src/backends/neon/workloads/NeonWorkloadUtils.hpp +++ b/src/backends/neon/workloads/NeonWorkloadUtils.hpp @@ -4,11 +4,11 @@ // #pragma once -#include <backendsCommon/Workload.hpp> +#include <armnn/backends/Workload.hpp> #include <aclCommon/ArmComputeTensorUtils.hpp> #include <neon/NeonTensorHandle.hpp> #include <neon/NeonTimer.hpp> -#include <backendsCommon/TensorHandle.hpp> +#include <armnn/backends/TensorHandle.hpp> #include <armnn/Utils.hpp> |