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/cl | |
| 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/cl')
101 files changed, 114 insertions, 114 deletions
diff --git a/src/backends/cl/ClWorkloadFactory.cpp b/src/backends/cl/ClWorkloadFactory.cpp index 45e50860af..4bdb84a5a5 100644 --- a/src/backends/cl/ClWorkloadFactory.cpp +++ b/src/backends/cl/ClWorkloadFactory.cpp @@ -18,9 +18,9 @@ #include <armnn/utility/PolymorphicDowncast.hpp> #include <backendsCommon/MakeWorkloadHelper.hpp> -#include <backendsCommon/MemCopyWorkload.hpp> +#include <armnn/backends/MemCopyWorkload.hpp> #include <backendsCommon/MemImportWorkload.hpp> -#include <backendsCommon/TensorHandle.hpp> +#include <armnn/backends/TensorHandle.hpp> #include <cl/ClTensorHandle.hpp> #include <cl/workloads/ClWorkloads.hpp> diff --git a/src/backends/cl/test/ClContextControlFixture.hpp b/src/backends/cl/test/ClContextControlFixture.hpp index 14970be139..d1b2514693 100644 --- a/src/backends/cl/test/ClContextControlFixture.hpp +++ b/src/backends/cl/test/ClContextControlFixture.hpp @@ -6,7 +6,7 @@ #pragma once #include <cl/ClContextControl.hpp> -#include <backendsCommon/WorkloadFactory.hpp> +#include <armnn/backends/WorkloadFactory.hpp> template<bool ProfilingEnabled> struct ClContextControlFixtureBase diff --git a/src/backends/cl/test/ClCreateWorkloadTests.cpp b/src/backends/cl/test/ClCreateWorkloadTests.cpp index dd53f38382..34914fca50 100644 --- a/src/backends/cl/test/ClCreateWorkloadTests.cpp +++ b/src/backends/cl/test/ClCreateWorkloadTests.cpp @@ -9,9 +9,9 @@ #include <armnn/utility/Assert.hpp> #include <armnn/utility/IgnoreUnused.hpp> #include <armnn/utility/PolymorphicDowncast.hpp> -#include <backendsCommon/MemCopyWorkload.hpp> +#include <armnn/backends/MemCopyWorkload.hpp> #include <armnnTestUtils/TensorCopyUtils.hpp> -#include <WorkloadTestUtils.hpp> +#include <armnnTestUtils/WorkloadTestUtils.hpp> #include <aclCommon/test/CreateWorkloadClNeon.hpp> #include <aclCommon/ArmComputeTensorUtils.hpp> diff --git a/src/backends/cl/test/ClLayerSupportTests.cpp b/src/backends/cl/test/ClLayerSupportTests.cpp index 1747cb6763..f3df594762 100644 --- a/src/backends/cl/test/ClLayerSupportTests.cpp +++ b/src/backends/cl/test/ClLayerSupportTests.cpp @@ -10,7 +10,7 @@ #include <layers/MeanLayer.hpp> #include <TensorHelpers.hpp> -#include <backendsCommon/TensorHandle.hpp> +#include <armnn/backends/TensorHandle.hpp> #include <cl/ClWorkloadFactory.hpp> #include <cl/test/ClContextControlFixture.hpp> #include <backendsCommon/test/IsLayerSupportedTestImpl.hpp> diff --git a/src/backends/cl/test/DefaultAllocatorTests.cpp b/src/backends/cl/test/DefaultAllocatorTests.cpp index 3132bc2acb..6bb11a1aa1 100644 --- a/src/backends/cl/test/DefaultAllocatorTests.cpp +++ b/src/backends/cl/test/DefaultAllocatorTests.cpp @@ -7,7 +7,7 @@ #include <armnn/Descriptors.hpp> #include <armnn/Exceptions.hpp> #include <armnn/IRuntime.hpp> -#include <backendsCommon/TensorHandle.hpp> +#include <armnn/backends/TensorHandle.hpp> // Requires the OpenCl backend to be included (GpuAcc) #include <cl/ClBackend.hpp> #include <doctest/doctest.h> diff --git a/src/backends/cl/test/Fp16SupportTest.cpp b/src/backends/cl/test/Fp16SupportTest.cpp index b30a447f9f..da6ea10926 100644 --- a/src/backends/cl/test/Fp16SupportTest.cpp +++ b/src/backends/cl/test/Fp16SupportTest.cpp @@ -10,7 +10,7 @@ #include <Graph.hpp> #include <Optimizer.hpp> -#include <backendsCommon/TensorHandle.hpp> +#include <armnn/backends/TensorHandle.hpp> #include <armnn/utility/IgnoreUnused.hpp> #include <doctest/doctest.h> diff --git a/src/backends/cl/test/OpenClTimerTest.cpp b/src/backends/cl/test/OpenClTimerTest.cpp index 85fdc81a94..43387d8e4e 100644 --- a/src/backends/cl/test/OpenClTimerTest.cpp +++ b/src/backends/cl/test/OpenClTimerTest.cpp @@ -9,15 +9,15 @@ #include <TensorHelpers.hpp> -#include <backendsCommon/TensorHandle.hpp> -#include <backendsCommon/WorkloadFactory.hpp> +#include <armnn/backends/TensorHandle.hpp> +#include <armnn/backends/WorkloadFactory.hpp> #include <cl/ClContextControl.hpp> #include <cl/ClWorkloadFactory.hpp> #include <cl/OpenClTimer.hpp> #include <armnnTestUtils/TensorCopyUtils.hpp> -#include <WorkloadTestUtils.hpp> +#include <armnnTestUtils/WorkloadTestUtils.hpp> #include <arm_compute/runtime/CL/CLScheduler.h> diff --git a/src/backends/cl/workloads/ClAbsWorkload.hpp b/src/backends/cl/workloads/ClAbsWorkload.hpp index 07dbaafb9e..fb34fe3918 100644 --- a/src/backends/cl/workloads/ClAbsWorkload.hpp +++ b/src/backends/cl/workloads/ClAbsWorkload.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/CL/functions/CLElementwiseUnaryLayer.h> diff --git a/src/backends/cl/workloads/ClActivationWorkload.cpp b/src/backends/cl/workloads/ClActivationWorkload.cpp index 229a291026..91a44f430a 100644 --- a/src/backends/cl/workloads/ClActivationWorkload.cpp +++ b/src/backends/cl/workloads/ClActivationWorkload.cpp @@ -7,7 +7,7 @@ #include "ClWorkloadUtils.hpp" -#include <backendsCommon/TensorHandle.hpp> +#include <armnn/backends/TensorHandle.hpp> #include <cl/ClLayerSupport.hpp> #include <cl/ClTensorHandle.hpp> #include <aclCommon/ArmComputeUtils.hpp> diff --git a/src/backends/cl/workloads/ClActivationWorkload.hpp b/src/backends/cl/workloads/ClActivationWorkload.hpp index 6b71e8653a..683229e1f3 100644 --- a/src/backends/cl/workloads/ClActivationWorkload.hpp +++ b/src/backends/cl/workloads/ClActivationWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backendsCommon/Workload.hpp> +#include <armnn/backends/Workload.hpp> #include <arm_compute/runtime/CL/functions/CLActivationLayer.h> diff --git a/src/backends/cl/workloads/ClAdditionWorkload.cpp b/src/backends/cl/workloads/ClAdditionWorkload.cpp index 55957d794a..ce51b9f4fe 100644 --- a/src/backends/cl/workloads/ClAdditionWorkload.cpp +++ b/src/backends/cl/workloads/ClAdditionWorkload.cpp @@ -6,7 +6,7 @@ #include "ClAdditionWorkload.hpp" #include <cl/ClTensorHandle.hpp> -#include <backendsCommon/TensorHandle.hpp> +#include <armnn/backends/TensorHandle.hpp> #include <aclCommon/ArmComputeTensorUtils.hpp> #include <aclCommon/ArmComputeUtils.hpp> diff --git a/src/backends/cl/workloads/ClAdditionWorkload.hpp b/src/backends/cl/workloads/ClAdditionWorkload.hpp index cd25be12e7..4b26be333f 100644 --- a/src/backends/cl/workloads/ClAdditionWorkload.hpp +++ b/src/backends/cl/workloads/ClAdditionWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backendsCommon/Workload.hpp> +#include <armnn/backends/Workload.hpp> #include <arm_compute/runtime/CL/functions/CLElementwiseOperations.h> diff --git a/src/backends/cl/workloads/ClArgMinMaxWorkload.cpp b/src/backends/cl/workloads/ClArgMinMaxWorkload.cpp index 0bfb4e219b..4b1dc1ea81 100644 --- a/src/backends/cl/workloads/ClArgMinMaxWorkload.cpp +++ b/src/backends/cl/workloads/ClArgMinMaxWorkload.cpp @@ -8,7 +8,7 @@ #include <aclCommon/ArmComputeTensorUtils.hpp> -#include <backendsCommon/TensorHandle.hpp> +#include <armnn/backends/TensorHandle.hpp> #include <armnnUtils/TensorUtils.hpp> #include <armnn/utility/NumericCast.hpp> diff --git a/src/backends/cl/workloads/ClArgMinMaxWorkload.hpp b/src/backends/cl/workloads/ClArgMinMaxWorkload.hpp index 3ec137d49e..aa36e0847a 100644 --- a/src/backends/cl/workloads/ClArgMinMaxWorkload.hpp +++ b/src/backends/cl/workloads/ClArgMinMaxWorkload.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/CL/functions/CLArgMinMaxLayer.h> diff --git a/src/backends/cl/workloads/ClBatchNormalizationFloatWorkload.cpp b/src/backends/cl/workloads/ClBatchNormalizationFloatWorkload.cpp index fba1679a29..8e314fcdf0 100644 --- a/src/backends/cl/workloads/ClBatchNormalizationFloatWorkload.cpp +++ b/src/backends/cl/workloads/ClBatchNormalizationFloatWorkload.cpp @@ -8,7 +8,7 @@ #include <aclCommon/ArmComputeTensorUtils.hpp> #include <aclCommon/ArmComputeUtils.hpp> -#include <backendsCommon/TensorHandle.hpp> +#include <armnn/backends/TensorHandle.hpp> #include <cl/ClLayerSupport.hpp> #include <cl/ClTensorHandle.hpp> diff --git a/src/backends/cl/workloads/ClBatchNormalizationFloatWorkload.hpp b/src/backends/cl/workloads/ClBatchNormalizationFloatWorkload.hpp index 0ba2d97e8f..e36ab68ba5 100644 --- a/src/backends/cl/workloads/ClBatchNormalizationFloatWorkload.hpp +++ b/src/backends/cl/workloads/ClBatchNormalizationFloatWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backendsCommon/Workload.hpp> +#include <armnn/backends/Workload.hpp> #include <arm_compute/runtime/CL/CLTensor.h> #include <arm_compute/runtime/CL/functions/CLBatchNormalizationLayer.h> diff --git a/src/backends/cl/workloads/ClBatchToSpaceNdWorkload.cpp b/src/backends/cl/workloads/ClBatchToSpaceNdWorkload.cpp index 28b408d0a2..c6bd624815 100644 --- a/src/backends/cl/workloads/ClBatchToSpaceNdWorkload.cpp +++ b/src/backends/cl/workloads/ClBatchToSpaceNdWorkload.cpp @@ -6,7 +6,7 @@ #include "ClBatchToSpaceNdWorkload.hpp" #include <cl/ClTensorHandle.hpp> -#include <backendsCommon/TensorHandle.hpp> +#include <armnn/backends/TensorHandle.hpp> #include <aclCommon/ArmComputeTensorUtils.hpp> #include <armnn/utility/NumericCast.hpp> diff --git a/src/backends/cl/workloads/ClBatchToSpaceNdWorkload.hpp b/src/backends/cl/workloads/ClBatchToSpaceNdWorkload.hpp index 7ef8300f89..9e5ebff842 100644 --- a/src/backends/cl/workloads/ClBatchToSpaceNdWorkload.hpp +++ b/src/backends/cl/workloads/ClBatchToSpaceNdWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backendsCommon/Workload.hpp> +#include <armnn/backends/Workload.hpp> #include <arm_compute/runtime/CL/functions/CLBatchToSpaceLayer.h> namespace armnn diff --git a/src/backends/cl/workloads/ClCastWorkload.hpp b/src/backends/cl/workloads/ClCastWorkload.hpp index ef4c7672f4..d36c1b19e8 100644 --- a/src/backends/cl/workloads/ClCastWorkload.hpp +++ b/src/backends/cl/workloads/ClCastWorkload.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/CL/functions/CLCast.h> diff --git a/src/backends/cl/workloads/ClChannelShuffleWorkload.hpp b/src/backends/cl/workloads/ClChannelShuffleWorkload.hpp index 5ef84e6a1e..972b2dd54a 100644 --- a/src/backends/cl/workloads/ClChannelShuffleWorkload.hpp +++ b/src/backends/cl/workloads/ClChannelShuffleWorkload.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/CL/functions/CLChannelShuffleLayer.h> diff --git a/src/backends/cl/workloads/ClComparisonWorkload.cpp b/src/backends/cl/workloads/ClComparisonWorkload.cpp index 3d59e08475..a66bd6cba1 100644 --- a/src/backends/cl/workloads/ClComparisonWorkload.cpp +++ b/src/backends/cl/workloads/ClComparisonWorkload.cpp @@ -10,7 +10,7 @@ #include <aclCommon/ArmComputeUtils.hpp> #include <aclCommon/ArmComputeTensorUtils.hpp> -#include <backendsCommon/TensorHandle.hpp> +#include <armnn/backends/TensorHandle.hpp> #include <cl/ClLayerSupport.hpp> #include <cl/ClTensorHandle.hpp> diff --git a/src/backends/cl/workloads/ClComparisonWorkload.hpp b/src/backends/cl/workloads/ClComparisonWorkload.hpp index 4a92e6b6dc..662c1fa826 100644 --- a/src/backends/cl/workloads/ClComparisonWorkload.hpp +++ b/src/backends/cl/workloads/ClComparisonWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backendsCommon/Workload.hpp> +#include <armnn/backends/Workload.hpp> #include <arm_compute/runtime/CL/functions/CLComparison.h> diff --git a/src/backends/cl/workloads/ClConcatWorkload.cpp b/src/backends/cl/workloads/ClConcatWorkload.cpp index 58983c8896..50f2acb62b 100644 --- a/src/backends/cl/workloads/ClConcatWorkload.cpp +++ b/src/backends/cl/workloads/ClConcatWorkload.cpp @@ -6,7 +6,7 @@ #include "ClWorkloadUtils.hpp" #include <aclCommon/ArmComputeTensorUtils.hpp> #include <armnn/utility/PolymorphicDowncast.hpp> -#include <backendsCommon/TensorHandle.hpp> +#include <armnn/backends/TensorHandle.hpp> #include <cl/ClTensorHandle.hpp> #include <cl/ClLayerSupport.hpp> diff --git a/src/backends/cl/workloads/ClConcatWorkload.hpp b/src/backends/cl/workloads/ClConcatWorkload.hpp index 3120b423b6..f1d780e914 100644 --- a/src/backends/cl/workloads/ClConcatWorkload.hpp +++ b/src/backends/cl/workloads/ClConcatWorkload.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/cl/workloads/ClConstantWorkload.cpp b/src/backends/cl/workloads/ClConstantWorkload.cpp index 1ff7504058..cd493057a2 100644 --- a/src/backends/cl/workloads/ClConstantWorkload.cpp +++ b/src/backends/cl/workloads/ClConstantWorkload.cpp @@ -8,7 +8,7 @@ #include <Half.hpp> #include <aclCommon/ArmComputeTensorUtils.hpp> #include <cl/ClTensorHandle.hpp> -#include <backendsCommon/TensorHandle.hpp> +#include <armnn/backends/TensorHandle.hpp> #include "ClWorkloadUtils.hpp" diff --git a/src/backends/cl/workloads/ClConstantWorkload.hpp b/src/backends/cl/workloads/ClConstantWorkload.hpp index 8fa5d632c2..39e49e7d14 100644 --- a/src/backends/cl/workloads/ClConstantWorkload.hpp +++ b/src/backends/cl/workloads/ClConstantWorkload.hpp @@ -6,7 +6,7 @@ #pragma once #include <arm_compute/core/Error.h> -#include <backendsCommon/Workload.hpp> +#include <armnn/backends/Workload.hpp> #include <arm_compute/core/CL/CLCompileContext.h> diff --git a/src/backends/cl/workloads/ClConvertFp16ToFp32Workload.hpp b/src/backends/cl/workloads/ClConvertFp16ToFp32Workload.hpp index e8e6c98014..d831cc1dc0 100644 --- a/src/backends/cl/workloads/ClConvertFp16ToFp32Workload.hpp +++ b/src/backends/cl/workloads/ClConvertFp16ToFp32Workload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backendsCommon/Workload.hpp> +#include <armnn/backends/Workload.hpp> #include <arm_compute/runtime/CL/functions/CLDepthConvertLayer.h> diff --git a/src/backends/cl/workloads/ClConvertFp32ToFp16Workload.hpp b/src/backends/cl/workloads/ClConvertFp32ToFp16Workload.hpp index 17eac7d23b..df25072840 100644 --- a/src/backends/cl/workloads/ClConvertFp32ToFp16Workload.hpp +++ b/src/backends/cl/workloads/ClConvertFp32ToFp16Workload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backendsCommon/Workload.hpp> +#include <armnn/backends/Workload.hpp> #include <arm_compute/runtime/CL/functions/CLDepthConvertLayer.h> diff --git a/src/backends/cl/workloads/ClConvolution2dWorkload.cpp b/src/backends/cl/workloads/ClConvolution2dWorkload.cpp index a5f4c7f254..95753053dd 100644 --- a/src/backends/cl/workloads/ClConvolution2dWorkload.cpp +++ b/src/backends/cl/workloads/ClConvolution2dWorkload.cpp @@ -12,7 +12,7 @@ #include <cl/ClLayerSupport.hpp> #include <aclCommon/ArmComputeUtils.hpp> #include <aclCommon/ArmComputeTensorUtils.hpp> -#include <backendsCommon/TensorHandle.hpp> +#include <armnn/backends/TensorHandle.hpp> #include <arm_compute/runtime/CL/functions/CLConvolutionLayer.h> diff --git a/src/backends/cl/workloads/ClConvolution2dWorkload.hpp b/src/backends/cl/workloads/ClConvolution2dWorkload.hpp index d0f7a5b251..e0921ed7ce 100644 --- a/src/backends/cl/workloads/ClConvolution2dWorkload.hpp +++ b/src/backends/cl/workloads/ClConvolution2dWorkload.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/CL/functions/CLConvolutionLayer.h> #include <arm_compute/runtime/MemoryManagerOnDemand.h> diff --git a/src/backends/cl/workloads/ClConvolution3dWorkload.cpp b/src/backends/cl/workloads/ClConvolution3dWorkload.cpp index baa2f05909..a47a3be2df 100644 --- a/src/backends/cl/workloads/ClConvolution3dWorkload.cpp +++ b/src/backends/cl/workloads/ClConvolution3dWorkload.cpp @@ -12,7 +12,7 @@ #include <cl/ClLayerSupport.hpp> #include <aclCommon/ArmComputeUtils.hpp> #include <aclCommon/ArmComputeTensorUtils.hpp> -#include <backendsCommon/TensorHandle.hpp> +#include <armnn/backends/TensorHandle.hpp> #include <arm_compute/runtime/CL/functions/CLConv3D.h> diff --git a/src/backends/cl/workloads/ClConvolution3dWorkload.hpp b/src/backends/cl/workloads/ClConvolution3dWorkload.hpp index 93654ecad8..850cf9b1f2 100644 --- a/src/backends/cl/workloads/ClConvolution3dWorkload.hpp +++ b/src/backends/cl/workloads/ClConvolution3dWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backendsCommon/Workload.hpp> +#include <armnn/backends/Workload.hpp> #include <arm_compute/runtime/CL/functions/CLConv3D.h> #include <arm_compute/runtime/MemoryManagerOnDemand.h> diff --git a/src/backends/cl/workloads/ClDepthToSpaceWorkload.hpp b/src/backends/cl/workloads/ClDepthToSpaceWorkload.hpp index 01f83331c5..014fbb6472 100644 --- a/src/backends/cl/workloads/ClDepthToSpaceWorkload.hpp +++ b/src/backends/cl/workloads/ClDepthToSpaceWorkload.hpp @@ -7,7 +7,7 @@ #include <armnn/Descriptors.hpp> -#include <backendsCommon/Workload.hpp> +#include <armnn/backends/Workload.hpp> #include <arm_compute/runtime/CL/functions/CLDepthToSpaceLayer.h> diff --git a/src/backends/cl/workloads/ClDepthwiseConvolutionWorkload.cpp b/src/backends/cl/workloads/ClDepthwiseConvolutionWorkload.cpp index 91c0018c93..73396d6045 100644 --- a/src/backends/cl/workloads/ClDepthwiseConvolutionWorkload.cpp +++ b/src/backends/cl/workloads/ClDepthwiseConvolutionWorkload.cpp @@ -12,9 +12,9 @@ #include <aclCommon/ArmComputeUtils.hpp> #include <aclCommon/ArmComputeTensorUtils.hpp> #include <cl/ClTensorHandle.hpp> -#include <backendsCommon/TensorHandle.hpp> +#include <armnn/backends/TensorHandle.hpp> #include <backendsCommon/WorkloadUtils.hpp> -#include <backendsCommon/WorkloadData.hpp> +#include <armnn/backends/WorkloadData.hpp> #include <arm_compute/runtime/CL/functions/CLDepthwiseConvolutionLayer.h> diff --git a/src/backends/cl/workloads/ClDepthwiseConvolutionWorkload.hpp b/src/backends/cl/workloads/ClDepthwiseConvolutionWorkload.hpp index d490012cd9..aab8c852c1 100644 --- a/src/backends/cl/workloads/ClDepthwiseConvolutionWorkload.hpp +++ b/src/backends/cl/workloads/ClDepthwiseConvolutionWorkload.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/core/Error.h> diff --git a/src/backends/cl/workloads/ClDequantizeWorkload.cpp b/src/backends/cl/workloads/ClDequantizeWorkload.cpp index 00d849c603..772d126d65 100644 --- a/src/backends/cl/workloads/ClDequantizeWorkload.cpp +++ b/src/backends/cl/workloads/ClDequantizeWorkload.cpp @@ -8,7 +8,7 @@ #include <aclCommon/ArmComputeTensorUtils.hpp> #include <armnn/utility/PolymorphicDowncast.hpp> -#include <backendsCommon/TensorHandle.hpp> +#include <armnn/backends/TensorHandle.hpp> #include <arm_compute/core/Types.h> diff --git a/src/backends/cl/workloads/ClDequantizeWorkload.hpp b/src/backends/cl/workloads/ClDequantizeWorkload.hpp index 628ea20f1b..24babd36c9 100644 --- a/src/backends/cl/workloads/ClDequantizeWorkload.hpp +++ b/src/backends/cl/workloads/ClDequantizeWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backendsCommon/Workload.hpp> +#include <armnn/backends/Workload.hpp> #include <arm_compute/runtime/CL/functions/CLDequantizationLayer.h> diff --git a/src/backends/cl/workloads/ClDivisionWorkload.cpp b/src/backends/cl/workloads/ClDivisionWorkload.cpp index 5df4c61bf5..9c30d9143e 100644 --- a/src/backends/cl/workloads/ClDivisionWorkload.cpp +++ b/src/backends/cl/workloads/ClDivisionWorkload.cpp @@ -6,7 +6,7 @@ #include "ClDivisionWorkload.hpp" #include <aclCommon/ArmComputeUtils.hpp> -#include <backendsCommon/TensorHandle.hpp> +#include <armnn/backends/TensorHandle.hpp> #include <cl/ClTensorHandle.hpp> diff --git a/src/backends/cl/workloads/ClDivisionWorkload.hpp b/src/backends/cl/workloads/ClDivisionWorkload.hpp index d0c27bb310..8018f5a522 100644 --- a/src/backends/cl/workloads/ClDivisionWorkload.hpp +++ b/src/backends/cl/workloads/ClDivisionWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backendsCommon/Workload.hpp> +#include <armnn/backends/Workload.hpp> #include <arm_compute/runtime/CL/functions/CLElementwiseOperations.h> diff --git a/src/backends/cl/workloads/ClExpWorkload.hpp b/src/backends/cl/workloads/ClExpWorkload.hpp index d2d1954870..e1f74f8db3 100644 --- a/src/backends/cl/workloads/ClExpWorkload.hpp +++ b/src/backends/cl/workloads/ClExpWorkload.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/CL/functions/CLElementwiseUnaryLayer.h> diff --git a/src/backends/cl/workloads/ClFillWorkload.hpp b/src/backends/cl/workloads/ClFillWorkload.hpp index 8539501f17..b0f9fe19e1 100644 --- a/src/backends/cl/workloads/ClFillWorkload.hpp +++ b/src/backends/cl/workloads/ClFillWorkload.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/CL/functions/CLFill.h> namespace armnn { diff --git a/src/backends/cl/workloads/ClFloorFloatWorkload.hpp b/src/backends/cl/workloads/ClFloorFloatWorkload.hpp index 1c755c5b57..4e09311867 100644 --- a/src/backends/cl/workloads/ClFloorFloatWorkload.hpp +++ b/src/backends/cl/workloads/ClFloorFloatWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backendsCommon/Workload.hpp> +#include <armnn/backends/Workload.hpp> #include <arm_compute/runtime/CL/functions/CLFloor.h> diff --git a/src/backends/cl/workloads/ClFullyConnectedWorkload.cpp b/src/backends/cl/workloads/ClFullyConnectedWorkload.cpp index cc4ce9082c..532d0d45da 100644 --- a/src/backends/cl/workloads/ClFullyConnectedWorkload.cpp +++ b/src/backends/cl/workloads/ClFullyConnectedWorkload.cpp @@ -5,7 +5,7 @@ #include "ClFullyConnectedWorkload.hpp" #include <cl/ClTensorHandle.hpp> -#include <backendsCommon/TensorHandle.hpp> +#include <armnn/backends/TensorHandle.hpp> #include <aclCommon/ArmComputeTensorUtils.hpp> #include <aclCommon/ArmComputeUtils.hpp> #include <cl/ClLayerSupport.hpp> diff --git a/src/backends/cl/workloads/ClFullyConnectedWorkload.hpp b/src/backends/cl/workloads/ClFullyConnectedWorkload.hpp index 45394da97f..6576fb2078 100644 --- a/src/backends/cl/workloads/ClFullyConnectedWorkload.hpp +++ b/src/backends/cl/workloads/ClFullyConnectedWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backendsCommon/Workload.hpp> +#include <armnn/backends/Workload.hpp> #include <arm_compute/runtime/CL/functions/CLFullyConnectedLayer.h> #include <arm_compute/runtime/MemoryManagerOnDemand.h> diff --git a/src/backends/cl/workloads/ClGatherWorkload.hpp b/src/backends/cl/workloads/ClGatherWorkload.hpp index 8199aaf338..e6d198dc27 100644 --- a/src/backends/cl/workloads/ClGatherWorkload.hpp +++ b/src/backends/cl/workloads/ClGatherWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backendsCommon/Workload.hpp> +#include <armnn/backends/Workload.hpp> #include <arm_compute/runtime/CL/functions/CLGather.h> diff --git a/src/backends/cl/workloads/ClInstanceNormalizationWorkload.hpp b/src/backends/cl/workloads/ClInstanceNormalizationWorkload.hpp index 957ba34685..250cd4d1b1 100644 --- a/src/backends/cl/workloads/ClInstanceNormalizationWorkload.hpp +++ b/src/backends/cl/workloads/ClInstanceNormalizationWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backendsCommon/Workload.hpp> +#include <armnn/backends/Workload.hpp> #include <arm_compute/runtime/CL/functions/CLInstanceNormalizationLayer.h> diff --git a/src/backends/cl/workloads/ClL2NormalizationFloatWorkload.cpp b/src/backends/cl/workloads/ClL2NormalizationFloatWorkload.cpp index 3b20ace1ed..39cbe711e2 100644 --- a/src/backends/cl/workloads/ClL2NormalizationFloatWorkload.cpp +++ b/src/backends/cl/workloads/ClL2NormalizationFloatWorkload.cpp @@ -5,7 +5,7 @@ #include "ClL2NormalizationFloatWorkload.hpp" #include <cl/ClTensorHandle.hpp> -#include <backendsCommon/TensorHandle.hpp> +#include <armnn/backends/TensorHandle.hpp> #include <aclCommon/ArmComputeUtils.hpp> #include "ClWorkloadUtils.hpp" diff --git a/src/backends/cl/workloads/ClL2NormalizationFloatWorkload.hpp b/src/backends/cl/workloads/ClL2NormalizationFloatWorkload.hpp index 8648da4492..12ca0a10b1 100644 --- a/src/backends/cl/workloads/ClL2NormalizationFloatWorkload.hpp +++ b/src/backends/cl/workloads/ClL2NormalizationFloatWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backendsCommon/Workload.hpp> +#include <armnn/backends/Workload.hpp> #include <arm_compute/runtime/CL/functions/CLL2NormalizeLayer.h> diff --git a/src/backends/cl/workloads/ClLogSoftmaxWorkload.hpp b/src/backends/cl/workloads/ClLogSoftmaxWorkload.hpp index a2835887e0..4eb86eac8a 100644 --- a/src/backends/cl/workloads/ClLogSoftmaxWorkload.hpp +++ b/src/backends/cl/workloads/ClLogSoftmaxWorkload.hpp @@ -12,7 +12,7 @@ #include <arm_compute/runtime/CL/functions/CLSoftmaxLayer.h> -#include <backendsCommon/Workload.hpp> +#include <armnn/backends/Workload.hpp> namespace armnn { diff --git a/src/backends/cl/workloads/ClLogWorkload.hpp b/src/backends/cl/workloads/ClLogWorkload.hpp index 9eb55c138f..5a2992a64c 100644 --- a/src/backends/cl/workloads/ClLogWorkload.hpp +++ b/src/backends/cl/workloads/ClLogWorkload.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/CL/functions/CLElementwiseUnaryLayer.h> diff --git a/src/backends/cl/workloads/ClLogicalAndWorkload.hpp b/src/backends/cl/workloads/ClLogicalAndWorkload.hpp index c7cbf5a7cc..547995eed9 100644 --- a/src/backends/cl/workloads/ClLogicalAndWorkload.hpp +++ b/src/backends/cl/workloads/ClLogicalAndWorkload.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/CL/functions/CLLogicalAnd.h> diff --git a/src/backends/cl/workloads/ClLogicalNotWorkload.hpp b/src/backends/cl/workloads/ClLogicalNotWorkload.hpp index 9c6c3d15a6..2dc0d095f8 100644 --- a/src/backends/cl/workloads/ClLogicalNotWorkload.hpp +++ b/src/backends/cl/workloads/ClLogicalNotWorkload.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/CL/functions/CLLogicalNot.h> diff --git a/src/backends/cl/workloads/ClLogicalOrWorkload.hpp b/src/backends/cl/workloads/ClLogicalOrWorkload.hpp index a6db9908bb..ada72c2654 100644 --- a/src/backends/cl/workloads/ClLogicalOrWorkload.hpp +++ b/src/backends/cl/workloads/ClLogicalOrWorkload.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/CL/functions/CLLogicalOr.h> diff --git a/src/backends/cl/workloads/ClLstmFloatWorkload.cpp b/src/backends/cl/workloads/ClLstmFloatWorkload.cpp index 9cbbff3dd9..c7b644c46a 100644 --- a/src/backends/cl/workloads/ClLstmFloatWorkload.cpp +++ b/src/backends/cl/workloads/ClLstmFloatWorkload.cpp @@ -5,7 +5,7 @@ #include "ClLstmFloatWorkload.hpp" #include <cl/ClTensorHandle.hpp> -#include <backendsCommon/TensorHandle.hpp> +#include <armnn/backends/TensorHandle.hpp> #include <cl/ClLayerSupport.hpp> #include <aclCommon/ArmComputeTensorUtils.hpp> diff --git a/src/backends/cl/workloads/ClLstmFloatWorkload.hpp b/src/backends/cl/workloads/ClLstmFloatWorkload.hpp index b0847503d9..bfa98d46b2 100644 --- a/src/backends/cl/workloads/ClLstmFloatWorkload.hpp +++ b/src/backends/cl/workloads/ClLstmFloatWorkload.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/runtime/CL/functions/CLLSTMLayer.h> diff --git a/src/backends/cl/workloads/ClMaximumWorkload.cpp b/src/backends/cl/workloads/ClMaximumWorkload.cpp index f10c609ef9..421a5310a7 100644 --- a/src/backends/cl/workloads/ClMaximumWorkload.cpp +++ b/src/backends/cl/workloads/ClMaximumWorkload.cpp @@ -10,7 +10,7 @@ #include <aclCommon/ArmComputeUtils.hpp> #include <aclCommon/ArmComputeTensorUtils.hpp> -#include <backendsCommon/TensorHandle.hpp> +#include <armnn/backends/TensorHandle.hpp> #include <cl/ClLayerSupport.hpp> #include <cl/ClTensorHandle.hpp> diff --git a/src/backends/cl/workloads/ClMaximumWorkload.hpp b/src/backends/cl/workloads/ClMaximumWorkload.hpp index f6681c79a3..55a375b939 100644 --- a/src/backends/cl/workloads/ClMaximumWorkload.hpp +++ b/src/backends/cl/workloads/ClMaximumWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backendsCommon/Workload.hpp> +#include <armnn/backends/Workload.hpp> #include <arm_compute/runtime/CL/functions/CLElementwiseOperations.h> diff --git a/src/backends/cl/workloads/ClMeanWorkload.hpp b/src/backends/cl/workloads/ClMeanWorkload.hpp index c9229acf17..0ea6c595d7 100644 --- a/src/backends/cl/workloads/ClMeanWorkload.hpp +++ b/src/backends/cl/workloads/ClMeanWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backendsCommon/Workload.hpp> +#include <armnn/backends/Workload.hpp> #include <arm_compute/runtime/CL/functions/CLReduceMean.h> diff --git a/src/backends/cl/workloads/ClMinimumWorkload.cpp b/src/backends/cl/workloads/ClMinimumWorkload.cpp index d29dcc2950..934598c3dc 100644 --- a/src/backends/cl/workloads/ClMinimumWorkload.cpp +++ b/src/backends/cl/workloads/ClMinimumWorkload.cpp @@ -10,7 +10,7 @@ #include <aclCommon/ArmComputeUtils.hpp> #include <aclCommon/ArmComputeTensorUtils.hpp> -#include <backendsCommon/TensorHandle.hpp> +#include <armnn/backends/TensorHandle.hpp> #include <cl/ClLayerSupport.hpp> #include <cl/ClTensorHandle.hpp> diff --git a/src/backends/cl/workloads/ClMinimumWorkload.hpp b/src/backends/cl/workloads/ClMinimumWorkload.hpp index 34e7bb8d14..061788f81a 100644 --- a/src/backends/cl/workloads/ClMinimumWorkload.hpp +++ b/src/backends/cl/workloads/ClMinimumWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backendsCommon/Workload.hpp> +#include <armnn/backends/Workload.hpp> #include <arm_compute/runtime/CL/functions/CLElementwiseOperations.h> diff --git a/src/backends/cl/workloads/ClMultiplicationWorkload.cpp b/src/backends/cl/workloads/ClMultiplicationWorkload.cpp index e19a7a24b6..0ef4d9a3de 100644 --- a/src/backends/cl/workloads/ClMultiplicationWorkload.cpp +++ b/src/backends/cl/workloads/ClMultiplicationWorkload.cpp @@ -6,7 +6,7 @@ #include "ClMultiplicationWorkload.hpp" #include <aclCommon/ArmComputeUtils.hpp> -#include <backendsCommon/TensorHandle.hpp> +#include <armnn/backends/TensorHandle.hpp> #include <cl/ClTensorHandle.hpp> diff --git a/src/backends/cl/workloads/ClMultiplicationWorkload.hpp b/src/backends/cl/workloads/ClMultiplicationWorkload.hpp index 7bc0db7ce9..5db81d6f86 100644 --- a/src/backends/cl/workloads/ClMultiplicationWorkload.hpp +++ b/src/backends/cl/workloads/ClMultiplicationWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backendsCommon/Workload.hpp> +#include <armnn/backends/Workload.hpp> #include <arm_compute/runtime/CL/functions/CLPixelWiseMultiplication.h> diff --git a/src/backends/cl/workloads/ClNegWorkload.hpp b/src/backends/cl/workloads/ClNegWorkload.hpp index 5622a48f04..77092e1d7d 100644 --- a/src/backends/cl/workloads/ClNegWorkload.hpp +++ b/src/backends/cl/workloads/ClNegWorkload.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/CL/functions/CLElementwiseUnaryLayer.h> diff --git a/src/backends/cl/workloads/ClNormalizationFloatWorkload.cpp b/src/backends/cl/workloads/ClNormalizationFloatWorkload.cpp index 9234a8a88b..b61869b852 100644 --- a/src/backends/cl/workloads/ClNormalizationFloatWorkload.cpp +++ b/src/backends/cl/workloads/ClNormalizationFloatWorkload.cpp @@ -5,7 +5,7 @@ #include "ClNormalizationFloatWorkload.hpp" #include <cl/ClTensorHandle.hpp> -#include <backendsCommon/TensorHandle.hpp> +#include <armnn/backends/TensorHandle.hpp> #include <cl/ClLayerSupport.hpp> #include <aclCommon/ArmComputeUtils.hpp> #include <aclCommon/ArmComputeTensorUtils.hpp> diff --git a/src/backends/cl/workloads/ClNormalizationFloatWorkload.hpp b/src/backends/cl/workloads/ClNormalizationFloatWorkload.hpp index dd309b44c2..b3a16351cc 100644 --- a/src/backends/cl/workloads/ClNormalizationFloatWorkload.hpp +++ b/src/backends/cl/workloads/ClNormalizationFloatWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backendsCommon/Workload.hpp> +#include <armnn/backends/Workload.hpp> #include <arm_compute/runtime/CL/functions/CLNormalizationLayer.h> diff --git a/src/backends/cl/workloads/ClPadWorkload.hpp b/src/backends/cl/workloads/ClPadWorkload.hpp index ac9b4b7c65..83ec5a4825 100644 --- a/src/backends/cl/workloads/ClPadWorkload.hpp +++ b/src/backends/cl/workloads/ClPadWorkload.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/CL/functions/CLPadLayer.h> namespace armnn { diff --git a/src/backends/cl/workloads/ClPermuteWorkload.hpp b/src/backends/cl/workloads/ClPermuteWorkload.hpp index 2df2b26a11..f0f12d7b7a 100644 --- a/src/backends/cl/workloads/ClPermuteWorkload.hpp +++ b/src/backends/cl/workloads/ClPermuteWorkload.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 <armnn/TypesUtils.hpp> #include <arm_compute/runtime/CL/functions/CLPermute.h> diff --git a/src/backends/cl/workloads/ClPooling2dWorkload.hpp b/src/backends/cl/workloads/ClPooling2dWorkload.hpp index f4117aca2e..451a28501a 100644 --- a/src/backends/cl/workloads/ClPooling2dWorkload.hpp +++ b/src/backends/cl/workloads/ClPooling2dWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backendsCommon/Workload.hpp> +#include <armnn/backends/Workload.hpp> #include <arm_compute/runtime/CL/functions/CLPoolingLayer.h> diff --git a/src/backends/cl/workloads/ClPreluWorkload.cpp b/src/backends/cl/workloads/ClPreluWorkload.cpp index 449e4de48c..81d40db7b1 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 <backendsCommon/TensorHandle.hpp> +#include <armnn/backends/TensorHandle.hpp> #include <aclCommon/ArmComputeUtils.hpp> #include <cl/ClLayerSupport.hpp> #include <cl/ClTensorHandle.hpp> diff --git a/src/backends/cl/workloads/ClPreluWorkload.hpp b/src/backends/cl/workloads/ClPreluWorkload.hpp index ac8932c9d1..6b0520f2e6 100644 --- a/src/backends/cl/workloads/ClPreluWorkload.hpp +++ b/src/backends/cl/workloads/ClPreluWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backendsCommon/Workload.hpp> +#include <armnn/backends/Workload.hpp> #include <arm_compute/runtime/CL/functions/CLPReluLayer.h> diff --git a/src/backends/cl/workloads/ClQLstmWorkload.hpp b/src/backends/cl/workloads/ClQLstmWorkload.hpp index 6758abcde9..6c389064d0 100644 --- a/src/backends/cl/workloads/ClQLstmWorkload.hpp +++ b/src/backends/cl/workloads/ClQLstmWorkload.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/CL/functions/CLQLSTMLayer.h" diff --git a/src/backends/cl/workloads/ClQuantizeWorkload.cpp b/src/backends/cl/workloads/ClQuantizeWorkload.cpp index 5321e6292a..be17edd7fd 100644 --- a/src/backends/cl/workloads/ClQuantizeWorkload.cpp +++ b/src/backends/cl/workloads/ClQuantizeWorkload.cpp @@ -9,7 +9,7 @@ #include <aclCommon/ArmComputeUtils.hpp> #include <aclCommon/ArmComputeTensorUtils.hpp> -#include <backendsCommon/TensorHandle.hpp> +#include <armnn/backends/TensorHandle.hpp> #include <cl/ClLayerSupport.hpp> #include <cl/ClTensorHandle.hpp> diff --git a/src/backends/cl/workloads/ClQuantizeWorkload.hpp b/src/backends/cl/workloads/ClQuantizeWorkload.hpp index 9bb1572c5c..cf459b20e0 100644 --- a/src/backends/cl/workloads/ClQuantizeWorkload.hpp +++ b/src/backends/cl/workloads/ClQuantizeWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backendsCommon/Workload.hpp> +#include <armnn/backends/Workload.hpp> #include <arm_compute/runtime/CL/functions/CLQuantizationLayer.h> diff --git a/src/backends/cl/workloads/ClQuantizedLstmWorkload.cpp b/src/backends/cl/workloads/ClQuantizedLstmWorkload.cpp index 05ae89c93b..ad1d143aa7 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 <backendsCommon/TensorHandle.hpp> +#include <armnn/backends/TensorHandle.hpp> #include <aclCommon/ArmComputeTensorUtils.hpp> #include <cl/ClTensorHandle.hpp> diff --git a/src/backends/cl/workloads/ClQuantizedLstmWorkload.hpp b/src/backends/cl/workloads/ClQuantizedLstmWorkload.hpp index 6561850d79..48b0b27525 100644 --- a/src/backends/cl/workloads/ClQuantizedLstmWorkload.hpp +++ b/src/backends/cl/workloads/ClQuantizedLstmWorkload.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/runtime/CL/functions/CLLSTMLayerQuantized.h> diff --git a/src/backends/cl/workloads/ClRankWorkload.hpp b/src/backends/cl/workloads/ClRankWorkload.hpp index 0a7bccf6c6..b5a856ff07 100644 --- a/src/backends/cl/workloads/ClRankWorkload.hpp +++ b/src/backends/cl/workloads/ClRankWorkload.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 "ClWorkloadUtils.hpp" diff --git a/src/backends/cl/workloads/ClReduceWorkload.hpp b/src/backends/cl/workloads/ClReduceWorkload.hpp index 8b0aadb1ae..a9c1409dcf 100644 --- a/src/backends/cl/workloads/ClReduceWorkload.hpp +++ b/src/backends/cl/workloads/ClReduceWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backendsCommon/Workload.hpp> +#include <armnn/backends/Workload.hpp> #include <arm_compute/runtime/CL/functions/CLReductionOperation.h> diff --git a/src/backends/cl/workloads/ClReshapeWorkload.cpp b/src/backends/cl/workloads/ClReshapeWorkload.cpp index ece3166eea..8ca05d0af1 100644 --- a/src/backends/cl/workloads/ClReshapeWorkload.cpp +++ b/src/backends/cl/workloads/ClReshapeWorkload.cpp @@ -5,7 +5,7 @@ #include "ClReshapeWorkload.hpp" #include <cl/ClTensorHandle.hpp> -#include <backendsCommon/TensorHandle.hpp> +#include <armnn/backends/TensorHandle.hpp> #include "ClWorkloadUtils.hpp" diff --git a/src/backends/cl/workloads/ClReshapeWorkload.hpp b/src/backends/cl/workloads/ClReshapeWorkload.hpp index 70d72879f5..9acfc838b4 100644 --- a/src/backends/cl/workloads/ClReshapeWorkload.hpp +++ b/src/backends/cl/workloads/ClReshapeWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backendsCommon/Workload.hpp> +#include <armnn/backends/Workload.hpp> #include <arm_compute/runtime/CL/functions/CLReshapeLayer.h> diff --git a/src/backends/cl/workloads/ClResizeWorkload.cpp b/src/backends/cl/workloads/ClResizeWorkload.cpp index 8121429560..628cbbd752 100644 --- a/src/backends/cl/workloads/ClResizeWorkload.cpp +++ b/src/backends/cl/workloads/ClResizeWorkload.cpp @@ -10,7 +10,7 @@ #include <aclCommon/ArmComputeUtils.hpp> #include <aclCommon/ArmComputeTensorUtils.hpp> -#include <backendsCommon/TensorHandle.hpp> +#include <armnn/backends/TensorHandle.hpp> #include <cl/ClTensorHandle.hpp> diff --git a/src/backends/cl/workloads/ClResizeWorkload.hpp b/src/backends/cl/workloads/ClResizeWorkload.hpp index 9549a32165..f062eb70b5 100644 --- a/src/backends/cl/workloads/ClResizeWorkload.hpp +++ b/src/backends/cl/workloads/ClResizeWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backendsCommon/Workload.hpp> +#include <armnn/backends/Workload.hpp> #include <arm_compute/runtime/CL/functions/CLScale.h> diff --git a/src/backends/cl/workloads/ClRsqrtWorkload.hpp b/src/backends/cl/workloads/ClRsqrtWorkload.hpp index 8010c78afd..e53d576d6e 100644 --- a/src/backends/cl/workloads/ClRsqrtWorkload.hpp +++ b/src/backends/cl/workloads/ClRsqrtWorkload.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/CL/functions/CLElementwiseUnaryLayer.h> diff --git a/src/backends/cl/workloads/ClSinWorkload.hpp b/src/backends/cl/workloads/ClSinWorkload.hpp index 8675ab3476..d6e799bf7e 100644 --- a/src/backends/cl/workloads/ClSinWorkload.hpp +++ b/src/backends/cl/workloads/ClSinWorkload.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/CL/functions/CLElementwiseUnaryLayer.h> diff --git a/src/backends/cl/workloads/ClSliceWorkload.hpp b/src/backends/cl/workloads/ClSliceWorkload.hpp index 67836c2b5c..1451a6df79 100644 --- a/src/backends/cl/workloads/ClSliceWorkload.hpp +++ b/src/backends/cl/workloads/ClSliceWorkload.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/CL/functions/CLSlice.h> diff --git a/src/backends/cl/workloads/ClSoftmaxWorkload.hpp b/src/backends/cl/workloads/ClSoftmaxWorkload.hpp index 1742c60511..04b03c8f2b 100644 --- a/src/backends/cl/workloads/ClSoftmaxWorkload.hpp +++ b/src/backends/cl/workloads/ClSoftmaxWorkload.hpp @@ -11,7 +11,7 @@ #include <arm_compute/runtime/MemoryManagerOnDemand.h> #include <arm_compute/runtime/CL/functions/CLSoftmaxLayer.h> -#include <backendsCommon/Workload.hpp> +#include <armnn/backends/Workload.hpp> namespace armnn { diff --git a/src/backends/cl/workloads/ClSpaceToBatchNdWorkload.cpp b/src/backends/cl/workloads/ClSpaceToBatchNdWorkload.cpp index 2bdfb38ade..9e6c00e9d0 100644 --- a/src/backends/cl/workloads/ClSpaceToBatchNdWorkload.cpp +++ b/src/backends/cl/workloads/ClSpaceToBatchNdWorkload.cpp @@ -11,7 +11,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 <cl/ClLayerSupport.hpp> #include <cl/ClTensorHandle.hpp> #include <cl/ClLayerSupport.hpp> diff --git a/src/backends/cl/workloads/ClSpaceToBatchNdWorkload.hpp b/src/backends/cl/workloads/ClSpaceToBatchNdWorkload.hpp index 06d243a6d1..ed9870da5e 100644 --- a/src/backends/cl/workloads/ClSpaceToBatchNdWorkload.hpp +++ b/src/backends/cl/workloads/ClSpaceToBatchNdWorkload.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/CL/functions/CLSpaceToBatchLayer.h> diff --git a/src/backends/cl/workloads/ClSpaceToDepthWorkload.cpp b/src/backends/cl/workloads/ClSpaceToDepthWorkload.cpp index a2c9026f9f..23b4d97c04 100644 --- a/src/backends/cl/workloads/ClSpaceToDepthWorkload.cpp +++ b/src/backends/cl/workloads/ClSpaceToDepthWorkload.cpp @@ -8,7 +8,7 @@ #include <aclCommon/ArmComputeUtils.hpp> #include <aclCommon/ArmComputeTensorUtils.hpp> -#include <backendsCommon/TensorHandle.hpp> +#include <armnn/backends/TensorHandle.hpp> #include <cl/ClTensorHandle.hpp> #include <armnn/utility/NumericCast.hpp> diff --git a/src/backends/cl/workloads/ClSpaceToDepthWorkload.hpp b/src/backends/cl/workloads/ClSpaceToDepthWorkload.hpp index 3674bda1b6..ace3116b3e 100644 --- a/src/backends/cl/workloads/ClSpaceToDepthWorkload.hpp +++ b/src/backends/cl/workloads/ClSpaceToDepthWorkload.hpp @@ -7,7 +7,7 @@ #include <armnn/Descriptors.hpp> -#include <backendsCommon/Workload.hpp> +#include <armnn/backends/Workload.hpp> #include <arm_compute/runtime/CL/functions/CLSpaceToDepthLayer.h> namespace armnn diff --git a/src/backends/cl/workloads/ClSplitterWorkload.cpp b/src/backends/cl/workloads/ClSplitterWorkload.cpp index a7d8a1aa7e..54454412e6 100644 --- a/src/backends/cl/workloads/ClSplitterWorkload.cpp +++ b/src/backends/cl/workloads/ClSplitterWorkload.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 <cl/ClTensorHandle.hpp> diff --git a/src/backends/cl/workloads/ClSplitterWorkload.hpp b/src/backends/cl/workloads/ClSplitterWorkload.hpp index c59aa023bf..eaeeebe55f 100644 --- a/src/backends/cl/workloads/ClSplitterWorkload.hpp +++ b/src/backends/cl/workloads/ClSplitterWorkload.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/cl/workloads/ClStackWorkload.cpp b/src/backends/cl/workloads/ClStackWorkload.cpp index 75842a2b06..d239f00ed5 100644 --- a/src/backends/cl/workloads/ClStackWorkload.cpp +++ b/src/backends/cl/workloads/ClStackWorkload.cpp @@ -7,7 +7,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 <cl/ClTensorHandle.hpp> #include <cl/ClLayerSupport.hpp> diff --git a/src/backends/cl/workloads/ClStackWorkload.hpp b/src/backends/cl/workloads/ClStackWorkload.hpp index 3f1e642f60..a7aa84d624 100644 --- a/src/backends/cl/workloads/ClStackWorkload.hpp +++ b/src/backends/cl/workloads/ClStackWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backendsCommon/Workload.hpp> +#include <armnn/backends/Workload.hpp> #include <arm_compute/runtime/CL/functions/CLStackLayer.h> diff --git a/src/backends/cl/workloads/ClStridedSliceWorkload.cpp b/src/backends/cl/workloads/ClStridedSliceWorkload.cpp index b2e73cb684..cf8fc37456 100644 --- a/src/backends/cl/workloads/ClStridedSliceWorkload.cpp +++ b/src/backends/cl/workloads/ClStridedSliceWorkload.cpp @@ -10,7 +10,7 @@ #include <aclCommon/ArmComputeUtils.hpp> #include <aclCommon/ArmComputeTensorUtils.hpp> -#include <backendsCommon/TensorHandle.hpp> +#include <armnn/backends/TensorHandle.hpp> #include <backendsCommon/WorkloadUtils.hpp> #include <armnn/utility/NumericCast.hpp> diff --git a/src/backends/cl/workloads/ClStridedSliceWorkload.hpp b/src/backends/cl/workloads/ClStridedSliceWorkload.hpp index 1229599847..1cd5a1df17 100644 --- a/src/backends/cl/workloads/ClStridedSliceWorkload.hpp +++ b/src/backends/cl/workloads/ClStridedSliceWorkload.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/CL/functions/CLStridedSlice.h> diff --git a/src/backends/cl/workloads/ClSubtractionWorkload.cpp b/src/backends/cl/workloads/ClSubtractionWorkload.cpp index 797763d381..3766c05a2b 100644 --- a/src/backends/cl/workloads/ClSubtractionWorkload.cpp +++ b/src/backends/cl/workloads/ClSubtractionWorkload.cpp @@ -6,7 +6,7 @@ #include "ClSubtractionWorkload.hpp" #include <cl/ClTensorHandle.hpp> -#include <backendsCommon/TensorHandle.hpp> +#include <armnn/backends/TensorHandle.hpp> #include <aclCommon/ArmComputeUtils.hpp> #include <aclCommon/ArmComputeTensorUtils.hpp> diff --git a/src/backends/cl/workloads/ClSubtractionWorkload.hpp b/src/backends/cl/workloads/ClSubtractionWorkload.hpp index 28440b0938..7107bcc035 100644 --- a/src/backends/cl/workloads/ClSubtractionWorkload.hpp +++ b/src/backends/cl/workloads/ClSubtractionWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backendsCommon/Workload.hpp> +#include <armnn/backends/Workload.hpp> #include <arm_compute/runtime/CL/functions/CLElementwiseOperations.h> diff --git a/src/backends/cl/workloads/ClTransposeConvolution2dWorkload.cpp b/src/backends/cl/workloads/ClTransposeConvolution2dWorkload.cpp index 9277bb0b19..385bece6fb 100644 --- a/src/backends/cl/workloads/ClTransposeConvolution2dWorkload.cpp +++ b/src/backends/cl/workloads/ClTransposeConvolution2dWorkload.cpp @@ -14,7 +14,7 @@ #include <aclCommon/ArmComputeUtils.hpp> #include <aclCommon/ArmComputeTensorUtils.hpp> -#include <backendsCommon/TensorHandle.hpp> +#include <armnn/backends/TensorHandle.hpp> #include <arm_compute/runtime/CL/functions/CLDeconvolutionLayer.h> diff --git a/src/backends/cl/workloads/ClTransposeConvolution2dWorkload.hpp b/src/backends/cl/workloads/ClTransposeConvolution2dWorkload.hpp index 8a24e6d391..c0ba8139fd 100644 --- a/src/backends/cl/workloads/ClTransposeConvolution2dWorkload.hpp +++ b/src/backends/cl/workloads/ClTransposeConvolution2dWorkload.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/CL/functions/CLDeconvolutionLayer.h> #include <arm_compute/runtime/MemoryManagerOnDemand.h> diff --git a/src/backends/cl/workloads/ClTransposeWorkload.hpp b/src/backends/cl/workloads/ClTransposeWorkload.hpp index 4677bdc3f5..8186cac52e 100644 --- a/src/backends/cl/workloads/ClTransposeWorkload.hpp +++ b/src/backends/cl/workloads/ClTransposeWorkload.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 <armnn/TypesUtils.hpp> #include <arm_compute/runtime/CL/functions/CLPermute.h> diff --git a/src/backends/cl/workloads/ClWorkloadUtils.hpp b/src/backends/cl/workloads/ClWorkloadUtils.hpp index 7d378fc656..16f6c6156d 100644 --- a/src/backends/cl/workloads/ClWorkloadUtils.hpp +++ b/src/backends/cl/workloads/ClWorkloadUtils.hpp @@ -8,7 +8,7 @@ #include <aclCommon/ArmComputeTensorUtils.hpp> #include <cl/OpenClTimer.hpp> -#include <backendsCommon/TensorHandle.hpp> +#include <armnn/backends/TensorHandle.hpp> #include <armnn/Utils.hpp> |