diff options
Diffstat (limited to 'src/backends/reference')
57 files changed, 114 insertions, 114 deletions
diff --git a/src/backends/reference/CMakeLists.txt b/src/backends/reference/CMakeLists.txt index e2656d552e..1799275d7d 100644 --- a/src/backends/reference/CMakeLists.txt +++ b/src/backends/reference/CMakeLists.txt @@ -14,9 +14,9 @@ list(APPEND armnnRefBackend_sources ) add_library(armnnRefBackend OBJECT ${armnnRefBackend_sources}) -target_include_directories(armnnRefBackend PRIVATE ${PROJECT_SOURCE_DIR}/src) target_include_directories(armnnRefBackend PRIVATE ${PROJECT_SOURCE_DIR}/src/armnn) target_include_directories(armnnRefBackend PRIVATE ${PROJECT_SOURCE_DIR}/src/armnnUtils) +target_include_directories(armnnRefBackend PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) add_subdirectory(workloads) diff --git a/src/backends/reference/RefBackend.cpp b/src/backends/reference/RefBackend.cpp index 3aa4f038c5..91fc3c99ab 100644 --- a/src/backends/reference/RefBackend.cpp +++ b/src/backends/reference/RefBackend.cpp @@ -7,7 +7,7 @@ #include "RefBackendId.hpp" #include "RefWorkloadFactory.hpp" -#include <backends/BackendRegistry.hpp> +#include <backendsCommon/BackendRegistry.hpp> namespace armnn { diff --git a/src/backends/reference/RefBackend.hpp b/src/backends/reference/RefBackend.hpp index 1949e77ff5..e2f264d7a4 100644 --- a/src/backends/reference/RefBackend.hpp +++ b/src/backends/reference/RefBackend.hpp @@ -4,7 +4,7 @@ // #pragma once -#include <backends/IBackendInternal.hpp> +#include <backendsCommon/IBackendInternal.hpp> namespace armnn { diff --git a/src/backends/reference/RefLayerSupport.cpp b/src/backends/reference/RefLayerSupport.cpp index 79d4ab0dd1..1e8fa75be7 100644 --- a/src/backends/reference/RefLayerSupport.cpp +++ b/src/backends/reference/RefLayerSupport.cpp @@ -6,11 +6,11 @@ #include "RefLayerSupport.hpp" #include "RefBackendId.hpp" -#include <armnn/InternalTypes.hpp> -#include <armnn/LayerSupportCommon.hpp> +#include <InternalTypes.hpp> +#include <LayerSupportCommon.hpp> #include <armnn/Types.hpp> -#include <backends/LayerSupportRegistry.hpp> +#include <backendsCommon/LayerSupportRegistry.hpp> #include <boost/core/ignore_unused.hpp> diff --git a/src/backends/reference/RefWorkloadFactory.cpp b/src/backends/reference/RefWorkloadFactory.cpp index 3af81567e5..177c5edd4e 100644 --- a/src/backends/reference/RefWorkloadFactory.cpp +++ b/src/backends/reference/RefWorkloadFactory.cpp @@ -2,9 +2,9 @@ // Copyright © 2017 Arm Ltd. All rights reserved. // SPDX-License-Identifier: MIT // -#include <backends/CpuTensorHandle.hpp> -#include <backends/MemCopyWorkload.hpp> -#include <backends/MakeWorkloadHelper.hpp> +#include <backendsCommon/CpuTensorHandle.hpp> +#include <backendsCommon/MemCopyWorkload.hpp> +#include <backendsCommon/MakeWorkloadHelper.hpp> #include "RefWorkloadFactory.hpp" #include "RefBackendId.hpp" #include "workloads/RefWorkloads.hpp" diff --git a/src/backends/reference/RefWorkloadFactory.hpp b/src/backends/reference/RefWorkloadFactory.hpp index 2e51ec37cc..e9b298d376 100644 --- a/src/backends/reference/RefWorkloadFactory.hpp +++ b/src/backends/reference/RefWorkloadFactory.hpp @@ -5,8 +5,8 @@ #pragma once #include <armnn/Optional.hpp> -#include <backends/WorkloadFactory.hpp> -#include <backends/OutputHandler.hpp> +#include <backendsCommon/WorkloadFactory.hpp> +#include <backendsCommon/OutputHandler.hpp> #include <boost/core/ignore_unused.hpp> diff --git a/src/backends/reference/test/CMakeLists.txt b/src/backends/reference/test/CMakeLists.txt index 1eec594aa9..aee621614f 100644 --- a/src/backends/reference/test/CMakeLists.txt +++ b/src/backends/reference/test/CMakeLists.txt @@ -14,6 +14,6 @@ list(APPEND armnnRefBackendUnitTests_sources ) add_library(armnnRefBackendUnitTests OBJECT ${armnnRefBackendUnitTests_sources}) -target_include_directories(armnnRefBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src) target_include_directories(armnnRefBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/armnn) target_include_directories(armnnRefBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/armnnUtils) +target_include_directories(armnnRefBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) diff --git a/src/backends/reference/test/RefCreateWorkloadTests.cpp b/src/backends/reference/test/RefCreateWorkloadTests.cpp index d9322709b2..d03fe5cb9f 100644 --- a/src/backends/reference/test/RefCreateWorkloadTests.cpp +++ b/src/backends/reference/test/RefCreateWorkloadTests.cpp @@ -3,11 +3,11 @@ // SPDX-License-Identifier: MIT // -#include <armnn/test/CreateWorkload.hpp> +#include <test/CreateWorkload.hpp> -#include <backends/CpuTensorHandle.hpp> -#include <backends/reference/RefWorkloadFactory.hpp> -#include <backends/reference/workloads/RefWorkloads.hpp> +#include <backendsCommon/CpuTensorHandle.hpp> +#include <reference/RefWorkloadFactory.hpp> +#include <reference/workloads/RefWorkloads.hpp> namespace { diff --git a/src/backends/reference/test/RefEndToEndTests.cpp b/src/backends/reference/test/RefEndToEndTests.cpp index 8938d6f222..dc2ffb81ff 100644 --- a/src/backends/reference/test/RefEndToEndTests.cpp +++ b/src/backends/reference/test/RefEndToEndTests.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/reference/test/RefJsonPrinterTests.cpp b/src/backends/reference/test/RefJsonPrinterTests.cpp index ee668a2513..4d4844336c 100644 --- a/src/backends/reference/test/RefJsonPrinterTests.cpp +++ b/src/backends/reference/test/RefJsonPrinterTests.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/reference/test/RefLayerSupportTests.cpp b/src/backends/reference/test/RefLayerSupportTests.cpp index be3f3f8f97..b7fbc68d3d 100644 --- a/src/backends/reference/test/RefLayerSupportTests.cpp +++ b/src/backends/reference/test/RefLayerSupportTests.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/reference/RefWorkloadFactory.hpp> -#include <backends/test/LayerTests.hpp> -#include <backends/test/IsLayerSupportedTestImpl.hpp> +#include <layers/ConvertFp16ToFp32Layer.hpp> +#include <layers/ConvertFp32ToFp16Layer.hpp> +#include <test/TensorHelpers.hpp> + +#include <backendsCommon/CpuTensorHandle.hpp> +#include <reference/RefWorkloadFactory.hpp> +#include <backendsCommon/test/LayerTests.hpp> +#include <backendsCommon/test/IsLayerSupportedTestImpl.hpp> #include <boost/test/unit_test.hpp> diff --git a/src/backends/reference/test/RefLayerTests.cpp b/src/backends/reference/test/RefLayerTests.cpp index d481b827e0..e79953fe65 100644 --- a/src/backends/reference/test/RefLayerTests.cpp +++ b/src/backends/reference/test/RefLayerTests.cpp @@ -3,11 +3,11 @@ // SPDX-License-Identifier: MIT // -#include "test/TensorHelpers.hpp" -#include "test/UnitTests.hpp" +#include <test/TensorHelpers.hpp> +#include <test/UnitTests.hpp> -#include <backends/reference/RefWorkloadFactory.hpp> -#include <backends/test/LayerTests.hpp> +#include <reference/RefWorkloadFactory.hpp> +#include <backendsCommon/test/LayerTests.hpp> #include <boost/test/unit_test.hpp> diff --git a/src/backends/reference/test/RefOptimizedNetworkTests.cpp b/src/backends/reference/test/RefOptimizedNetworkTests.cpp index 63615e6859..907e7950f5 100644 --- a/src/backends/reference/test/RefOptimizedNetworkTests.cpp +++ b/src/backends/reference/test/RefOptimizedNetworkTests.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/reference/RefWorkloadFactory.hpp> +#include <reference/RefWorkloadFactory.hpp> #include <boost/test/unit_test.hpp> diff --git a/src/backends/reference/test/RefRuntimeTests.cpp b/src/backends/reference/test/RefRuntimeTests.cpp index 2536627ea6..ae49366c62 100644 --- a/src/backends/reference/test/RefRuntimeTests.cpp +++ b/src/backends/reference/test/RefRuntimeTests.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/reference/workloads/CMakeLists.txt b/src/backends/reference/workloads/CMakeLists.txt index bf65639c0d..7dc72891c7 100644 --- a/src/backends/reference/workloads/CMakeLists.txt +++ b/src/backends/reference/workloads/CMakeLists.txt @@ -107,6 +107,6 @@ list(APPEND armnnRefBackendWorkloads_sources ) add_library(armnnRefBackendWorkloads OBJECT ${armnnRefBackendWorkloads_sources}) -target_include_directories(armnnRefBackendWorkloads PRIVATE ${PROJECT_SOURCE_DIR}/src) target_include_directories(armnnRefBackendWorkloads PRIVATE ${PROJECT_SOURCE_DIR}/src/armnn) target_include_directories(armnnRefBackendWorkloads PRIVATE ${PROJECT_SOURCE_DIR}/src/armnnUtils) +target_include_directories(armnnRefBackendWorkloads PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) diff --git a/src/backends/reference/workloads/Mean.cpp b/src/backends/reference/workloads/Mean.cpp index 0db67a0eed..530aade611 100644 --- a/src/backends/reference/workloads/Mean.cpp +++ b/src/backends/reference/workloads/Mean.cpp @@ -4,7 +4,7 @@ // #include "Mean.hpp" -#include "backends/WorkloadData.hpp" +#include "backendsCommon/WorkloadData.hpp" #include <boost/numeric/conversion/cast.hpp> diff --git a/src/backends/reference/workloads/Merger.hpp b/src/backends/reference/workloads/Merger.hpp index 61c1311905..76d807cb2c 100644 --- a/src/backends/reference/workloads/Merger.hpp +++ b/src/backends/reference/workloads/Merger.hpp @@ -7,7 +7,7 @@ #include "RefWorkloadUtils.hpp" -#include <backends/WorkloadData.hpp> +#include <backendsCommon/WorkloadData.hpp> #include <armnn/Tensor.hpp> namespace armnn diff --git a/src/backends/reference/workloads/Pad.cpp b/src/backends/reference/workloads/Pad.cpp index a50fa23c6c..7a928a1336 100644 --- a/src/backends/reference/workloads/Pad.cpp +++ b/src/backends/reference/workloads/Pad.cpp @@ -4,7 +4,7 @@ // #include "Pad.hpp" -#include "backends/WorkloadData.hpp" +#include "backendsCommon/WorkloadData.hpp" #include <boost/numeric/conversion/cast.hpp> #include "TensorBufferArrayView.hpp" #include <cmath> diff --git a/src/backends/reference/workloads/RefActivationFloat32Workload.hpp b/src/backends/reference/workloads/RefActivationFloat32Workload.hpp index 73be6b05bd..dd65697e57 100644 --- a/src/backends/reference/workloads/RefActivationFloat32Workload.hpp +++ b/src/backends/reference/workloads/RefActivationFloat32Workload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backends/Workload.hpp> +#include <backendsCommon/Workload.hpp> namespace armnn { diff --git a/src/backends/reference/workloads/RefActivationUint8Workload.hpp b/src/backends/reference/workloads/RefActivationUint8Workload.hpp index 4b8cc1a418..66f5e327f1 100644 --- a/src/backends/reference/workloads/RefActivationUint8Workload.hpp +++ b/src/backends/reference/workloads/RefActivationUint8Workload.hpp @@ -5,8 +5,8 @@ #pragma once -#include <backends/Workload.hpp> -#include <backends/WorkloadData.hpp> +#include <backendsCommon/Workload.hpp> +#include <backendsCommon/WorkloadData.hpp> namespace armnn { diff --git a/src/backends/reference/workloads/RefArithmeticWorkload.hpp b/src/backends/reference/workloads/RefArithmeticWorkload.hpp index be89a3222f..75606177a6 100644 --- a/src/backends/reference/workloads/RefArithmeticWorkload.hpp +++ b/src/backends/reference/workloads/RefArithmeticWorkload.hpp @@ -6,9 +6,9 @@ #pragma once #include <armnn/Types.hpp> -#include <backends/StringMapping.hpp> -#include <backends/Workload.hpp> -#include <backends/WorkloadData.hpp> +#include <backendsCommon/StringMapping.hpp> +#include <backendsCommon/Workload.hpp> +#include <backendsCommon/WorkloadData.hpp> namespace armnn { diff --git a/src/backends/reference/workloads/RefBaseConstantWorkload.hpp b/src/backends/reference/workloads/RefBaseConstantWorkload.hpp index 9d125e422d..82ee11f6ec 100644 --- a/src/backends/reference/workloads/RefBaseConstantWorkload.hpp +++ b/src/backends/reference/workloads/RefBaseConstantWorkload.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/Types.hpp> diff --git a/src/backends/reference/workloads/RefBatchNormalizationFloat32Workload.hpp b/src/backends/reference/workloads/RefBatchNormalizationFloat32Workload.hpp index b51d94f979..9f92899f4f 100644 --- a/src/backends/reference/workloads/RefBatchNormalizationFloat32Workload.hpp +++ b/src/backends/reference/workloads/RefBatchNormalizationFloat32Workload.hpp @@ -5,8 +5,8 @@ #pragma once -#include <backends/Workload.hpp> -#include <backends/WorkloadData.hpp> +#include <backendsCommon/Workload.hpp> +#include <backendsCommon/WorkloadData.hpp> namespace armnn { diff --git a/src/backends/reference/workloads/RefBatchNormalizationUint8Workload.hpp b/src/backends/reference/workloads/RefBatchNormalizationUint8Workload.hpp index 854ba1aea5..7c288a5c07 100644 --- a/src/backends/reference/workloads/RefBatchNormalizationUint8Workload.hpp +++ b/src/backends/reference/workloads/RefBatchNormalizationUint8Workload.hpp @@ -5,8 +5,8 @@ #pragma once -#include <backends/Workload.hpp> -#include <backends/WorkloadData.hpp> +#include <backendsCommon/Workload.hpp> +#include <backendsCommon/WorkloadData.hpp> namespace armnn { diff --git a/src/backends/reference/workloads/RefConvertFp16ToFp32Workload.cpp b/src/backends/reference/workloads/RefConvertFp16ToFp32Workload.cpp index b01246b1e9..886e77a31b 100644 --- a/src/backends/reference/workloads/RefConvertFp16ToFp32Workload.cpp +++ b/src/backends/reference/workloads/RefConvertFp16ToFp32Workload.cpp @@ -8,7 +8,7 @@ #include "RefWorkloadUtils.hpp" #include "FloatingPointConverter.hpp" -#include <armnnUtils/Half.hpp> +#include <Half.hpp> namespace armnn { diff --git a/src/backends/reference/workloads/RefConvertFp16ToFp32Workload.hpp b/src/backends/reference/workloads/RefConvertFp16ToFp32Workload.hpp index 475b47f901..7c58e9f089 100644 --- a/src/backends/reference/workloads/RefConvertFp16ToFp32Workload.hpp +++ b/src/backends/reference/workloads/RefConvertFp16ToFp32Workload.hpp @@ -5,8 +5,8 @@ #pragma once -#include <backends/Workload.hpp> -#include <backends/WorkloadData.hpp> +#include <backendsCommon/Workload.hpp> +#include <backendsCommon/WorkloadData.hpp> namespace armnn { diff --git a/src/backends/reference/workloads/RefConvertFp32ToFp16Workload.cpp b/src/backends/reference/workloads/RefConvertFp32ToFp16Workload.cpp index 99e3541dd6..33270ad10f 100644 --- a/src/backends/reference/workloads/RefConvertFp32ToFp16Workload.cpp +++ b/src/backends/reference/workloads/RefConvertFp32ToFp16Workload.cpp @@ -9,7 +9,7 @@ #include "RefWorkloadUtils.hpp" #include "Profiling.hpp" -#include "armnnUtils/Half.hpp" +#include "Half.hpp" namespace armnn { diff --git a/src/backends/reference/workloads/RefConvertFp32ToFp16Workload.hpp b/src/backends/reference/workloads/RefConvertFp32ToFp16Workload.hpp index 2d5560933d..283766dfb5 100644 --- a/src/backends/reference/workloads/RefConvertFp32ToFp16Workload.hpp +++ b/src/backends/reference/workloads/RefConvertFp32ToFp16Workload.hpp @@ -5,8 +5,8 @@ #pragma once -#include <backends/Workload.hpp> -#include <backends/WorkloadData.hpp> +#include <backendsCommon/Workload.hpp> +#include <backendsCommon/WorkloadData.hpp> namespace armnn { diff --git a/src/backends/reference/workloads/RefConvolution2dFloat32Workload.hpp b/src/backends/reference/workloads/RefConvolution2dFloat32Workload.hpp index 4f2700d22e..5ff743d511 100644 --- a/src/backends/reference/workloads/RefConvolution2dFloat32Workload.hpp +++ b/src/backends/reference/workloads/RefConvolution2dFloat32Workload.hpp @@ -5,8 +5,8 @@ #pragma once -#include <backends/Workload.hpp> -#include <backends/WorkloadData.hpp> +#include <backendsCommon/Workload.hpp> +#include <backendsCommon/WorkloadData.hpp> namespace armnn { diff --git a/src/backends/reference/workloads/RefConvolution2dUint8Workload.hpp b/src/backends/reference/workloads/RefConvolution2dUint8Workload.hpp index bbd77cebc4..a58f23a2a0 100644 --- a/src/backends/reference/workloads/RefConvolution2dUint8Workload.hpp +++ b/src/backends/reference/workloads/RefConvolution2dUint8Workload.hpp @@ -5,8 +5,8 @@ #pragma once -#include <backends/Workload.hpp> -#include <backends/WorkloadData.hpp> +#include <backendsCommon/Workload.hpp> +#include <backendsCommon/WorkloadData.hpp> namespace armnn { diff --git a/src/backends/reference/workloads/RefDepthwiseConvolution2dFloat32Workload.hpp b/src/backends/reference/workloads/RefDepthwiseConvolution2dFloat32Workload.hpp index 516d80941f..d09497c562 100644 --- a/src/backends/reference/workloads/RefDepthwiseConvolution2dFloat32Workload.hpp +++ b/src/backends/reference/workloads/RefDepthwiseConvolution2dFloat32Workload.hpp @@ -5,8 +5,8 @@ #pragma once -#include <backends/Workload.hpp> -#include <backends/WorkloadData.hpp> +#include <backendsCommon/Workload.hpp> +#include <backendsCommon/WorkloadData.hpp> namespace armnn { diff --git a/src/backends/reference/workloads/RefDepthwiseConvolution2dUint8Workload.hpp b/src/backends/reference/workloads/RefDepthwiseConvolution2dUint8Workload.hpp index 3cb82c4be5..d35b43c0db 100644 --- a/src/backends/reference/workloads/RefDepthwiseConvolution2dUint8Workload.hpp +++ b/src/backends/reference/workloads/RefDepthwiseConvolution2dUint8Workload.hpp @@ -5,8 +5,8 @@ #pragma once -#include <backends/Workload.hpp> -#include <backends/WorkloadData.hpp> +#include <backendsCommon/Workload.hpp> +#include <backendsCommon/WorkloadData.hpp> namespace armnn { diff --git a/src/backends/reference/workloads/RefFakeQuantizationFloat32Workload.hpp b/src/backends/reference/workloads/RefFakeQuantizationFloat32Workload.hpp index 89a907b8b8..62fb8e88b7 100644 --- a/src/backends/reference/workloads/RefFakeQuantizationFloat32Workload.hpp +++ b/src/backends/reference/workloads/RefFakeQuantizationFloat32Workload.hpp @@ -5,8 +5,8 @@ #pragma once -#include <backends/Workload.hpp> -#include <backends/WorkloadData.hpp> +#include <backendsCommon/Workload.hpp> +#include <backendsCommon/WorkloadData.hpp> namespace armnn { diff --git a/src/backends/reference/workloads/RefFloorFloat32Workload.hpp b/src/backends/reference/workloads/RefFloorFloat32Workload.hpp index ffc4541a85..3f540d068d 100644 --- a/src/backends/reference/workloads/RefFloorFloat32Workload.hpp +++ b/src/backends/reference/workloads/RefFloorFloat32Workload.hpp @@ -5,8 +5,8 @@ #pragma once -#include <backends/Workload.hpp> -#include <backends/WorkloadData.hpp> +#include <backendsCommon/Workload.hpp> +#include <backendsCommon/WorkloadData.hpp> namespace armnn { diff --git a/src/backends/reference/workloads/RefFullyConnectedFloat32Workload.hpp b/src/backends/reference/workloads/RefFullyConnectedFloat32Workload.hpp index c296f99e1c..6a05024ca3 100644 --- a/src/backends/reference/workloads/RefFullyConnectedFloat32Workload.hpp +++ b/src/backends/reference/workloads/RefFullyConnectedFloat32Workload.hpp @@ -5,8 +5,8 @@ #pragma once -#include <backends/Workload.hpp> -#include <backends/WorkloadData.hpp> +#include <backendsCommon/Workload.hpp> +#include <backendsCommon/WorkloadData.hpp> namespace armnn { diff --git a/src/backends/reference/workloads/RefFullyConnectedUint8Workload.hpp b/src/backends/reference/workloads/RefFullyConnectedUint8Workload.hpp index 3a15d9913a..679ad8626a 100644 --- a/src/backends/reference/workloads/RefFullyConnectedUint8Workload.hpp +++ b/src/backends/reference/workloads/RefFullyConnectedUint8Workload.hpp @@ -5,8 +5,8 @@ #pragma once -#include <backends/Workload.hpp> -#include <backends/WorkloadData.hpp> +#include <backendsCommon/Workload.hpp> +#include <backendsCommon/WorkloadData.hpp> namespace armnn { diff --git a/src/backends/reference/workloads/RefL2NormalizationFloat32Workload.hpp b/src/backends/reference/workloads/RefL2NormalizationFloat32Workload.hpp index b2e37954f5..50ece0e905 100644 --- a/src/backends/reference/workloads/RefL2NormalizationFloat32Workload.hpp +++ b/src/backends/reference/workloads/RefL2NormalizationFloat32Workload.hpp @@ -5,8 +5,8 @@ #pragma once -#include <backends/Workload.hpp> -#include <backends/WorkloadData.hpp> +#include <backendsCommon/Workload.hpp> +#include <backendsCommon/WorkloadData.hpp> namespace armnn { diff --git a/src/backends/reference/workloads/RefLstmFloat32Workload.hpp b/src/backends/reference/workloads/RefLstmFloat32Workload.hpp index 79781c6971..1f634d3ca1 100644 --- a/src/backends/reference/workloads/RefLstmFloat32Workload.hpp +++ b/src/backends/reference/workloads/RefLstmFloat32Workload.hpp @@ -5,8 +5,8 @@ #pragma once -#include <backends/Workload.hpp> -#include <backends/WorkloadData.hpp> +#include <backendsCommon/Workload.hpp> +#include <backendsCommon/WorkloadData.hpp> namespace armnn { diff --git a/src/backends/reference/workloads/RefMeanFloat32Workload.hpp b/src/backends/reference/workloads/RefMeanFloat32Workload.hpp index a4c559f0c6..153ebe161a 100644 --- a/src/backends/reference/workloads/RefMeanFloat32Workload.hpp +++ b/src/backends/reference/workloads/RefMeanFloat32Workload.hpp @@ -5,8 +5,8 @@ #pragma once -#include "backends/Workload.hpp" -#include "backends/WorkloadData.hpp" +#include "backendsCommon/Workload.hpp" +#include "backendsCommon/WorkloadData.hpp" namespace armnn { diff --git a/src/backends/reference/workloads/RefMeanUint8Workload.hpp b/src/backends/reference/workloads/RefMeanUint8Workload.hpp index 21cf72b38f..f53b8a434a 100644 --- a/src/backends/reference/workloads/RefMeanUint8Workload.hpp +++ b/src/backends/reference/workloads/RefMeanUint8Workload.hpp @@ -5,8 +5,8 @@ #pragma once -#include "backends/Workload.hpp" -#include "backends/WorkloadData.hpp" +#include "backendsCommon/Workload.hpp" +#include "backendsCommon/WorkloadData.hpp" namespace armnn { diff --git a/src/backends/reference/workloads/RefMergerFloat32Workload.hpp b/src/backends/reference/workloads/RefMergerFloat32Workload.hpp index 0c659231d2..8d7b2706f3 100644 --- a/src/backends/reference/workloads/RefMergerFloat32Workload.hpp +++ b/src/backends/reference/workloads/RefMergerFloat32Workload.hpp @@ -5,8 +5,8 @@ #pragma once -#include <backends/Workload.hpp> -#include <backends/WorkloadData.hpp> +#include <backendsCommon/Workload.hpp> +#include <backendsCommon/WorkloadData.hpp> namespace armnn { diff --git a/src/backends/reference/workloads/RefMergerUint8Workload.hpp b/src/backends/reference/workloads/RefMergerUint8Workload.hpp index f19bd22cb1..df23af093f 100644 --- a/src/backends/reference/workloads/RefMergerUint8Workload.hpp +++ b/src/backends/reference/workloads/RefMergerUint8Workload.hpp @@ -5,8 +5,8 @@ #pragma once -#include <backends/Workload.hpp> -#include <backends/WorkloadData.hpp> +#include <backendsCommon/Workload.hpp> +#include <backendsCommon/WorkloadData.hpp> namespace armnn { diff --git a/src/backends/reference/workloads/RefNormalizationFloat32Workload.hpp b/src/backends/reference/workloads/RefNormalizationFloat32Workload.hpp index 2358c60aec..9dff187bd4 100644 --- a/src/backends/reference/workloads/RefNormalizationFloat32Workload.hpp +++ b/src/backends/reference/workloads/RefNormalizationFloat32Workload.hpp @@ -5,8 +5,8 @@ #pragma once -#include <backends/Workload.hpp> -#include <backends/WorkloadData.hpp> +#include <backendsCommon/Workload.hpp> +#include <backendsCommon/WorkloadData.hpp> namespace armnn { diff --git a/src/backends/reference/workloads/RefPadWorkload.hpp b/src/backends/reference/workloads/RefPadWorkload.hpp index 938fcf2004..8c6d01351b 100644 --- a/src/backends/reference/workloads/RefPadWorkload.hpp +++ b/src/backends/reference/workloads/RefPadWorkload.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> diff --git a/src/backends/reference/workloads/RefPermuteWorkload.hpp b/src/backends/reference/workloads/RefPermuteWorkload.hpp index 50caa3e9ec..a2d32331b2 100644 --- a/src/backends/reference/workloads/RefPermuteWorkload.hpp +++ b/src/backends/reference/workloads/RefPermuteWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backends/Workload.hpp> +#include <backendsCommon/Workload.hpp> #include <armnn/TypesUtils.hpp> diff --git a/src/backends/reference/workloads/RefPooling2dFloat32Workload.hpp b/src/backends/reference/workloads/RefPooling2dFloat32Workload.hpp index 6387cb25c5..e347cec052 100644 --- a/src/backends/reference/workloads/RefPooling2dFloat32Workload.hpp +++ b/src/backends/reference/workloads/RefPooling2dFloat32Workload.hpp @@ -5,8 +5,8 @@ #pragma once -#include <backends/Workload.hpp> -#include <backends/WorkloadData.hpp> +#include <backendsCommon/Workload.hpp> +#include <backendsCommon/WorkloadData.hpp> namespace armnn { diff --git a/src/backends/reference/workloads/RefPooling2dUint8Workload.hpp b/src/backends/reference/workloads/RefPooling2dUint8Workload.hpp index 3802051015..9f910248dc 100644 --- a/src/backends/reference/workloads/RefPooling2dUint8Workload.hpp +++ b/src/backends/reference/workloads/RefPooling2dUint8Workload.hpp @@ -5,8 +5,8 @@ #pragma once -#include <backends/Workload.hpp> -#include <backends/WorkloadData.hpp> +#include <backendsCommon/Workload.hpp> +#include <backendsCommon/WorkloadData.hpp> namespace armnn { diff --git a/src/backends/reference/workloads/RefReshapeFloat32Workload.hpp b/src/backends/reference/workloads/RefReshapeFloat32Workload.hpp index 62de71a74b..75024b3db6 100644 --- a/src/backends/reference/workloads/RefReshapeFloat32Workload.hpp +++ b/src/backends/reference/workloads/RefReshapeFloat32Workload.hpp @@ -5,8 +5,8 @@ #pragma once -#include <backends/Workload.hpp> -#include <backends/WorkloadData.hpp> +#include <backendsCommon/Workload.hpp> +#include <backendsCommon/WorkloadData.hpp> namespace armnn { diff --git a/src/backends/reference/workloads/RefReshapeUint8Workload.hpp b/src/backends/reference/workloads/RefReshapeUint8Workload.hpp index 25d1001d70..c3d31f8a73 100644 --- a/src/backends/reference/workloads/RefReshapeUint8Workload.hpp +++ b/src/backends/reference/workloads/RefReshapeUint8Workload.hpp @@ -5,8 +5,8 @@ #pragma once -#include <backends/Workload.hpp> -#include <backends/WorkloadData.hpp> +#include <backendsCommon/Workload.hpp> +#include <backendsCommon/WorkloadData.hpp> namespace armnn { diff --git a/src/backends/reference/workloads/RefResizeBilinearFloat32Workload.hpp b/src/backends/reference/workloads/RefResizeBilinearFloat32Workload.hpp index 1a8b5ba8a5..84d3a5161e 100644 --- a/src/backends/reference/workloads/RefResizeBilinearFloat32Workload.hpp +++ b/src/backends/reference/workloads/RefResizeBilinearFloat32Workload.hpp @@ -5,8 +5,8 @@ #pragma once -#include <backends/Workload.hpp> -#include <backends/WorkloadData.hpp> +#include <backendsCommon/Workload.hpp> +#include <backendsCommon/WorkloadData.hpp> namespace armnn { diff --git a/src/backends/reference/workloads/RefResizeBilinearUint8Workload.hpp b/src/backends/reference/workloads/RefResizeBilinearUint8Workload.hpp index 50a0c50a83..6380441716 100644 --- a/src/backends/reference/workloads/RefResizeBilinearUint8Workload.hpp +++ b/src/backends/reference/workloads/RefResizeBilinearUint8Workload.hpp @@ -5,8 +5,8 @@ #pragma once -#include <backends/Workload.hpp> -#include <backends/WorkloadData.hpp> +#include <backendsCommon/Workload.hpp> +#include <backendsCommon/WorkloadData.hpp> namespace armnn { diff --git a/src/backends/reference/workloads/RefSoftmaxFloat32Workload.hpp b/src/backends/reference/workloads/RefSoftmaxFloat32Workload.hpp index 8af0cc51e7..82ddfac303 100644 --- a/src/backends/reference/workloads/RefSoftmaxFloat32Workload.hpp +++ b/src/backends/reference/workloads/RefSoftmaxFloat32Workload.hpp @@ -5,8 +5,8 @@ #pragma once -#include <backends/Workload.hpp> -#include <backends/WorkloadData.hpp> +#include <backendsCommon/Workload.hpp> +#include <backendsCommon/WorkloadData.hpp> namespace armnn { diff --git a/src/backends/reference/workloads/RefSoftmaxUint8Workload.hpp b/src/backends/reference/workloads/RefSoftmaxUint8Workload.hpp index fe6a0d1a82..bb7b2143c1 100644 --- a/src/backends/reference/workloads/RefSoftmaxUint8Workload.hpp +++ b/src/backends/reference/workloads/RefSoftmaxUint8Workload.hpp @@ -5,8 +5,8 @@ #pragma once -#include <backends/Workload.hpp> -#include <backends/WorkloadData.hpp> +#include <backendsCommon/Workload.hpp> +#include <backendsCommon/WorkloadData.hpp> namespace armnn { diff --git a/src/backends/reference/workloads/RefSplitterFloat32Workload.hpp b/src/backends/reference/workloads/RefSplitterFloat32Workload.hpp index 5d6ef653c1..502eb3555f 100644 --- a/src/backends/reference/workloads/RefSplitterFloat32Workload.hpp +++ b/src/backends/reference/workloads/RefSplitterFloat32Workload.hpp @@ -5,8 +5,8 @@ #pragma once -#include <backends/Workload.hpp> -#include <backends/WorkloadData.hpp> +#include <backendsCommon/Workload.hpp> +#include <backendsCommon/WorkloadData.hpp> namespace armnn { diff --git a/src/backends/reference/workloads/RefSplitterUint8Workload.hpp b/src/backends/reference/workloads/RefSplitterUint8Workload.hpp index 5dac92a73b..d9b6aaf639 100644 --- a/src/backends/reference/workloads/RefSplitterUint8Workload.hpp +++ b/src/backends/reference/workloads/RefSplitterUint8Workload.hpp @@ -5,8 +5,8 @@ #pragma once -#include <backends/Workload.hpp> -#include <backends/WorkloadData.hpp> +#include <backendsCommon/Workload.hpp> +#include <backendsCommon/WorkloadData.hpp> namespace armnn { diff --git a/src/backends/reference/workloads/RefWorkloadUtils.hpp b/src/backends/reference/workloads/RefWorkloadUtils.hpp index 67a1f5e867..feb43290b4 100644 --- a/src/backends/reference/workloads/RefWorkloadUtils.hpp +++ b/src/backends/reference/workloads/RefWorkloadUtils.hpp @@ -5,11 +5,11 @@ #pragma once -#include <backends/CpuTensorHandle.hpp> +#include <backendsCommon/CpuTensorHandle.hpp> #include <armnn/Tensor.hpp> #include <armnn/Types.hpp> -#include <armnnUtils/Half.hpp> +#include <Half.hpp> #include <boost/polymorphic_cast.hpp> diff --git a/src/backends/reference/workloads/Splitter.hpp b/src/backends/reference/workloads/Splitter.hpp index 4d6f673359..0e522d5ad5 100644 --- a/src/backends/reference/workloads/Splitter.hpp +++ b/src/backends/reference/workloads/Splitter.hpp @@ -7,7 +7,7 @@ #include "RefWorkloadUtils.hpp" -#include <backends/WorkloadData.hpp> +#include <backendsCommon/WorkloadData.hpp> #include <armnn/Tensor.hpp> #include <boost/assert.hpp> |