diff options
Diffstat (limited to 'src/backends/cl/workloads')
53 files changed, 108 insertions, 108 deletions
diff --git a/src/backends/cl/workloads/CMakeLists.txt b/src/backends/cl/workloads/CMakeLists.txt index 86c3804244..901dd748e4 100644 --- a/src/backends/cl/workloads/CMakeLists.txt +++ b/src/backends/cl/workloads/CMakeLists.txt @@ -61,6 +61,6 @@ list(APPEND armnnClBackendWorkloads_sources ) add_library(armnnClBackendWorkloads OBJECT ${armnnClBackendWorkloads_sources}) -target_include_directories(armnnClBackendWorkloads PRIVATE ${PROJECT_SOURCE_DIR}/src) target_include_directories(armnnClBackendWorkloads PRIVATE ${PROJECT_SOURCE_DIR}/src/armnn) target_include_directories(armnnClBackendWorkloads PRIVATE ${PROJECT_SOURCE_DIR}/src/armnnUtils) +target_include_directories(armnnClBackendWorkloads PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) diff --git a/src/backends/cl/workloads/ClActivationWorkload.cpp b/src/backends/cl/workloads/ClActivationWorkload.cpp index 188ad3283e..9b658569c1 100644 --- a/src/backends/cl/workloads/ClActivationWorkload.cpp +++ b/src/backends/cl/workloads/ClActivationWorkload.cpp @@ -7,10 +7,10 @@ #include "ClWorkloadUtils.hpp" -#include <backends/CpuTensorHandle.hpp> -#include <backends/cl/ClLayerSupport.hpp> -#include <backends/cl/ClTensorHandle.hpp> -#include <backends/aclCommon/ArmComputeUtils.hpp> +#include <backendsCommon/CpuTensorHandle.hpp> +#include <cl/ClLayerSupport.hpp> +#include <cl/ClTensorHandle.hpp> +#include <aclCommon/ArmComputeUtils.hpp> namespace armnn { diff --git a/src/backends/cl/workloads/ClActivationWorkload.hpp b/src/backends/cl/workloads/ClActivationWorkload.hpp index c1f6de2601..4fdd4977a0 100644 --- a/src/backends/cl/workloads/ClActivationWorkload.hpp +++ b/src/backends/cl/workloads/ClActivationWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backends/Workload.hpp> +#include <backendsCommon/Workload.hpp> #include <arm_compute/runtime/CL/CLFunctions.h> diff --git a/src/backends/cl/workloads/ClAdditionWorkload.cpp b/src/backends/cl/workloads/ClAdditionWorkload.cpp index 6ec207a956..18e2400ccd 100644 --- a/src/backends/cl/workloads/ClAdditionWorkload.cpp +++ b/src/backends/cl/workloads/ClAdditionWorkload.cpp @@ -5,9 +5,9 @@ #include "ClAdditionWorkload.hpp" -#include <backends/cl/ClTensorHandle.hpp> -#include <backends/CpuTensorHandle.hpp> -#include <backends/aclCommon/ArmComputeTensorUtils.hpp> +#include <cl/ClTensorHandle.hpp> +#include <backendsCommon/CpuTensorHandle.hpp> +#include <aclCommon/ArmComputeTensorUtils.hpp> #include "ClWorkloadUtils.hpp" diff --git a/src/backends/cl/workloads/ClAdditionWorkload.hpp b/src/backends/cl/workloads/ClAdditionWorkload.hpp index d165bd90f7..7a0228d0c8 100644 --- a/src/backends/cl/workloads/ClAdditionWorkload.hpp +++ b/src/backends/cl/workloads/ClAdditionWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backends/Workload.hpp> +#include <backendsCommon/Workload.hpp> #include <arm_compute/runtime/CL/CLFunctions.h> diff --git a/src/backends/cl/workloads/ClBatchNormalizationFloatWorkload.cpp b/src/backends/cl/workloads/ClBatchNormalizationFloatWorkload.cpp index 1f3f9b540a..c0f6cdfe6e 100644 --- a/src/backends/cl/workloads/ClBatchNormalizationFloatWorkload.cpp +++ b/src/backends/cl/workloads/ClBatchNormalizationFloatWorkload.cpp @@ -4,10 +4,10 @@ // #include "ClBatchNormalizationFloatWorkload.hpp" -#include <backends/cl/ClTensorHandle.hpp> -#include <backends/CpuTensorHandle.hpp> -#include <backends/aclCommon/ArmComputeTensorUtils.hpp> -#include <backends/cl/ClLayerSupport.hpp> +#include <cl/ClTensorHandle.hpp> +#include <backendsCommon/CpuTensorHandle.hpp> +#include <aclCommon/ArmComputeTensorUtils.hpp> +#include <cl/ClLayerSupport.hpp> #include "ClWorkloadUtils.hpp" diff --git a/src/backends/cl/workloads/ClBatchNormalizationFloatWorkload.hpp b/src/backends/cl/workloads/ClBatchNormalizationFloatWorkload.hpp index 804591c444..cdd679bea2 100644 --- a/src/backends/cl/workloads/ClBatchNormalizationFloatWorkload.hpp +++ b/src/backends/cl/workloads/ClBatchNormalizationFloatWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backends/Workload.hpp> +#include <backendsCommon/Workload.hpp> #include <arm_compute/runtime/CL/CLFunctions.h> diff --git a/src/backends/cl/workloads/ClConstantWorkload.cpp b/src/backends/cl/workloads/ClConstantWorkload.cpp index eee6dbdd55..39ae14eaf3 100644 --- a/src/backends/cl/workloads/ClConstantWorkload.cpp +++ b/src/backends/cl/workloads/ClConstantWorkload.cpp @@ -5,10 +5,10 @@ #include "ClConstantWorkload.hpp" -#include <armnnUtils/Half.hpp> -#include <backends/aclCommon/ArmComputeTensorUtils.hpp> -#include <backends/cl/ClTensorHandle.hpp> -#include <backends/CpuTensorHandle.hpp> +#include <Half.hpp> +#include <aclCommon/ArmComputeTensorUtils.hpp> +#include <cl/ClTensorHandle.hpp> +#include <backendsCommon/CpuTensorHandle.hpp> #include "ClWorkloadUtils.hpp" diff --git a/src/backends/cl/workloads/ClConstantWorkload.hpp b/src/backends/cl/workloads/ClConstantWorkload.hpp index ccdbf069fd..374831fcf8 100644 --- a/src/backends/cl/workloads/ClConstantWorkload.hpp +++ b/src/backends/cl/workloads/ClConstantWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backends/Workload.hpp> +#include <backendsCommon/Workload.hpp> #include <arm_compute/runtime/CL/CLFunctions.h> diff --git a/src/backends/cl/workloads/ClConvertFp16ToFp32Workload.cpp b/src/backends/cl/workloads/ClConvertFp16ToFp32Workload.cpp index b489ced066..d2e86f8c94 100644 --- a/src/backends/cl/workloads/ClConvertFp16ToFp32Workload.cpp +++ b/src/backends/cl/workloads/ClConvertFp16ToFp32Workload.cpp @@ -4,7 +4,7 @@ // #include "ClConvertFp16ToFp32Workload.hpp" -#include <backends/cl/ClTensorHandle.hpp> +#include <cl/ClTensorHandle.hpp> #include "ClWorkloadUtils.hpp" diff --git a/src/backends/cl/workloads/ClConvertFp16ToFp32Workload.hpp b/src/backends/cl/workloads/ClConvertFp16ToFp32Workload.hpp index f5f230d869..e8c619d021 100644 --- a/src/backends/cl/workloads/ClConvertFp16ToFp32Workload.hpp +++ b/src/backends/cl/workloads/ClConvertFp16ToFp32Workload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backends/Workload.hpp> +#include <backendsCommon/Workload.hpp> #include <arm_compute/runtime/CL/CLFunctions.h> diff --git a/src/backends/cl/workloads/ClConvertFp32ToFp16Workload.cpp b/src/backends/cl/workloads/ClConvertFp32ToFp16Workload.cpp index 781607f716..3f528a1532 100644 --- a/src/backends/cl/workloads/ClConvertFp32ToFp16Workload.cpp +++ b/src/backends/cl/workloads/ClConvertFp32ToFp16Workload.cpp @@ -4,7 +4,7 @@ // #include "ClConvertFp32ToFp16Workload.hpp" -#include <backends/cl/ClTensorHandle.hpp> +#include <cl/ClTensorHandle.hpp> #include "ClWorkloadUtils.hpp" diff --git a/src/backends/cl/workloads/ClConvertFp32ToFp16Workload.hpp b/src/backends/cl/workloads/ClConvertFp32ToFp16Workload.hpp index 28d0bfa9b0..b817156054 100644 --- a/src/backends/cl/workloads/ClConvertFp32ToFp16Workload.hpp +++ b/src/backends/cl/workloads/ClConvertFp32ToFp16Workload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backends/Workload.hpp> +#include <backendsCommon/Workload.hpp> #include <arm_compute/runtime/CL/CLFunctions.h> diff --git a/src/backends/cl/workloads/ClConvolution2dWorkload.cpp b/src/backends/cl/workloads/ClConvolution2dWorkload.cpp index 7c876ab7bb..f3810cf3fb 100644 --- a/src/backends/cl/workloads/ClConvolution2dWorkload.cpp +++ b/src/backends/cl/workloads/ClConvolution2dWorkload.cpp @@ -7,12 +7,12 @@ #include "ClWorkloadUtils.hpp" -#include <backends/cl/ClLayerSupport.hpp> -#include <backends/cl/ClTensorHandle.hpp> -#include <backends/cl/ClLayerSupport.hpp> -#include <backends/aclCommon/ArmComputeUtils.hpp> -#include <backends/aclCommon/ArmComputeTensorUtils.hpp> -#include <backends/CpuTensorHandle.hpp> +#include <cl/ClLayerSupport.hpp> +#include <cl/ClTensorHandle.hpp> +#include <cl/ClLayerSupport.hpp> +#include <aclCommon/ArmComputeUtils.hpp> +#include <aclCommon/ArmComputeTensorUtils.hpp> +#include <backendsCommon/CpuTensorHandle.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 a5de87639b..6d7e9f3ea1 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 <backends/Workload.hpp> +#include <backendsCommon/Workload.hpp> #include <arm_compute/runtime/CL/functions/CLConvolutionLayer.h> #include <arm_compute/runtime/MemoryManagerOnDemand.h> diff --git a/src/backends/cl/workloads/ClDepthwiseConvolutionWorkload.cpp b/src/backends/cl/workloads/ClDepthwiseConvolutionWorkload.cpp index 6b159f15e4..aa5d5a1b0a 100644 --- a/src/backends/cl/workloads/ClDepthwiseConvolutionWorkload.cpp +++ b/src/backends/cl/workloads/ClDepthwiseConvolutionWorkload.cpp @@ -8,10 +8,10 @@ #include "TypeUtils.hpp" #include "ClWorkloadUtils.hpp" -#include <backends/aclCommon/ArmComputeUtils.hpp> -#include <backends/aclCommon/ArmComputeTensorUtils.hpp> -#include <backends/cl/ClTensorHandle.hpp> -#include <backends/CpuTensorHandle.hpp> +#include <aclCommon/ArmComputeUtils.hpp> +#include <aclCommon/ArmComputeTensorUtils.hpp> +#include <cl/ClTensorHandle.hpp> +#include <backendsCommon/CpuTensorHandle.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 cde9f50d38..fc277b9947 100644 --- a/src/backends/cl/workloads/ClDepthwiseConvolutionWorkload.hpp +++ b/src/backends/cl/workloads/ClDepthwiseConvolutionWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backends/Workload.hpp> +#include <backendsCommon/Workload.hpp> #include <arm_compute/runtime/IFunction.h> #include <arm_compute/core/Error.h> diff --git a/src/backends/cl/workloads/ClDivisionFloatWorkload.cpp b/src/backends/cl/workloads/ClDivisionFloatWorkload.cpp index 324d8bda8a..2a27f8a9bc 100644 --- a/src/backends/cl/workloads/ClDivisionFloatWorkload.cpp +++ b/src/backends/cl/workloads/ClDivisionFloatWorkload.cpp @@ -4,8 +4,8 @@ // #include "ClDivisionFloatWorkload.hpp" -#include <backends/cl/ClTensorHandle.hpp> -#include <backends/CpuTensorHandle.hpp> +#include <cl/ClTensorHandle.hpp> +#include <backendsCommon/CpuTensorHandle.hpp> #include "ClWorkloadUtils.hpp" diff --git a/src/backends/cl/workloads/ClDivisionFloatWorkload.hpp b/src/backends/cl/workloads/ClDivisionFloatWorkload.hpp index 1aa7ec69f6..754e5b4d67 100644 --- a/src/backends/cl/workloads/ClDivisionFloatWorkload.hpp +++ b/src/backends/cl/workloads/ClDivisionFloatWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backends/Workload.hpp> +#include <backendsCommon/Workload.hpp> #include <arm_compute/runtime/CL/CLFunctions.h> diff --git a/src/backends/cl/workloads/ClFloorFloatWorkload.cpp b/src/backends/cl/workloads/ClFloorFloatWorkload.cpp index 457d19eafe..68a89c7106 100644 --- a/src/backends/cl/workloads/ClFloorFloatWorkload.cpp +++ b/src/backends/cl/workloads/ClFloorFloatWorkload.cpp @@ -4,7 +4,7 @@ // #include "ClFloorFloatWorkload.hpp" -#include <backends/cl/ClTensorHandle.hpp> +#include <cl/ClTensorHandle.hpp> #include "ClWorkloadUtils.hpp" diff --git a/src/backends/cl/workloads/ClFloorFloatWorkload.hpp b/src/backends/cl/workloads/ClFloorFloatWorkload.hpp index 513862a4d7..bfe32df088 100644 --- a/src/backends/cl/workloads/ClFloorFloatWorkload.hpp +++ b/src/backends/cl/workloads/ClFloorFloatWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backends/Workload.hpp> +#include <backendsCommon/Workload.hpp> #include <arm_compute/runtime/CL/CLFunctions.h> diff --git a/src/backends/cl/workloads/ClFullyConnectedWorkload.cpp b/src/backends/cl/workloads/ClFullyConnectedWorkload.cpp index 7b2ecf0e8d..60eb138b42 100644 --- a/src/backends/cl/workloads/ClFullyConnectedWorkload.cpp +++ b/src/backends/cl/workloads/ClFullyConnectedWorkload.cpp @@ -4,11 +4,11 @@ // #include "ClFullyConnectedWorkload.hpp" -#include <backends/cl/ClTensorHandle.hpp> -#include <backends/CpuTensorHandle.hpp> -#include <backends/aclCommon/ArmComputeTensorUtils.hpp> -#include <backends/aclCommon/ArmComputeUtils.hpp> -#include <backends/cl/ClLayerSupport.hpp> +#include <cl/ClTensorHandle.hpp> +#include <backendsCommon/CpuTensorHandle.hpp> +#include <aclCommon/ArmComputeTensorUtils.hpp> +#include <aclCommon/ArmComputeUtils.hpp> +#include <cl/ClLayerSupport.hpp> #include "ClWorkloadUtils.hpp" diff --git a/src/backends/cl/workloads/ClFullyConnectedWorkload.hpp b/src/backends/cl/workloads/ClFullyConnectedWorkload.hpp index 0c9047235b..af672c8e70 100644 --- a/src/backends/cl/workloads/ClFullyConnectedWorkload.hpp +++ b/src/backends/cl/workloads/ClFullyConnectedWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backends/Workload.hpp> +#include <backendsCommon/Workload.hpp> #include <arm_compute/runtime/CL/CLFunctions.h> #include <arm_compute/runtime/MemoryManagerOnDemand.h> diff --git a/src/backends/cl/workloads/ClL2NormalizationFloatWorkload.cpp b/src/backends/cl/workloads/ClL2NormalizationFloatWorkload.cpp index 0dd0603b54..f827137527 100644 --- a/src/backends/cl/workloads/ClL2NormalizationFloatWorkload.cpp +++ b/src/backends/cl/workloads/ClL2NormalizationFloatWorkload.cpp @@ -4,9 +4,9 @@ // #include "ClL2NormalizationFloatWorkload.hpp" -#include <backends/cl/ClTensorHandle.hpp> -#include <backends/CpuTensorHandle.hpp> -#include <backends/aclCommon/ArmComputeUtils.hpp> +#include <cl/ClTensorHandle.hpp> +#include <backendsCommon/CpuTensorHandle.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 f7b7911f4c..a16a8f62c4 100644 --- a/src/backends/cl/workloads/ClL2NormalizationFloatWorkload.hpp +++ b/src/backends/cl/workloads/ClL2NormalizationFloatWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backends/Workload.hpp> +#include <backendsCommon/Workload.hpp> #include <arm_compute/runtime/CL/CLFunctions.h> diff --git a/src/backends/cl/workloads/ClLstmFloatWorkload.cpp b/src/backends/cl/workloads/ClLstmFloatWorkload.cpp index 177368bdbe..2a664454e1 100644 --- a/src/backends/cl/workloads/ClLstmFloatWorkload.cpp +++ b/src/backends/cl/workloads/ClLstmFloatWorkload.cpp @@ -4,10 +4,10 @@ // #include "ClLstmFloatWorkload.hpp" -#include <backends/cl/ClTensorHandle.hpp> -#include <backends/CpuTensorHandle.hpp> -#include <backends/cl/ClLayerSupport.hpp> -#include <backends/aclCommon/ArmComputeTensorUtils.hpp> +#include <cl/ClTensorHandle.hpp> +#include <backendsCommon/CpuTensorHandle.hpp> +#include <cl/ClLayerSupport.hpp> +#include <aclCommon/ArmComputeTensorUtils.hpp> #include <arm_compute/runtime/CL/functions/CLLSTMLayer.h> diff --git a/src/backends/cl/workloads/ClLstmFloatWorkload.hpp b/src/backends/cl/workloads/ClLstmFloatWorkload.hpp index 352d774a99..6a0c41fae3 100644 --- a/src/backends/cl/workloads/ClLstmFloatWorkload.hpp +++ b/src/backends/cl/workloads/ClLstmFloatWorkload.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/runtime/CL/CLFunctions.h> diff --git a/src/backends/cl/workloads/ClMeanWorkload.cpp b/src/backends/cl/workloads/ClMeanWorkload.cpp index 7e9649b1b6..960fca2732 100644 --- a/src/backends/cl/workloads/ClMeanWorkload.cpp +++ b/src/backends/cl/workloads/ClMeanWorkload.cpp @@ -5,8 +5,8 @@ #include "ClMeanWorkload.hpp" -#include <backends/cl/ClTensorHandle.hpp> -#include <backends/aclCommon/ArmComputeTensorUtils.hpp> +#include <cl/ClTensorHandle.hpp> +#include <aclCommon/ArmComputeTensorUtils.hpp> #include "ClWorkloadUtils.hpp" diff --git a/src/backends/cl/workloads/ClMeanWorkload.hpp b/src/backends/cl/workloads/ClMeanWorkload.hpp index c9f0356e04..c46d18b0f9 100644 --- a/src/backends/cl/workloads/ClMeanWorkload.hpp +++ b/src/backends/cl/workloads/ClMeanWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backends/Workload.hpp> +#include <backendsCommon/Workload.hpp> #include <arm_compute/runtime/CL/CLFunctions.h> diff --git a/src/backends/cl/workloads/ClMergerWorkload.hpp b/src/backends/cl/workloads/ClMergerWorkload.hpp index a6deb2e2b3..948fb58bd1 100644 --- a/src/backends/cl/workloads/ClMergerWorkload.hpp +++ b/src/backends/cl/workloads/ClMergerWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backends/Workload.hpp> +#include <backendsCommon/Workload.hpp> namespace armnn { diff --git a/src/backends/cl/workloads/ClMultiplicationWorkload.cpp b/src/backends/cl/workloads/ClMultiplicationWorkload.cpp index c0bcdbc4c2..f4e7b836ed 100644 --- a/src/backends/cl/workloads/ClMultiplicationWorkload.cpp +++ b/src/backends/cl/workloads/ClMultiplicationWorkload.cpp @@ -4,8 +4,8 @@ // #include "ClMultiplicationWorkload.hpp" -#include <backends/cl/ClTensorHandle.hpp> -#include <backends/CpuTensorHandle.hpp> +#include <cl/ClTensorHandle.hpp> +#include <backendsCommon/CpuTensorHandle.hpp> #include "ClWorkloadUtils.hpp" namespace armnn diff --git a/src/backends/cl/workloads/ClMultiplicationWorkload.hpp b/src/backends/cl/workloads/ClMultiplicationWorkload.hpp index 0586be96ed..2dd6bfe6df 100644 --- a/src/backends/cl/workloads/ClMultiplicationWorkload.hpp +++ b/src/backends/cl/workloads/ClMultiplicationWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backends/Workload.hpp> +#include <backendsCommon/Workload.hpp> #include <arm_compute/runtime/CL/CLFunctions.h> diff --git a/src/backends/cl/workloads/ClNormalizationFloatWorkload.cpp b/src/backends/cl/workloads/ClNormalizationFloatWorkload.cpp index f3cc6ec08d..5f2fd7ab83 100644 --- a/src/backends/cl/workloads/ClNormalizationFloatWorkload.cpp +++ b/src/backends/cl/workloads/ClNormalizationFloatWorkload.cpp @@ -4,11 +4,11 @@ // #include "ClNormalizationFloatWorkload.hpp" -#include <backends/cl/ClTensorHandle.hpp> -#include <backends/CpuTensorHandle.hpp> -#include <backends/cl/ClLayerSupport.hpp> -#include <backends/aclCommon/ArmComputeUtils.hpp> -#include <backends/aclCommon/ArmComputeTensorUtils.hpp> +#include <cl/ClTensorHandle.hpp> +#include <backendsCommon/CpuTensorHandle.hpp> +#include <cl/ClLayerSupport.hpp> +#include <aclCommon/ArmComputeUtils.hpp> +#include <aclCommon/ArmComputeTensorUtils.hpp> #include "ClWorkloadUtils.hpp" using namespace armnn::armcomputetensorutils; diff --git a/src/backends/cl/workloads/ClNormalizationFloatWorkload.hpp b/src/backends/cl/workloads/ClNormalizationFloatWorkload.hpp index f30be91aaa..4789efcf5f 100644 --- a/src/backends/cl/workloads/ClNormalizationFloatWorkload.hpp +++ b/src/backends/cl/workloads/ClNormalizationFloatWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backends/Workload.hpp> +#include <backendsCommon/Workload.hpp> #include <arm_compute/runtime/CL/CLFunctions.h> diff --git a/src/backends/cl/workloads/ClPadWorkload.cpp b/src/backends/cl/workloads/ClPadWorkload.cpp index 44c0eeab20..4d55493de5 100644 --- a/src/backends/cl/workloads/ClPadWorkload.cpp +++ b/src/backends/cl/workloads/ClPadWorkload.cpp @@ -5,8 +5,8 @@ #include "ClPadWorkload.hpp" -#include <backends/cl/ClTensorHandle.hpp> -#include <backends/aclCommon/ArmComputeTensorUtils.hpp> +#include <cl/ClTensorHandle.hpp> +#include <aclCommon/ArmComputeTensorUtils.hpp> #include <arm_compute/core/Types.h> #include "ClWorkloadUtils.hpp" diff --git a/src/backends/cl/workloads/ClPadWorkload.hpp b/src/backends/cl/workloads/ClPadWorkload.hpp index 70f6c426e0..e87cbb71c2 100644 --- a/src/backends/cl/workloads/ClPadWorkload.hpp +++ b/src/backends/cl/workloads/ClPadWorkload.hpp @@ -5,8 +5,8 @@ #pragma once -#include <backends/WorkloadData.hpp> -#include <backends/Workload.hpp> +#include <backendsCommon/WorkloadData.hpp> +#include <backendsCommon/Workload.hpp> #include <arm_compute/runtime/CL/functions/CLPadLayer.h> namespace armnn { diff --git a/src/backends/cl/workloads/ClPermuteWorkload.cpp b/src/backends/cl/workloads/ClPermuteWorkload.cpp index 39fa56f195..bec80e55f8 100644 --- a/src/backends/cl/workloads/ClPermuteWorkload.cpp +++ b/src/backends/cl/workloads/ClPermuteWorkload.cpp @@ -4,8 +4,8 @@ // #include "ClPermuteWorkload.hpp" -#include <backends/cl/ClTensorHandle.hpp> -#include <backends/aclCommon/ArmComputeTensorUtils.hpp> +#include <cl/ClTensorHandle.hpp> +#include <aclCommon/ArmComputeTensorUtils.hpp> #include <arm_compute/core/Error.h> diff --git a/src/backends/cl/workloads/ClPermuteWorkload.hpp b/src/backends/cl/workloads/ClPermuteWorkload.hpp index 43de302546..58aa7ea0fa 100644 --- a/src/backends/cl/workloads/ClPermuteWorkload.hpp +++ b/src/backends/cl/workloads/ClPermuteWorkload.hpp @@ -5,8 +5,8 @@ #pragma once -#include <backends/Workload.hpp> -#include <backends/WorkloadData.hpp> +#include <backendsCommon/Workload.hpp> +#include <backendsCommon/WorkloadData.hpp> #include <armnn/TypesUtils.hpp> #include <arm_compute/runtime/CL/functions/CLPermute.h> diff --git a/src/backends/cl/workloads/ClPooling2dWorkload.cpp b/src/backends/cl/workloads/ClPooling2dWorkload.cpp index b54afd2fa4..f4b0356bd1 100644 --- a/src/backends/cl/workloads/ClPooling2dWorkload.cpp +++ b/src/backends/cl/workloads/ClPooling2dWorkload.cpp @@ -4,10 +4,10 @@ // #include "ClPooling2dWorkload.hpp" -#include <backends/cl/ClLayerSupport.hpp> -#include <backends/cl/ClTensorHandle.hpp> -#include <backends/aclCommon/ArmComputeUtils.hpp> -#include <backends/aclCommon/ArmComputeTensorUtils.hpp> +#include <cl/ClLayerSupport.hpp> +#include <cl/ClTensorHandle.hpp> +#include <aclCommon/ArmComputeUtils.hpp> +#include <aclCommon/ArmComputeTensorUtils.hpp> #include "ClWorkloadUtils.hpp" diff --git a/src/backends/cl/workloads/ClPooling2dWorkload.hpp b/src/backends/cl/workloads/ClPooling2dWorkload.hpp index 0812e33a52..01c97539f0 100644 --- a/src/backends/cl/workloads/ClPooling2dWorkload.hpp +++ b/src/backends/cl/workloads/ClPooling2dWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backends/Workload.hpp> +#include <backendsCommon/Workload.hpp> #include <arm_compute/runtime/CL/CLFunctions.h> diff --git a/src/backends/cl/workloads/ClReshapeWorkload.cpp b/src/backends/cl/workloads/ClReshapeWorkload.cpp index 47cea944d9..db1702a74f 100644 --- a/src/backends/cl/workloads/ClReshapeWorkload.cpp +++ b/src/backends/cl/workloads/ClReshapeWorkload.cpp @@ -4,8 +4,8 @@ // #include "ClReshapeWorkload.hpp" -#include <backends/cl/ClTensorHandle.hpp> -#include <backends/CpuTensorHandle.hpp> +#include <cl/ClTensorHandle.hpp> +#include <backendsCommon/CpuTensorHandle.hpp> #include "ClWorkloadUtils.hpp" diff --git a/src/backends/cl/workloads/ClReshapeWorkload.hpp b/src/backends/cl/workloads/ClReshapeWorkload.hpp index f949f764b2..a7b464e719 100644 --- a/src/backends/cl/workloads/ClReshapeWorkload.hpp +++ b/src/backends/cl/workloads/ClReshapeWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backends/Workload.hpp> +#include <backendsCommon/Workload.hpp> #include <arm_compute/runtime/CL/CLFunctions.h> diff --git a/src/backends/cl/workloads/ClResizeBilinearFloatWorkload.cpp b/src/backends/cl/workloads/ClResizeBilinearFloatWorkload.cpp index c4f0a041df..3e2f895b36 100644 --- a/src/backends/cl/workloads/ClResizeBilinearFloatWorkload.cpp +++ b/src/backends/cl/workloads/ClResizeBilinearFloatWorkload.cpp @@ -4,11 +4,11 @@ // #include "ClResizeBilinearFloatWorkload.hpp" -#include <backends/cl/ClTensorHandle.hpp> -#include <backends/CpuTensorHandle.hpp> -#include <backends/cl/ClLayerSupport.hpp> -#include <backends/aclCommon/ArmComputeUtils.hpp> -#include <backends/aclCommon/ArmComputeTensorUtils.hpp> +#include <cl/ClTensorHandle.hpp> +#include <backendsCommon/CpuTensorHandle.hpp> +#include <cl/ClLayerSupport.hpp> +#include <aclCommon/ArmComputeUtils.hpp> +#include <aclCommon/ArmComputeTensorUtils.hpp> #include "ClWorkloadUtils.hpp" diff --git a/src/backends/cl/workloads/ClResizeBilinearFloatWorkload.hpp b/src/backends/cl/workloads/ClResizeBilinearFloatWorkload.hpp index f29f416907..07ddceccd2 100644 --- a/src/backends/cl/workloads/ClResizeBilinearFloatWorkload.hpp +++ b/src/backends/cl/workloads/ClResizeBilinearFloatWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backends/Workload.hpp> +#include <backendsCommon/Workload.hpp> #include <arm_compute/runtime/CL/CLFunctions.h> diff --git a/src/backends/cl/workloads/ClSoftmaxBaseWorkload.cpp b/src/backends/cl/workloads/ClSoftmaxBaseWorkload.cpp index eb05a19670..48dd3984f1 100644 --- a/src/backends/cl/workloads/ClSoftmaxBaseWorkload.cpp +++ b/src/backends/cl/workloads/ClSoftmaxBaseWorkload.cpp @@ -5,7 +5,7 @@ #include "ClSoftmaxBaseWorkload.hpp" -#include <backends/aclCommon/ArmComputeTensorUtils.hpp> +#include <aclCommon/ArmComputeTensorUtils.hpp> #include <arm_compute/runtime/CL/functions/CLSoftmaxLayer.h> diff --git a/src/backends/cl/workloads/ClSoftmaxFloatWorkload.cpp b/src/backends/cl/workloads/ClSoftmaxFloatWorkload.cpp index ed012cc30b..bb56802ba3 100644 --- a/src/backends/cl/workloads/ClSoftmaxFloatWorkload.cpp +++ b/src/backends/cl/workloads/ClSoftmaxFloatWorkload.cpp @@ -4,8 +4,8 @@ // #include "ClSoftmaxFloatWorkload.hpp" -#include <backends/cl/ClTensorHandle.hpp> -#include <backends/CpuTensorHandle.hpp> +#include <cl/ClTensorHandle.hpp> +#include <backendsCommon/CpuTensorHandle.hpp> #include "ClWorkloadUtils.hpp" diff --git a/src/backends/cl/workloads/ClSoftmaxFloatWorkload.hpp b/src/backends/cl/workloads/ClSoftmaxFloatWorkload.hpp index b400b3c7ea..0da8ddad8d 100644 --- a/src/backends/cl/workloads/ClSoftmaxFloatWorkload.hpp +++ b/src/backends/cl/workloads/ClSoftmaxFloatWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backends/Workload.hpp> +#include <backendsCommon/Workload.hpp> #include <arm_compute/runtime/CL/CLFunctions.h> #include <arm_compute/runtime/MemoryManagerOnDemand.h> diff --git a/src/backends/cl/workloads/ClSoftmaxUint8Workload.cpp b/src/backends/cl/workloads/ClSoftmaxUint8Workload.cpp index d06306e178..c386e3837b 100644 --- a/src/backends/cl/workloads/ClSoftmaxUint8Workload.cpp +++ b/src/backends/cl/workloads/ClSoftmaxUint8Workload.cpp @@ -4,8 +4,8 @@ // #include "ClSoftmaxUint8Workload.hpp" -#include <backends/cl/ClTensorHandle.hpp> -#include <backends/CpuTensorHandle.hpp> +#include <cl/ClTensorHandle.hpp> +#include <backendsCommon/CpuTensorHandle.hpp> #include "ClWorkloadUtils.hpp" diff --git a/src/backends/cl/workloads/ClSoftmaxUint8Workload.hpp b/src/backends/cl/workloads/ClSoftmaxUint8Workload.hpp index 4786faf60b..ea467341e4 100644 --- a/src/backends/cl/workloads/ClSoftmaxUint8Workload.hpp +++ b/src/backends/cl/workloads/ClSoftmaxUint8Workload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backends/Workload.hpp> +#include <backendsCommon/Workload.hpp> #include <arm_compute/runtime/CL/CLFunctions.h> #include "arm_compute/runtime/MemoryManagerOnDemand.h" diff --git a/src/backends/cl/workloads/ClSplitterWorkload.hpp b/src/backends/cl/workloads/ClSplitterWorkload.hpp index ffc02c047f..950335902e 100644 --- a/src/backends/cl/workloads/ClSplitterWorkload.hpp +++ b/src/backends/cl/workloads/ClSplitterWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backends/Workload.hpp> +#include <backendsCommon/Workload.hpp> namespace armnn { diff --git a/src/backends/cl/workloads/ClSubtractionWorkload.cpp b/src/backends/cl/workloads/ClSubtractionWorkload.cpp index e23dab0f57..38154eb4d7 100644 --- a/src/backends/cl/workloads/ClSubtractionWorkload.cpp +++ b/src/backends/cl/workloads/ClSubtractionWorkload.cpp @@ -5,9 +5,9 @@ #include "ClSubtractionWorkload.hpp" -#include <backends/cl/ClTensorHandle.hpp> -#include <backends/CpuTensorHandle.hpp> -#include <backends/aclCommon/ArmComputeTensorUtils.hpp> +#include <cl/ClTensorHandle.hpp> +#include <backendsCommon/CpuTensorHandle.hpp> +#include <aclCommon/ArmComputeTensorUtils.hpp> #include "ClWorkloadUtils.hpp" diff --git a/src/backends/cl/workloads/ClSubtractionWorkload.hpp b/src/backends/cl/workloads/ClSubtractionWorkload.hpp index 3a4210da07..ba894568c7 100644 --- a/src/backends/cl/workloads/ClSubtractionWorkload.hpp +++ b/src/backends/cl/workloads/ClSubtractionWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backends/Workload.hpp> +#include <backendsCommon/Workload.hpp> #include <arm_compute/runtime/CL/CLFunctions.h> diff --git a/src/backends/cl/workloads/ClWorkloadUtils.hpp b/src/backends/cl/workloads/ClWorkloadUtils.hpp index ca0de8dd0a..3bee2427f0 100644 --- a/src/backends/cl/workloads/ClWorkloadUtils.hpp +++ b/src/backends/cl/workloads/ClWorkloadUtils.hpp @@ -4,11 +4,11 @@ // #pragma once -#include <armnnUtils/Half.hpp> +#include <Half.hpp> -#include <backends/aclCommon/ArmComputeTensorUtils.hpp> -#include <backends/cl/OpenClTimer.hpp> -#include <backends/CpuTensorHandle.hpp> +#include <aclCommon/ArmComputeTensorUtils.hpp> +#include <cl/OpenClTimer.hpp> +#include <backendsCommon/CpuTensorHandle.hpp> #include <arm_compute/runtime/CL/CLFunctions.h> |