diff options
Diffstat (limited to 'src/backends/neon')
58 files changed, 139 insertions, 139 deletions
diff --git a/src/backends/neon/CMakeLists.txt b/src/backends/neon/CMakeLists.txt index b5e6ff33f5..0f7759d7e2 100644 --- a/src/backends/neon/CMakeLists.txt +++ b/src/backends/neon/CMakeLists.txt @@ -30,7 +30,7 @@ if(ARMCOMPUTENEON) endif() add_library(armnnNeonBackend OBJECT ${armnnNeonBackend_sources}) -target_include_directories(armnnNeonBackend PRIVATE ${PROJECT_SOURCE_DIR}/src) target_include_directories(armnnNeonBackend PRIVATE ${PROJECT_SOURCE_DIR}/src/armnn) target_include_directories(armnnNeonBackend PRIVATE ${PROJECT_SOURCE_DIR}/src/armnnUtils) +target_include_directories(armnnNeonBackend PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) diff --git a/src/backends/neon/NeonBackend.cpp b/src/backends/neon/NeonBackend.cpp index f8d7bb0785..1e9f633a21 100644 --- a/src/backends/neon/NeonBackend.cpp +++ b/src/backends/neon/NeonBackend.cpp @@ -7,7 +7,7 @@ #include "NeonBackendId.hpp" #include "NeonWorkloadFactory.hpp" -#include <backends/BackendRegistry.hpp> +#include <backendsCommon/BackendRegistry.hpp> namespace armnn { diff --git a/src/backends/neon/NeonBackend.hpp b/src/backends/neon/NeonBackend.hpp index d74962be91..27ad94db34 100644 --- a/src/backends/neon/NeonBackend.hpp +++ b/src/backends/neon/NeonBackend.hpp @@ -4,7 +4,7 @@ // #pragma once -#include <backends/IBackendInternal.hpp> +#include <backendsCommon/IBackendInternal.hpp> namespace armnn { diff --git a/src/backends/neon/NeonLayerSupport.cpp b/src/backends/neon/NeonLayerSupport.cpp index 71a5be3b17..4704135540 100644 --- a/src/backends/neon/NeonLayerSupport.cpp +++ b/src/backends/neon/NeonLayerSupport.cpp @@ -7,12 +7,12 @@ #include "NeonBackendId.hpp" #include <armnn/Descriptors.hpp> -#include <armnn/InternalTypes.hpp> -#include <armnn/LayerSupportCommon.hpp> +#include <InternalTypes.hpp> +#include <LayerSupportCommon.hpp> #include <armnn/Tensor.hpp> #include <armnn/Types.hpp> -#include <backends/LayerSupportRegistry.hpp> +#include <backendsCommon/LayerSupportRegistry.hpp> #include <boost/core/ignore_unused.hpp> diff --git a/src/backends/neon/NeonTensorHandle.hpp b/src/backends/neon/NeonTensorHandle.hpp index 655427859b..63e2a781d6 100644 --- a/src/backends/neon/NeonTensorHandle.hpp +++ b/src/backends/neon/NeonTensorHandle.hpp @@ -4,8 +4,8 @@ // #pragma once -#include <backends/OutputHandler.hpp> -#include <backends/aclCommon/ArmComputeTensorUtils.hpp> +#include <backendsCommon/OutputHandler.hpp> +#include <aclCommon/ArmComputeTensorUtils.hpp> #include <arm_compute/runtime/MemoryGroup.h> #include <arm_compute/runtime/IMemoryGroup.h> diff --git a/src/backends/neon/NeonWorkloadFactory.cpp b/src/backends/neon/NeonWorkloadFactory.cpp index 81d088b5aa..fc3890684d 100644 --- a/src/backends/neon/NeonWorkloadFactory.cpp +++ b/src/backends/neon/NeonWorkloadFactory.cpp @@ -5,21 +5,21 @@ #include "NeonWorkloadFactory.hpp" #include "NeonBackendId.hpp" #include <armnn/Utils.hpp> -#include <backends/CpuTensorHandle.hpp> +#include <backendsCommon/CpuTensorHandle.hpp> #include <Layer.hpp> #ifdef ARMCOMPUTENEON_ENABLED #include <arm_compute/runtime/Allocator.h> -#include <backends/MemCopyWorkload.hpp> +#include <backendsCommon/MemCopyWorkload.hpp> #include "NeonTensorHandle.hpp" #include "workloads/NeonWorkloadUtils.hpp" #include "workloads/NeonWorkloads.hpp" -#include <backends/aclCommon/memory/IPoolManager.hpp> +#include <aclCommon/memory/IPoolManager.hpp> #endif -#include <backends/MakeWorkloadHelper.hpp> +#include <backendsCommon/MakeWorkloadHelper.hpp> #include <boost/polymorphic_cast.hpp> diff --git a/src/backends/neon/NeonWorkloadFactory.hpp b/src/backends/neon/NeonWorkloadFactory.hpp index da83693a35..abcd033f7d 100644 --- a/src/backends/neon/NeonWorkloadFactory.hpp +++ b/src/backends/neon/NeonWorkloadFactory.hpp @@ -5,8 +5,8 @@ #pragma once #include <armnn/Optional.hpp> -#include <backends/OutputHandler.hpp> -#include <backends/aclCommon/memory/BaseMemoryManager.hpp> +#include <backendsCommon/OutputHandler.hpp> +#include <aclCommon/memory/BaseMemoryManager.hpp> #include <boost/core/ignore_unused.hpp> diff --git a/src/backends/neon/test/CMakeLists.txt b/src/backends/neon/test/CMakeLists.txt index 999bd4f339..a1ac1e0049 100644 --- a/src/backends/neon/test/CMakeLists.txt +++ b/src/backends/neon/test/CMakeLists.txt @@ -16,6 +16,6 @@ list(APPEND armnnNeonBackendUnitTests_sources ) add_library(armnnNeonBackendUnitTests OBJECT ${armnnNeonBackendUnitTests_sources}) -target_include_directories(armnnNeonBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src) target_include_directories(armnnNeonBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/armnn) target_include_directories(armnnNeonBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/armnnUtils) +target_include_directories(armnnNeonBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) diff --git a/src/backends/neon/test/NeonCreateWorkloadTests.cpp b/src/backends/neon/test/NeonCreateWorkloadTests.cpp index 8d5574c6a7..5cd305c8ac 100644 --- a/src/backends/neon/test/NeonCreateWorkloadTests.cpp +++ b/src/backends/neon/test/NeonCreateWorkloadTests.cpp @@ -3,14 +3,14 @@ // SPDX-License-Identifier: MIT // -#include <backends/MemCopyWorkload.hpp> +#include <backendsCommon/MemCopyWorkload.hpp> -#include <backends/aclCommon/test/CreateWorkloadClNeon.hpp> +#include <aclCommon/test/CreateWorkloadClNeon.hpp> -#include <backends/neon/NeonWorkloadFactory.hpp> -#include <backends/neon/NeonTensorHandle.hpp> -#include <backends/neon/workloads/NeonWorkloadUtils.hpp> -#include <backends/neon/workloads/NeonWorkloads.hpp> +#include <neon/NeonWorkloadFactory.hpp> +#include <neon/NeonTensorHandle.hpp> +#include <neon/workloads/NeonWorkloadUtils.hpp> +#include <neon/workloads/NeonWorkloads.hpp> BOOST_AUTO_TEST_SUITE(CreateWorkloadNeon) diff --git a/src/backends/neon/test/NeonEndToEndTests.cpp b/src/backends/neon/test/NeonEndToEndTests.cpp index f9aa8a5df5..3b7e30925e 100644 --- a/src/backends/neon/test/NeonEndToEndTests.cpp +++ b/src/backends/neon/test/NeonEndToEndTests.cpp @@ -3,7 +3,7 @@ // SPDX-License-Identifier: MIT // -#include <backends/test/EndToEndTestImpl.hpp> +#include <backendsCommon/test/EndToEndTestImpl.hpp> #include <boost/test/unit_test.hpp> diff --git a/src/backends/neon/test/NeonJsonPrinterTests.cpp b/src/backends/neon/test/NeonJsonPrinterTests.cpp index 6213c145ba..24cfefa5c7 100644 --- a/src/backends/neon/test/NeonJsonPrinterTests.cpp +++ b/src/backends/neon/test/NeonJsonPrinterTests.cpp @@ -5,7 +5,7 @@ #include <armnn/BackendId.hpp> -#include <backends/test/JsonPrinterTestImpl.hpp> +#include <backendsCommon/test/JsonPrinterTestImpl.hpp> #include <boost/test/unit_test.hpp> diff --git a/src/backends/neon/test/NeonLayerSupportTests.cpp b/src/backends/neon/test/NeonLayerSupportTests.cpp index db7897fc28..893f11ebf3 100644 --- a/src/backends/neon/test/NeonLayerSupportTests.cpp +++ b/src/backends/neon/test/NeonLayerSupportTests.cpp @@ -3,14 +3,14 @@ // SPDX-License-Identifier: MIT // -#include <armnn/layers/ConvertFp16ToFp32Layer.hpp> -#include <armnn/layers/ConvertFp32ToFp16Layer.hpp> -#include <armnn/test/TensorHelpers.hpp> - -#include <backends/CpuTensorHandle.hpp> -#include <backends/neon/NeonWorkloadFactory.hpp> -#include <backends/test/IsLayerSupportedTestImpl.hpp> -#include <backends/test/LayerTests.hpp> +#include <layers/ConvertFp16ToFp32Layer.hpp> +#include <layers/ConvertFp32ToFp16Layer.hpp> +#include <test/TensorHelpers.hpp> + +#include <backendsCommon/CpuTensorHandle.hpp> +#include <neon/NeonWorkloadFactory.hpp> +#include <backendsCommon/test/IsLayerSupportedTestImpl.hpp> +#include <backendsCommon/test/LayerTests.hpp> #include <boost/test/unit_test.hpp> diff --git a/src/backends/neon/test/NeonLayerTests.cpp b/src/backends/neon/test/NeonLayerTests.cpp index 53dad94099..4a1c5f9836 100644 --- a/src/backends/neon/test/NeonLayerTests.cpp +++ b/src/backends/neon/test/NeonLayerTests.cpp @@ -3,17 +3,17 @@ // SPDX-License-Identifier: MIT // -#include <armnn/test/TensorHelpers.hpp> -#include <armnn/test/UnitTests.hpp> - -#include <backends/CpuTensorHandle.hpp> -#include <backends/neon/NeonLayerSupport.hpp> -#include <backends/neon/NeonWorkloadFactory.hpp> -#include <backends/reference/RefWorkloadFactory.hpp> -#include <backends/test/ActivationFixture.hpp> -#include <backends/test/LayerTests.hpp> -#include <backends/test/TensorCopyUtils.hpp> -#include <backends/test/WorkloadTestUtils.hpp> +#include <test/TensorHelpers.hpp> +#include <test/UnitTests.hpp> + +#include <backendsCommon/CpuTensorHandle.hpp> +#include <neon/NeonLayerSupport.hpp> +#include <neon/NeonWorkloadFactory.hpp> +#include <reference/RefWorkloadFactory.hpp> +#include <backendsCommon/test/ActivationFixture.hpp> +#include <backendsCommon/test/LayerTests.hpp> +#include <backendsCommon/test/TensorCopyUtils.hpp> +#include <backendsCommon/test/WorkloadTestUtils.hpp> #include <boost/test/unit_test.hpp> diff --git a/src/backends/neon/test/NeonMemCopyTests.cpp b/src/backends/neon/test/NeonMemCopyTests.cpp index 2b96d7c578..a37a07e869 100644 --- a/src/backends/neon/test/NeonMemCopyTests.cpp +++ b/src/backends/neon/test/NeonMemCopyTests.cpp @@ -3,9 +3,9 @@ // SPDX-License-Identifier: MIT // -#include <backends/neon/NeonWorkloadFactory.hpp> -#include <backends/reference/RefWorkloadFactory.hpp> -#include <backends/aclCommon/test/MemCopyTestImpl.hpp> +#include <neon/NeonWorkloadFactory.hpp> +#include <reference/RefWorkloadFactory.hpp> +#include <aclCommon/test/MemCopyTestImpl.hpp> #include <boost/test/unit_test.hpp> diff --git a/src/backends/neon/test/NeonOptimizedNetworkTests.cpp b/src/backends/neon/test/NeonOptimizedNetworkTests.cpp index ae657ba770..3bf1eb8caa 100644 --- a/src/backends/neon/test/NeonOptimizedNetworkTests.cpp +++ b/src/backends/neon/test/NeonOptimizedNetworkTests.cpp @@ -4,10 +4,10 @@ // #include <armnn/ArmNN.hpp> -#include <armnn/Graph.hpp> -#include <armnn/Network.hpp> +#include <Graph.hpp> +#include <Network.hpp> -#include <backends/neon/NeonWorkloadFactory.hpp> +#include <neon/NeonWorkloadFactory.hpp> #include <boost/test/unit_test.hpp> diff --git a/src/backends/neon/test/NeonRuntimeTests.cpp b/src/backends/neon/test/NeonRuntimeTests.cpp index 6e6b1e9148..129cd1afe3 100644 --- a/src/backends/neon/test/NeonRuntimeTests.cpp +++ b/src/backends/neon/test/NeonRuntimeTests.cpp @@ -3,11 +3,11 @@ // SPDX-License-Identifier: MIT // -#include <armnn/test/RuntimeTests.hpp> +#include <test/RuntimeTests.hpp> -#include <armnnUtils/LeakChecking.hpp> +#include <LeakChecking.hpp> -#include <backends/test/RuntimeTestImpl.hpp> +#include <backendsCommon/test/RuntimeTestImpl.hpp> #include <boost/test/unit_test.hpp> diff --git a/src/backends/neon/test/NeonTimerTest.cpp b/src/backends/neon/test/NeonTimerTest.cpp index 06f19c6ec3..11b319a5ff 100644 --- a/src/backends/neon/test/NeonTimerTest.cpp +++ b/src/backends/neon/test/NeonTimerTest.cpp @@ -5,17 +5,17 @@ #include <armnn/ArmNN.hpp> -#include <armnn/test/TensorHelpers.hpp> +#include <test/TensorHelpers.hpp> -#include <backends/CpuTensorHandle.hpp> -#include <backends/WorkloadFactory.hpp> +#include <backendsCommon/CpuTensorHandle.hpp> +#include <backendsCommon/WorkloadFactory.hpp> -#include <backends/neon/NeonTimer.hpp> -#include <backends/neon/NeonWorkloadFactory.hpp> +#include <neon/NeonTimer.hpp> +#include <neon/NeonWorkloadFactory.hpp> -#include <backends/test/LayerTests.hpp> -#include <backends/test/TensorCopyUtils.hpp> -#include <backends/test/WorkloadTestUtils.hpp> +#include <backendsCommon/test/LayerTests.hpp> +#include <backendsCommon/test/TensorCopyUtils.hpp> +#include <backendsCommon/test/WorkloadTestUtils.hpp> #include <boost/test/unit_test.hpp> diff --git a/src/backends/neon/workloads/CMakeLists.txt b/src/backends/neon/workloads/CMakeLists.txt index cf47d66656..f6e8d1c04a 100644 --- a/src/backends/neon/workloads/CMakeLists.txt +++ b/src/backends/neon/workloads/CMakeLists.txt @@ -53,6 +53,6 @@ list(APPEND armnnNeonBackendWorkloads_sources ) add_library(armnnNeonBackendWorkloads OBJECT ${armnnNeonBackendWorkloads_sources}) -target_include_directories(armnnNeonBackendWorkloads PRIVATE ${PROJECT_SOURCE_DIR}/src) target_include_directories(armnnNeonBackendWorkloads PRIVATE ${PROJECT_SOURCE_DIR}/src/armnn) target_include_directories(armnnNeonBackendWorkloads PRIVATE ${PROJECT_SOURCE_DIR}/src/armnnUtils) +target_include_directories(armnnNeonBackendWorkloads PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) diff --git a/src/backends/neon/workloads/NeonActivationWorkload.cpp b/src/backends/neon/workloads/NeonActivationWorkload.cpp index c1c240f65f..6e95678d13 100644 --- a/src/backends/neon/workloads/NeonActivationWorkload.cpp +++ b/src/backends/neon/workloads/NeonActivationWorkload.cpp @@ -4,7 +4,7 @@ // #include "NeonActivationWorkload.hpp" -#include <backends/aclCommon/ArmComputeUtils.hpp> +#include <aclCommon/ArmComputeUtils.hpp> namespace armnn { diff --git a/src/backends/neon/workloads/NeonActivationWorkload.hpp b/src/backends/neon/workloads/NeonActivationWorkload.hpp index b120f94bdc..fc7c6467dc 100644 --- a/src/backends/neon/workloads/NeonActivationWorkload.hpp +++ b/src/backends/neon/workloads/NeonActivationWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backends/neon/workloads/NeonWorkloadUtils.hpp> +#include <neon/workloads/NeonWorkloadUtils.hpp> namespace armnn { diff --git a/src/backends/neon/workloads/NeonAdditionFloatWorkload.cpp b/src/backends/neon/workloads/NeonAdditionFloatWorkload.cpp index 445e32ea44..45de4ddc1a 100644 --- a/src/backends/neon/workloads/NeonAdditionFloatWorkload.cpp +++ b/src/backends/neon/workloads/NeonAdditionFloatWorkload.cpp @@ -4,8 +4,8 @@ // #include "NeonAdditionFloatWorkload.hpp" -#include <backends/aclCommon/ArmComputeTensorUtils.hpp> -#include <backends/CpuTensorHandle.hpp> +#include <aclCommon/ArmComputeTensorUtils.hpp> +#include <backendsCommon/CpuTensorHandle.hpp> namespace armnn { diff --git a/src/backends/neon/workloads/NeonAdditionFloatWorkload.hpp b/src/backends/neon/workloads/NeonAdditionFloatWorkload.hpp index 769492e949..1eab6663a6 100644 --- a/src/backends/neon/workloads/NeonAdditionFloatWorkload.hpp +++ b/src/backends/neon/workloads/NeonAdditionFloatWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backends/neon/workloads/NeonWorkloadUtils.hpp> +#include <neon/workloads/NeonWorkloadUtils.hpp> namespace armnn { diff --git a/src/backends/neon/workloads/NeonBatchNormalizationFloatWorkload.cpp b/src/backends/neon/workloads/NeonBatchNormalizationFloatWorkload.cpp index 95cfdce9b4..e576c64752 100644 --- a/src/backends/neon/workloads/NeonBatchNormalizationFloatWorkload.cpp +++ b/src/backends/neon/workloads/NeonBatchNormalizationFloatWorkload.cpp @@ -4,8 +4,8 @@ // #include "NeonBatchNormalizationFloatWorkload.hpp" -#include <backends/CpuTensorHandle.hpp> -#include <backends/aclCommon/ArmComputeTensorUtils.hpp> +#include <backendsCommon/CpuTensorHandle.hpp> +#include <aclCommon/ArmComputeTensorUtils.hpp> #include <armnn/ArmNN.hpp> namespace armnn diff --git a/src/backends/neon/workloads/NeonBatchNormalizationFloatWorkload.hpp b/src/backends/neon/workloads/NeonBatchNormalizationFloatWorkload.hpp index 59c7404c44..a6289bd900 100644 --- a/src/backends/neon/workloads/NeonBatchNormalizationFloatWorkload.hpp +++ b/src/backends/neon/workloads/NeonBatchNormalizationFloatWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backends/neon/workloads/NeonWorkloadUtils.hpp> +#include <neon/workloads/NeonWorkloadUtils.hpp> namespace armnn { diff --git a/src/backends/neon/workloads/NeonConstantWorkload.cpp b/src/backends/neon/workloads/NeonConstantWorkload.cpp index a3485471c8..08f0390e34 100644 --- a/src/backends/neon/workloads/NeonConstantWorkload.cpp +++ b/src/backends/neon/workloads/NeonConstantWorkload.cpp @@ -6,11 +6,11 @@ #include "NeonConstantWorkload.hpp" #include <arm_compute/core/Types.h> -#include <armnnUtils/Half.hpp> -#include <backends/aclCommon/ArmComputeTensorUtils.hpp> -#include <backends/neon/NeonTensorHandle.hpp> -#include <backends/CpuTensorHandle.hpp> -#include <backends/Workload.hpp> +#include <Half.hpp> +#include <aclCommon/ArmComputeTensorUtils.hpp> +#include <neon/NeonTensorHandle.hpp> +#include <backendsCommon/CpuTensorHandle.hpp> +#include <backendsCommon/Workload.hpp> #include <boost/cast.hpp> diff --git a/src/backends/neon/workloads/NeonConstantWorkload.hpp b/src/backends/neon/workloads/NeonConstantWorkload.hpp index 72069633f8..18c1547930 100644 --- a/src/backends/neon/workloads/NeonConstantWorkload.hpp +++ b/src/backends/neon/workloads/NeonConstantWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backends/neon/workloads/NeonWorkloadUtils.hpp> +#include <neon/workloads/NeonWorkloadUtils.hpp> namespace armnn { diff --git a/src/backends/neon/workloads/NeonConvertFp16ToFp32Workload.cpp b/src/backends/neon/workloads/NeonConvertFp16ToFp32Workload.cpp index c8a3f27352..a86b1086dc 100644 --- a/src/backends/neon/workloads/NeonConvertFp16ToFp32Workload.cpp +++ b/src/backends/neon/workloads/NeonConvertFp16ToFp32Workload.cpp @@ -6,8 +6,8 @@ #include "NeonConvertFp16ToFp32Workload.hpp" #include <FloatingPointConverter.hpp> -#include <armnnUtils/Half.hpp> -#include <backends/WorkloadUtils.hpp> +#include <Half.hpp> +#include <backendsCommon/WorkloadUtils.hpp> namespace armnn { diff --git a/src/backends/neon/workloads/NeonConvertFp16ToFp32Workload.hpp b/src/backends/neon/workloads/NeonConvertFp16ToFp32Workload.hpp index dcf6998c64..6db370174a 100644 --- a/src/backends/neon/workloads/NeonConvertFp16ToFp32Workload.hpp +++ b/src/backends/neon/workloads/NeonConvertFp16ToFp32Workload.hpp @@ -5,9 +5,9 @@ #pragma once -#include <backends/Workload.hpp> -#include <backends/WorkloadData.hpp> -#include <backends/neon/workloads/NeonWorkloadUtils.hpp> +#include <backendsCommon/Workload.hpp> +#include <backendsCommon/WorkloadData.hpp> +#include <neon/workloads/NeonWorkloadUtils.hpp> namespace armnn { diff --git a/src/backends/neon/workloads/NeonConvertFp32ToFp16Workload.cpp b/src/backends/neon/workloads/NeonConvertFp32ToFp16Workload.cpp index 6bcf6e082c..4b6f97bb78 100644 --- a/src/backends/neon/workloads/NeonConvertFp32ToFp16Workload.cpp +++ b/src/backends/neon/workloads/NeonConvertFp32ToFp16Workload.cpp @@ -5,10 +5,10 @@ #include "NeonConvertFp32ToFp16Workload.hpp" -#include <armnnUtils/Half.hpp> +#include <Half.hpp> #include <FloatingPointConverter.hpp> #include <Profiling.hpp> -#include <backends/WorkloadUtils.hpp> +#include <backendsCommon/WorkloadUtils.hpp> namespace armnn { diff --git a/src/backends/neon/workloads/NeonConvertFp32ToFp16Workload.hpp b/src/backends/neon/workloads/NeonConvertFp32ToFp16Workload.hpp index b819a8c542..3b8f33b791 100644 --- a/src/backends/neon/workloads/NeonConvertFp32ToFp16Workload.hpp +++ b/src/backends/neon/workloads/NeonConvertFp32ToFp16Workload.hpp @@ -5,9 +5,9 @@ #pragma once -#include <backends/Workload.hpp> -#include <backends/WorkloadData.hpp> -#include <backends/neon/workloads/NeonWorkloadUtils.hpp> +#include <backendsCommon/Workload.hpp> +#include <backendsCommon/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 c26cdea92b..781c91a8f3 100644 --- a/src/backends/neon/workloads/NeonConvolution2dWorkload.cpp +++ b/src/backends/neon/workloads/NeonConvolution2dWorkload.cpp @@ -5,12 +5,12 @@ #include "NeonConvolution2dWorkload.hpp" -#include <backends/CpuTensorHandle.hpp> -#include <backends/aclCommon/ArmComputeTensorUtils.hpp> -#include <backends/neon/NeonLayerSupport.hpp> +#include <backendsCommon/CpuTensorHandle.hpp> +#include <aclCommon/ArmComputeTensorUtils.hpp> +#include <neon/NeonLayerSupport.hpp> #include <armnn/Types.hpp> -#include <armnnUtils/Half.hpp> +#include <Half.hpp> namespace armnn { diff --git a/src/backends/neon/workloads/NeonConvolution2dWorkload.hpp b/src/backends/neon/workloads/NeonConvolution2dWorkload.hpp index 573bb1a3e2..daf9a43fe4 100644 --- a/src/backends/neon/workloads/NeonConvolution2dWorkload.hpp +++ b/src/backends/neon/workloads/NeonConvolution2dWorkload.hpp @@ -5,11 +5,11 @@ #pragma once -#include <backends/aclCommon/ArmComputeTensorUtils.hpp> -#include <backends/CpuTensorHandle.hpp> -#include <backends/neon/NeonLayerSupport.hpp> -#include <backends/neon/workloads/NeonWorkloadUtils.hpp> -#include <backends/Workload.hpp> +#include <aclCommon/ArmComputeTensorUtils.hpp> +#include <backendsCommon/CpuTensorHandle.hpp> +#include <neon/NeonLayerSupport.hpp> +#include <neon/workloads/NeonWorkloadUtils.hpp> +#include <backendsCommon/Workload.hpp> #include <arm_compute/runtime/MemoryManagerOnDemand.h> diff --git a/src/backends/neon/workloads/NeonDepthwiseConvolutionWorkload.cpp b/src/backends/neon/workloads/NeonDepthwiseConvolutionWorkload.cpp index 8b1feaa93c..1b4887e0e0 100644 --- a/src/backends/neon/workloads/NeonDepthwiseConvolutionWorkload.cpp +++ b/src/backends/neon/workloads/NeonDepthwiseConvolutionWorkload.cpp @@ -5,9 +5,9 @@ #include "NeonDepthwiseConvolutionWorkload.hpp" -#include <backends/aclCommon/ArmComputeTensorUtils.hpp> -#include <backends/neon/NeonLayerSupport.hpp> -#include <backends/CpuTensorHandle.hpp> +#include <aclCommon/ArmComputeTensorUtils.hpp> +#include <neon/NeonLayerSupport.hpp> +#include <backendsCommon/CpuTensorHandle.hpp> namespace armnn { diff --git a/src/backends/neon/workloads/NeonDepthwiseConvolutionWorkload.hpp b/src/backends/neon/workloads/NeonDepthwiseConvolutionWorkload.hpp index fb93fe8ea0..b5f2ae9223 100644 --- a/src/backends/neon/workloads/NeonDepthwiseConvolutionWorkload.hpp +++ b/src/backends/neon/workloads/NeonDepthwiseConvolutionWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backends/neon/workloads/NeonWorkloadUtils.hpp> +#include <neon/workloads/NeonWorkloadUtils.hpp> namespace armnn { diff --git a/src/backends/neon/workloads/NeonFloorFloatWorkload.hpp b/src/backends/neon/workloads/NeonFloorFloatWorkload.hpp index 478aa94ca4..a4ce47663c 100644 --- a/src/backends/neon/workloads/NeonFloorFloatWorkload.hpp +++ b/src/backends/neon/workloads/NeonFloorFloatWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backends/neon/workloads/NeonWorkloadUtils.hpp> +#include <neon/workloads/NeonWorkloadUtils.hpp> namespace armnn { diff --git a/src/backends/neon/workloads/NeonFullyConnectedWorkload.cpp b/src/backends/neon/workloads/NeonFullyConnectedWorkload.cpp index 51fd7af362..e432a6b833 100644 --- a/src/backends/neon/workloads/NeonFullyConnectedWorkload.cpp +++ b/src/backends/neon/workloads/NeonFullyConnectedWorkload.cpp @@ -5,9 +5,9 @@ #include "NeonFullyConnectedWorkload.hpp" -#include <backends/aclCommon/ArmComputeTensorUtils.hpp> -#include <backends/aclCommon/ArmComputeUtils.hpp> -#include <backends/CpuTensorHandle.hpp> +#include <aclCommon/ArmComputeTensorUtils.hpp> +#include <aclCommon/ArmComputeUtils.hpp> +#include <backendsCommon/CpuTensorHandle.hpp> namespace armnn { diff --git a/src/backends/neon/workloads/NeonFullyConnectedWorkload.hpp b/src/backends/neon/workloads/NeonFullyConnectedWorkload.hpp index 9ffac96a86..ec1661d642 100644 --- a/src/backends/neon/workloads/NeonFullyConnectedWorkload.hpp +++ b/src/backends/neon/workloads/NeonFullyConnectedWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backends/neon/workloads/NeonWorkloadUtils.hpp> +#include <neon/workloads/NeonWorkloadUtils.hpp> #include <arm_compute/runtime/MemoryManagerOnDemand.h> diff --git a/src/backends/neon/workloads/NeonL2NormalizationFloatWorkload.cpp b/src/backends/neon/workloads/NeonL2NormalizationFloatWorkload.cpp index 17c39bc8ad..754155d182 100644 --- a/src/backends/neon/workloads/NeonL2NormalizationFloatWorkload.cpp +++ b/src/backends/neon/workloads/NeonL2NormalizationFloatWorkload.cpp @@ -4,7 +4,7 @@ // #include "NeonL2NormalizationFloatWorkload.hpp" -#include <backends/aclCommon/ArmComputeUtils.hpp> +#include <aclCommon/ArmComputeUtils.hpp> namespace armnn { diff --git a/src/backends/neon/workloads/NeonL2NormalizationFloatWorkload.hpp b/src/backends/neon/workloads/NeonL2NormalizationFloatWorkload.hpp index 70ab385493..35d0282414 100644 --- a/src/backends/neon/workloads/NeonL2NormalizationFloatWorkload.hpp +++ b/src/backends/neon/workloads/NeonL2NormalizationFloatWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backends/neon/workloads/NeonWorkloadUtils.hpp> +#include <neon/workloads/NeonWorkloadUtils.hpp> #include <arm_compute/runtime/MemoryManagerOnDemand.h> #include <memory> diff --git a/src/backends/neon/workloads/NeonLstmFloatWorkload.cpp b/src/backends/neon/workloads/NeonLstmFloatWorkload.cpp index 7745cec89b..d03454b705 100644 --- a/src/backends/neon/workloads/NeonLstmFloatWorkload.cpp +++ b/src/backends/neon/workloads/NeonLstmFloatWorkload.cpp @@ -6,9 +6,9 @@ #include "NeonLstmFloatWorkload.hpp" #include "NeonWorkloadUtils.hpp" -#include "backends/CpuTensorHandle.hpp" -#include "backends/aclCommon/ArmComputeTensorUtils.hpp" -#include "backends/neon/NeonTensorHandle.hpp" +#include "backendsCommon/CpuTensorHandle.hpp" +#include "aclCommon/ArmComputeTensorUtils.hpp" +#include "neon/NeonTensorHandle.hpp" namespace armnn { diff --git a/src/backends/neon/workloads/NeonLstmFloatWorkload.hpp b/src/backends/neon/workloads/NeonLstmFloatWorkload.hpp index d21462bf83..f87f24d88a 100644 --- a/src/backends/neon/workloads/NeonLstmFloatWorkload.hpp +++ b/src/backends/neon/workloads/NeonLstmFloatWorkload.hpp @@ -5,8 +5,8 @@ #pragma once -#include <backends/Workload.hpp> -#include <backends/WorkloadData.hpp> +#include <backendsCommon/Workload.hpp> +#include <backendsCommon/WorkloadData.hpp> #include "arm_compute/graph/Tensor.h" #include "arm_compute/runtime/NEON/functions/NELSTMLayer.h" diff --git a/src/backends/neon/workloads/NeonMergerWorkload.hpp b/src/backends/neon/workloads/NeonMergerWorkload.hpp index ce7241d3b6..7103d8a469 100644 --- a/src/backends/neon/workloads/NeonMergerWorkload.hpp +++ b/src/backends/neon/workloads/NeonMergerWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backends/Workload.hpp> +#include <backendsCommon/Workload.hpp> namespace armnn { diff --git a/src/backends/neon/workloads/NeonMultiplicationFloatWorkload.hpp b/src/backends/neon/workloads/NeonMultiplicationFloatWorkload.hpp index 0a99c8cedc..8fa3171110 100644 --- a/src/backends/neon/workloads/NeonMultiplicationFloatWorkload.hpp +++ b/src/backends/neon/workloads/NeonMultiplicationFloatWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backends/neon/workloads/NeonWorkloadUtils.hpp> +#include <neon/workloads/NeonWorkloadUtils.hpp> namespace armnn { diff --git a/src/backends/neon/workloads/NeonNormalizationFloatWorkload.cpp b/src/backends/neon/workloads/NeonNormalizationFloatWorkload.cpp index 1894048788..854ecd3c59 100644 --- a/src/backends/neon/workloads/NeonNormalizationFloatWorkload.cpp +++ b/src/backends/neon/workloads/NeonNormalizationFloatWorkload.cpp @@ -4,9 +4,9 @@ // #include "NeonNormalizationFloatWorkload.hpp" -#include <backends/neon/NeonLayerSupport.hpp> -#include <backends/aclCommon/ArmComputeUtils.hpp> -#include <backends/aclCommon/ArmComputeTensorUtils.hpp> +#include <neon/NeonLayerSupport.hpp> +#include <aclCommon/ArmComputeUtils.hpp> +#include <aclCommon/ArmComputeTensorUtils.hpp> using namespace armnn::armcomputetensorutils; diff --git a/src/backends/neon/workloads/NeonNormalizationFloatWorkload.hpp b/src/backends/neon/workloads/NeonNormalizationFloatWorkload.hpp index c6f64c6c15..89eba573da 100644 --- a/src/backends/neon/workloads/NeonNormalizationFloatWorkload.hpp +++ b/src/backends/neon/workloads/NeonNormalizationFloatWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backends/neon/workloads/NeonWorkloadUtils.hpp> +#include <neon/workloads/NeonWorkloadUtils.hpp> #include <arm_compute/runtime/MemoryManagerOnDemand.h> namespace armnn diff --git a/src/backends/neon/workloads/NeonPermuteWorkload.cpp b/src/backends/neon/workloads/NeonPermuteWorkload.cpp index cf4e7910ee..d2e62eed39 100644 --- a/src/backends/neon/workloads/NeonPermuteWorkload.cpp +++ b/src/backends/neon/workloads/NeonPermuteWorkload.cpp @@ -4,8 +4,8 @@ // #include "NeonPermuteWorkload.hpp" -#include <backends/neon/NeonTensorHandle.hpp> -#include <backends/aclCommon/ArmComputeTensorUtils.hpp> +#include <neon/NeonTensorHandle.hpp> +#include <aclCommon/ArmComputeTensorUtils.hpp> #include <arm_compute/core/Error.h> diff --git a/src/backends/neon/workloads/NeonPermuteWorkload.hpp b/src/backends/neon/workloads/NeonPermuteWorkload.hpp index 299df80b76..37db490b95 100644 --- a/src/backends/neon/workloads/NeonPermuteWorkload.hpp +++ b/src/backends/neon/workloads/NeonPermuteWorkload.hpp @@ -5,9 +5,9 @@ #pragma once -#include <backends/Workload.hpp> -#include <backends/WorkloadData.hpp> -#include <backends/neon/workloads/NeonWorkloadUtils.hpp> +#include <backendsCommon/Workload.hpp> +#include <backendsCommon/WorkloadData.hpp> +#include <neon/workloads/NeonWorkloadUtils.hpp> #include <armnn/TypesUtils.hpp> #include <arm_compute/runtime/NEON/functions/NEPermute.h> diff --git a/src/backends/neon/workloads/NeonPooling2dWorkload.cpp b/src/backends/neon/workloads/NeonPooling2dWorkload.cpp index a4ed33b3fa..b8acf36028 100644 --- a/src/backends/neon/workloads/NeonPooling2dWorkload.cpp +++ b/src/backends/neon/workloads/NeonPooling2dWorkload.cpp @@ -4,10 +4,10 @@ // #include "NeonPooling2dWorkload.hpp" -#include <backends/neon/NeonLayerSupport.hpp> -#include <backends/neon/NeonTensorHandle.hpp> -#include <backends/aclCommon/ArmComputeUtils.hpp> -#include <backends/aclCommon/ArmComputeTensorUtils.hpp> +#include <neon/NeonLayerSupport.hpp> +#include <neon/NeonTensorHandle.hpp> +#include <aclCommon/ArmComputeUtils.hpp> +#include <aclCommon/ArmComputeTensorUtils.hpp> namespace armnn { diff --git a/src/backends/neon/workloads/NeonPooling2dWorkload.hpp b/src/backends/neon/workloads/NeonPooling2dWorkload.hpp index 848221cc6e..b2379f7f53 100644 --- a/src/backends/neon/workloads/NeonPooling2dWorkload.hpp +++ b/src/backends/neon/workloads/NeonPooling2dWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backends/neon/workloads/NeonWorkloadUtils.hpp> +#include <neon/workloads/NeonWorkloadUtils.hpp> namespace armnn { diff --git a/src/backends/neon/workloads/NeonReshapeWorkload.hpp b/src/backends/neon/workloads/NeonReshapeWorkload.hpp index 8fd278b2eb..38b6c510d2 100644 --- a/src/backends/neon/workloads/NeonReshapeWorkload.hpp +++ b/src/backends/neon/workloads/NeonReshapeWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backends/neon/workloads/NeonWorkloadUtils.hpp> +#include <neon/workloads/NeonWorkloadUtils.hpp> namespace armnn { diff --git a/src/backends/neon/workloads/NeonSoftmaxBaseWorkload.cpp b/src/backends/neon/workloads/NeonSoftmaxBaseWorkload.cpp index 0e11d8249f..b97cf84afd 100644 --- a/src/backends/neon/workloads/NeonSoftmaxBaseWorkload.cpp +++ b/src/backends/neon/workloads/NeonSoftmaxBaseWorkload.cpp @@ -5,7 +5,7 @@ #include "NeonSoftmaxBaseWorkload.hpp" -#include <backends/aclCommon/ArmComputeTensorUtils.hpp> +#include <aclCommon/ArmComputeTensorUtils.hpp> namespace armnn { diff --git a/src/backends/neon/workloads/NeonSoftmaxBaseWorkload.hpp b/src/backends/neon/workloads/NeonSoftmaxBaseWorkload.hpp index 446392cd03..6e96c2d2b4 100644 --- a/src/backends/neon/workloads/NeonSoftmaxBaseWorkload.hpp +++ b/src/backends/neon/workloads/NeonSoftmaxBaseWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backends/neon/workloads/NeonWorkloadUtils.hpp> +#include <neon/workloads/NeonWorkloadUtils.hpp> namespace armnn { diff --git a/src/backends/neon/workloads/NeonSoftmaxFloatWorkload.hpp b/src/backends/neon/workloads/NeonSoftmaxFloatWorkload.hpp index 83f29222eb..9c11b27bb5 100644 --- a/src/backends/neon/workloads/NeonSoftmaxFloatWorkload.hpp +++ b/src/backends/neon/workloads/NeonSoftmaxFloatWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backends/neon/workloads/NeonWorkloadUtils.hpp> +#include <neon/workloads/NeonWorkloadUtils.hpp> #include <arm_compute/runtime/MemoryManagerOnDemand.h> #include <memory> diff --git a/src/backends/neon/workloads/NeonSoftmaxUint8Workload.hpp b/src/backends/neon/workloads/NeonSoftmaxUint8Workload.hpp index 0d72514ec0..b3bcbf38b5 100644 --- a/src/backends/neon/workloads/NeonSoftmaxUint8Workload.hpp +++ b/src/backends/neon/workloads/NeonSoftmaxUint8Workload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backends/neon/workloads/NeonWorkloadUtils.hpp> +#include <neon/workloads/NeonWorkloadUtils.hpp> #include <arm_compute/runtime/MemoryManagerOnDemand.h> namespace armnn diff --git a/src/backends/neon/workloads/NeonSplitterWorkload.hpp b/src/backends/neon/workloads/NeonSplitterWorkload.hpp index 11c1767ea6..2a7ee193d0 100644 --- a/src/backends/neon/workloads/NeonSplitterWorkload.hpp +++ b/src/backends/neon/workloads/NeonSplitterWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backends/Workload.hpp> +#include <backendsCommon/Workload.hpp> namespace armnn { diff --git a/src/backends/neon/workloads/NeonSubtractionFloatWorkload.cpp b/src/backends/neon/workloads/NeonSubtractionFloatWorkload.cpp index 2acb829e3d..1eae0a49ce 100644 --- a/src/backends/neon/workloads/NeonSubtractionFloatWorkload.cpp +++ b/src/backends/neon/workloads/NeonSubtractionFloatWorkload.cpp @@ -4,8 +4,8 @@ // #include "NeonSubtractionFloatWorkload.hpp" -#include <backends/aclCommon/ArmComputeTensorUtils.hpp> -#include <backends/CpuTensorHandle.hpp> +#include <aclCommon/ArmComputeTensorUtils.hpp> +#include <backendsCommon/CpuTensorHandle.hpp> namespace armnn { diff --git a/src/backends/neon/workloads/NeonSubtractionFloatWorkload.hpp b/src/backends/neon/workloads/NeonSubtractionFloatWorkload.hpp index 98aeb4cfc5..09016993e0 100644 --- a/src/backends/neon/workloads/NeonSubtractionFloatWorkload.hpp +++ b/src/backends/neon/workloads/NeonSubtractionFloatWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backends/neon/workloads/NeonWorkloadUtils.hpp> +#include <neon/workloads/NeonWorkloadUtils.hpp> namespace armnn { diff --git a/src/backends/neon/workloads/NeonWorkloadUtils.hpp b/src/backends/neon/workloads/NeonWorkloadUtils.hpp index 48ec753546..17e14cdd99 100644 --- a/src/backends/neon/workloads/NeonWorkloadUtils.hpp +++ b/src/backends/neon/workloads/NeonWorkloadUtils.hpp @@ -4,11 +4,11 @@ // #pragma once -#include <backends/Workload.hpp> -#include <backends/aclCommon/ArmComputeTensorUtils.hpp> -#include <backends/neon/NeonTensorHandle.hpp> -#include <backends/neon/NeonTimer.hpp> -#include <backends/CpuTensorHandle.hpp> +#include <backendsCommon/Workload.hpp> +#include <aclCommon/ArmComputeTensorUtils.hpp> +#include <neon/NeonTensorHandle.hpp> +#include <neon/NeonTimer.hpp> +#include <backendsCommon/CpuTensorHandle.hpp> #include <arm_compute/runtime/NEON/NEFunctions.h> #include <Half.hpp> |