diff options
| author | Aron Virginas-Tar <Aron.Virginas-Tar@arm.com> | 2018-11-01 16:15:57 +0000 |
|---|---|---|
| committer | Aron Virginas-Tar <Aron.Virginas-Tar@arm.com> | 2018-11-02 14:49:21 +0000 |
| commit | c9cc80455ff29fd2c8622c9487ec9c57ade6ea30 (patch) | |
| tree | 41b1491312fe6082b39d5d37ffa0dcf0ab0f2817 | |
| parent | 207ef9a6b8b3ea0afe9a095639f67b5dedd095d7 (diff) | |
| download | armnn-c9cc80455ff29fd2c8622c9487ec9c57ade6ea30.tar.gz | |
IVGCVSW-1946: Remove armnn/src from the include paths
Change-Id: I663a0a0fccb43ee960ec070121a59df9db0bb04e
318 files changed, 744 insertions, 690 deletions
diff --git a/Android.mk b/Android.mk index cf5566fa96..ee24312156 100644 --- a/Android.mk +++ b/Android.mk @@ -13,10 +13,10 @@ ARMNN_HEADER_PATH := $(LOCAL_PATH)/include ARMNN_MAIN_HEADER_PATH := $(LOCAL_PATH)/src ARMNN_SOURCE_HEADER_PATH := $(LOCAL_PATH)/src/armnn ARMNN_SOURCE_UTILS_HEADER_PATH := $(LOCAL_PATH)/src/armnnUtils +ARMNN_BACKENDS_HEADER_PATH := $(LOCAL_PATH)/src/backends # find the common.mk and backend.mk files in the backend source folders -ARMNN_BACKEND_COMMON_MAKEFILE_LOCAL_PATHS := $(wildcard $(LOCAL_PATH)/src/backends/*/common.mk) \ - $(LOCAL_PATH)/src/backends/common.mk +ARMNN_BACKEND_COMMON_MAKEFILE_LOCAL_PATHS := $(wildcard $(LOCAL_PATH)/src/backends/*/common.mk) ARMNN_BACKEND_COMMON_MAKEFILE_PATHS := $(subst $(LOCAL_PATH),,$(ARMNN_BACKEND_COMMON_MAKEFILE_LOCAL_PATHS)) ARMNN_BACKEND_COMMON_MAKEFILE_DIRS := $(subst /common.mk,,$(ARMNN_BACKEND_COMMON_MAKEFILE_PATHS)) @@ -57,7 +57,8 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk \ LOCAL_EXPORT_C_INCLUDES := \ $(ARMNN_MAIN_HEADER_PATH) \ $(ARMNN_SOURCE_HEADER_PATH) \ - $(ARMNN_SOURCE_UTILS_HEADER_PATH) + $(ARMNN_SOURCE_UTILS_HEADER_PATH) \ + $(ARMNN_BACKENDS_HEADER_PATH) LOCAL_C_INCLUDES := \ $(OPENCL_HEADER_PATH) \ @@ -65,7 +66,8 @@ LOCAL_C_INCLUDES := \ $(ARMNN_HEADER_PATH) \ $(ARMNN_MAIN_HEADER_PATH) \ $(ARMNN_SOURCE_HEADER_PATH) \ - $(ARMNN_SOURCE_UTILS_HEADER_PATH) + $(ARMNN_SOURCE_UTILS_HEADER_PATH) \ + $(ARMNN_BACKENDS_HEADER_PATH) LOCAL_SRC_FILES := \ $(ARMNN_BACKEND_SOURCES) \ @@ -182,7 +184,8 @@ LOCAL_C_INCLUDES := \ $(ARMNN_HEADER_PATH) \ $(ARMNN_MAIN_HEADER_PATH) \ $(ARMNN_SOURCE_HEADER_PATH) \ - $(ARMNN_SOURCE_UTILS_HEADER_PATH) + $(ARMNN_SOURCE_UTILS_HEADER_PATH) \ + $(ARMNN_BACKENDS_HEADER_PATH) LOCAL_CFLAGS := \ -std=c++14 \ diff --git a/CMakeLists.txt b/CMakeLists.txt index 23c79bf543..e8d00deb21 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -303,9 +303,9 @@ endforeach() add_library_ex(armnn SHARED ${armnn_sources}) -target_include_directories(armnn PRIVATE src) target_include_directories(armnn PRIVATE src/armnn) target_include_directories(armnn PRIVATE src/armnnUtils) +target_include_directories(armnn PRIVATE src/backends) target_link_libraries(armnn armnnUtils) @@ -456,9 +456,9 @@ if(BUILD_UNIT_TESTS) endforeach() add_executable(UnitTests ${unittest_sources}) - target_include_directories(UnitTests PRIVATE src) target_include_directories(UnitTests PRIVATE src/armnn) target_include_directories(UnitTests PRIVATE src/armnnUtils) + target_include_directories(UnitTests PRIVATE src/backends) if(VALGRIND_FOUND) if(HEAP_PROFILING OR LEAK_CHECKING) diff --git a/src/armnn/Layer.cpp b/src/armnn/Layer.cpp index 08a8bc3211..c8c39f1cad 100644 --- a/src/armnn/Layer.cpp +++ b/src/armnn/Layer.cpp @@ -5,8 +5,8 @@ #include "Layer.hpp" #include "Graph.hpp" -#include <backends/WorkloadData.hpp> -#include <backends/CpuTensorHandle.hpp> +#include <backendsCommon/WorkloadData.hpp> +#include <backendsCommon/CpuTensorHandle.hpp> #include <boost/cast.hpp> #include <boost/format.hpp> diff --git a/src/armnn/Layer.hpp b/src/armnn/Layer.hpp index a969607100..8d660ed6e0 100644 --- a/src/armnn/Layer.hpp +++ b/src/armnn/Layer.hpp @@ -6,9 +6,9 @@ #include "LayerFwd.hpp" -#include <backends/OutputHandler.hpp> -#include <backends/WorkloadDataCollector.hpp> -#include <backends/WorkloadInfo.hpp> +#include <backendsCommon/OutputHandler.hpp> +#include <backendsCommon/WorkloadDataCollector.hpp> +#include <backendsCommon/WorkloadInfo.hpp> #include "InternalTypes.hpp" #include "SerializeLayerParameters.hpp" diff --git a/src/armnn/LayerSupport.cpp b/src/armnn/LayerSupport.cpp index 325699d9ff..e3009e26fd 100644 --- a/src/armnn/LayerSupport.cpp +++ b/src/armnn/LayerSupport.cpp @@ -5,7 +5,7 @@ #include <armnn/LayerSupport.hpp> #include <armnn/Optional.hpp> -#include <backends/LayerSupportRegistry.hpp> +#include <backendsCommon/LayerSupportRegistry.hpp> #include <boost/assert.hpp> diff --git a/src/armnn/LoadedNetwork.cpp b/src/armnn/LoadedNetwork.cpp index 616a0327fe..97c836079e 100644 --- a/src/armnn/LoadedNetwork.cpp +++ b/src/armnn/LoadedNetwork.cpp @@ -11,8 +11,8 @@ #include "Profiling.hpp" #include "HeapProfiling.hpp" -#include <backends/CpuTensorHandle.hpp> -#include <backends/BackendRegistry.hpp> +#include <backendsCommon/CpuTensorHandle.hpp> +#include <backendsCommon/BackendRegistry.hpp> #include <boost/polymorphic_cast.hpp> #include <boost/assert.hpp> diff --git a/src/armnn/LoadedNetwork.hpp b/src/armnn/LoadedNetwork.hpp index 21de1440f1..b36b69bca3 100644 --- a/src/armnn/LoadedNetwork.hpp +++ b/src/armnn/LoadedNetwork.hpp @@ -11,9 +11,9 @@ #include "LayerFwd.hpp" #include "Profiling.hpp" -#include <backends/IBackendInternal.hpp> -#include <backends/Workload.hpp> -#include <backends/WorkloadFactory.hpp> +#include <backendsCommon/IBackendInternal.hpp> +#include <backendsCommon/Workload.hpp> +#include <backendsCommon/WorkloadFactory.hpp> #include <mutex> #include <unordered_map> diff --git a/src/armnn/Network.cpp b/src/armnn/Network.cpp index 20c67160c0..43782e0982 100644 --- a/src/armnn/Network.cpp +++ b/src/armnn/Network.cpp @@ -9,8 +9,8 @@ #include "Optimizer.hpp" #include "optimizations/All.hpp" -#include <backends/CpuTensorHandle.hpp> -#include <backends/WorkloadFactory.hpp> +#include <backendsCommon/CpuTensorHandle.hpp> +#include <backendsCommon/WorkloadFactory.hpp> #include <armnn/Exceptions.hpp> #include <armnn/Utils.hpp> diff --git a/src/armnn/Runtime.cpp b/src/armnn/Runtime.cpp index a0aca6ebc7..769136486d 100644 --- a/src/armnn/Runtime.cpp +++ b/src/armnn/Runtime.cpp @@ -5,8 +5,8 @@ #include "Runtime.hpp" #include <armnn/Version.hpp> -#include <backends/BackendRegistry.hpp> -#include <backends/BackendContextRegistry.hpp> +#include <backendsCommon/BackendRegistry.hpp> +#include <backendsCommon/BackendContextRegistry.hpp> #include <iostream> diff --git a/src/armnn/Runtime.hpp b/src/armnn/Runtime.hpp index 2679e3cc98..694e1e5f9a 100644 --- a/src/armnn/Runtime.hpp +++ b/src/armnn/Runtime.hpp @@ -10,7 +10,7 @@ #include <armnn/IRuntime.hpp> #include <armnn/Tensor.hpp> #include <armnn/BackendId.hpp> -#include <backends/IBackendContext.hpp> +#include <backendsCommon/IBackendContext.hpp> #include <mutex> #include <unordered_map> diff --git a/src/armnn/TypeUtils.hpp b/src/armnn/TypeUtils.hpp index cd19211a66..57d019bd69 100644 --- a/src/armnn/TypeUtils.hpp +++ b/src/armnn/TypeUtils.hpp @@ -6,7 +6,7 @@ #pragma once #include "armnn/Types.hpp" -#include "armnnUtils/Half.hpp" +#include "Half.hpp" namespace armnn { diff --git a/src/armnn/layers/ActivationLayer.cpp b/src/armnn/layers/ActivationLayer.cpp index 2d1a0f10be..401ab299c3 100644 --- a/src/armnn/layers/ActivationLayer.cpp +++ b/src/armnn/layers/ActivationLayer.cpp @@ -6,8 +6,8 @@ #include "LayerCloneBase.hpp" #include <armnn/TypesUtils.hpp> -#include <backends/WorkloadData.hpp> -#include <backends/WorkloadFactory.hpp> +#include <backendsCommon/WorkloadData.hpp> +#include <backendsCommon/WorkloadFactory.hpp> namespace armnn { diff --git a/src/armnn/layers/AdditionLayer.cpp b/src/armnn/layers/AdditionLayer.cpp index fecd4d8d9b..0ccf398d37 100644 --- a/src/armnn/layers/AdditionLayer.cpp +++ b/src/armnn/layers/AdditionLayer.cpp @@ -7,8 +7,8 @@ #include "LayerCloneBase.hpp" #include <armnn/TypesUtils.hpp> -#include <backends/WorkloadData.hpp> -#include <backends/WorkloadFactory.hpp> +#include <backendsCommon/WorkloadData.hpp> +#include <backendsCommon/WorkloadFactory.hpp> namespace armnn { diff --git a/src/armnn/layers/BatchNormalizationLayer.cpp b/src/armnn/layers/BatchNormalizationLayer.cpp index 8aca0162d2..f461c8061b 100644 --- a/src/armnn/layers/BatchNormalizationLayer.cpp +++ b/src/armnn/layers/BatchNormalizationLayer.cpp @@ -7,8 +7,8 @@ #include "LayerCloneBase.hpp" #include <armnn/TypesUtils.hpp> -#include <backends/CpuTensorHandle.hpp> -#include <backends/WorkloadFactory.hpp> +#include <backendsCommon/CpuTensorHandle.hpp> +#include <backendsCommon/WorkloadFactory.hpp> namespace armnn { diff --git a/src/armnn/layers/ConstantLayer.cpp b/src/armnn/layers/ConstantLayer.cpp index 4c2cdcc67f..d8f265babb 100644 --- a/src/armnn/layers/ConstantLayer.cpp +++ b/src/armnn/layers/ConstantLayer.cpp @@ -6,9 +6,9 @@ #include "LayerCloneBase.hpp" #include <armnn/TypesUtils.hpp> -#include <backends/CpuTensorHandle.hpp> -#include <backends/WorkloadData.hpp> -#include <backends/WorkloadFactory.hpp> +#include <backendsCommon/CpuTensorHandle.hpp> +#include <backendsCommon/WorkloadData.hpp> +#include <backendsCommon/WorkloadFactory.hpp> namespace armnn { diff --git a/src/armnn/layers/ConvertFp16ToFp32Layer.cpp b/src/armnn/layers/ConvertFp16ToFp32Layer.cpp index 74c6f419bc..10c4ba4b4f 100644 --- a/src/armnn/layers/ConvertFp16ToFp32Layer.cpp +++ b/src/armnn/layers/ConvertFp16ToFp32Layer.cpp @@ -8,8 +8,8 @@ #include <armnn/TypesUtils.hpp> -#include <backends/WorkloadData.hpp> -#include <backends/WorkloadFactory.hpp> +#include <backendsCommon/WorkloadData.hpp> +#include <backendsCommon/WorkloadFactory.hpp> namespace armnn { diff --git a/src/armnn/layers/ConvertFp32ToFp16Layer.cpp b/src/armnn/layers/ConvertFp32ToFp16Layer.cpp index 0ca45ca38c..2bcc4e1917 100644 --- a/src/armnn/layers/ConvertFp32ToFp16Layer.cpp +++ b/src/armnn/layers/ConvertFp32ToFp16Layer.cpp @@ -7,8 +7,8 @@ #include "LayerCloneBase.hpp" #include <armnn/TypesUtils.hpp> -#include <backends/WorkloadData.hpp> -#include <backends/WorkloadFactory.hpp> +#include <backendsCommon/WorkloadData.hpp> +#include <backendsCommon/WorkloadFactory.hpp> namespace armnn { diff --git a/src/armnn/layers/Convolution2dLayer.cpp b/src/armnn/layers/Convolution2dLayer.cpp index d611aedc06..f3597e2914 100644 --- a/src/armnn/layers/Convolution2dLayer.cpp +++ b/src/armnn/layers/Convolution2dLayer.cpp @@ -7,8 +7,8 @@ #include "LayerCloneBase.hpp" #include <armnn/TypesUtils.hpp> -#include <backends/CpuTensorHandle.hpp> -#include <backends/WorkloadFactory.hpp> +#include <backendsCommon/CpuTensorHandle.hpp> +#include <backendsCommon/WorkloadFactory.hpp> namespace armnn { diff --git a/src/armnn/layers/DepthwiseConvolution2dLayer.cpp b/src/armnn/layers/DepthwiseConvolution2dLayer.cpp index d80d3f1332..f356e39335 100644 --- a/src/armnn/layers/DepthwiseConvolution2dLayer.cpp +++ b/src/armnn/layers/DepthwiseConvolution2dLayer.cpp @@ -7,8 +7,8 @@ #include "LayerCloneBase.hpp" #include <armnn/TypesUtils.hpp> -#include <backends/CpuTensorHandle.hpp> -#include <backends/WorkloadFactory.hpp> +#include <backendsCommon/CpuTensorHandle.hpp> +#include <backendsCommon/WorkloadFactory.hpp> namespace armnn { diff --git a/src/armnn/layers/DivisionLayer.cpp b/src/armnn/layers/DivisionLayer.cpp index d454a12ce3..f667dc9545 100644 --- a/src/armnn/layers/DivisionLayer.cpp +++ b/src/armnn/layers/DivisionLayer.cpp @@ -7,8 +7,8 @@ #include "LayerCloneBase.hpp" #include <armnn/TypesUtils.hpp> -#include <backends/WorkloadData.hpp> -#include <backends/WorkloadFactory.hpp> +#include <backendsCommon/WorkloadData.hpp> +#include <backendsCommon/WorkloadFactory.hpp> namespace armnn { diff --git a/src/armnn/layers/FakeQuantizationLayer.cpp b/src/armnn/layers/FakeQuantizationLayer.cpp index e507aa9717..15f862ecac 100644 --- a/src/armnn/layers/FakeQuantizationLayer.cpp +++ b/src/armnn/layers/FakeQuantizationLayer.cpp @@ -7,8 +7,8 @@ #include "LayerCloneBase.hpp" #include <armnn/TypesUtils.hpp> -#include <backends/WorkloadData.hpp> -#include <backends/WorkloadFactory.hpp> +#include <backendsCommon/WorkloadData.hpp> +#include <backendsCommon/WorkloadFactory.hpp> namespace armnn { diff --git a/src/armnn/layers/FloorLayer.cpp b/src/armnn/layers/FloorLayer.cpp index bf2479aa51..ddf1294139 100644 --- a/src/armnn/layers/FloorLayer.cpp +++ b/src/armnn/layers/FloorLayer.cpp @@ -7,8 +7,8 @@ #include "LayerCloneBase.hpp" #include <armnn/TypesUtils.hpp> -#include <backends/WorkloadData.hpp> -#include <backends/WorkloadFactory.hpp> +#include <backendsCommon/WorkloadData.hpp> +#include <backendsCommon/WorkloadFactory.hpp> namespace armnn { diff --git a/src/armnn/layers/FullyConnectedLayer.cpp b/src/armnn/layers/FullyConnectedLayer.cpp index ec83bf688c..e003c7350a 100644 --- a/src/armnn/layers/FullyConnectedLayer.cpp +++ b/src/armnn/layers/FullyConnectedLayer.cpp @@ -7,9 +7,9 @@ #include "LayerCloneBase.hpp" #include <armnn/TypesUtils.hpp> -#include <backends/CpuTensorHandle.hpp> -#include <backends/WorkloadData.hpp> -#include <backends/WorkloadFactory.hpp> +#include <backendsCommon/CpuTensorHandle.hpp> +#include <backendsCommon/WorkloadData.hpp> +#include <backendsCommon/WorkloadFactory.hpp> namespace armnn { diff --git a/src/armnn/layers/InputLayer.cpp b/src/armnn/layers/InputLayer.cpp index 6556302529..0b6d5d2a0b 100644 --- a/src/armnn/layers/InputLayer.cpp +++ b/src/armnn/layers/InputLayer.cpp @@ -6,8 +6,8 @@ #include "LayerCloneBase.hpp" -#include <backends/WorkloadData.hpp> -#include <backends/WorkloadFactory.hpp> +#include <backendsCommon/WorkloadData.hpp> +#include <backendsCommon/WorkloadFactory.hpp> namespace armnn { diff --git a/src/armnn/layers/L2NormalizationLayer.cpp b/src/armnn/layers/L2NormalizationLayer.cpp index 683c7db781..2a9fde91ee 100644 --- a/src/armnn/layers/L2NormalizationLayer.cpp +++ b/src/armnn/layers/L2NormalizationLayer.cpp @@ -7,8 +7,8 @@ #include "LayerCloneBase.hpp" #include <armnn/TypesUtils.hpp> -#include <backends/WorkloadData.hpp> -#include <backends/WorkloadFactory.hpp> +#include <backendsCommon/WorkloadData.hpp> +#include <backendsCommon/WorkloadFactory.hpp> namespace armnn { diff --git a/src/armnn/layers/LstmLayer.cpp b/src/armnn/layers/LstmLayer.cpp index 296c973d33..866c837357 100644 --- a/src/armnn/layers/LstmLayer.cpp +++ b/src/armnn/layers/LstmLayer.cpp @@ -7,8 +7,8 @@ #include "LayerCloneBase.hpp" #include <armnn/TypesUtils.hpp> -#include <backends/CpuTensorHandle.hpp> -#include <backends/WorkloadFactory.hpp> +#include <backendsCommon/CpuTensorHandle.hpp> +#include <backendsCommon/WorkloadFactory.hpp> namespace armnn { diff --git a/src/armnn/layers/MeanLayer.cpp b/src/armnn/layers/MeanLayer.cpp index d1c4591c92..e45f1a8d2d 100644 --- a/src/armnn/layers/MeanLayer.cpp +++ b/src/armnn/layers/MeanLayer.cpp @@ -6,9 +6,9 @@ #include "MeanLayer.hpp" #include "LayerCloneBase.hpp" -#include <backends/CpuTensorHandle.hpp> -#include <backends/WorkloadData.hpp> -#include <backends/WorkloadFactory.hpp> +#include <backendsCommon/CpuTensorHandle.hpp> +#include <backendsCommon/WorkloadData.hpp> +#include <backendsCommon/WorkloadFactory.hpp> #include <cstring> diff --git a/src/armnn/layers/MemCopyLayer.cpp b/src/armnn/layers/MemCopyLayer.cpp index c10584ff2e..e3138d2dee 100644 --- a/src/armnn/layers/MemCopyLayer.cpp +++ b/src/armnn/layers/MemCopyLayer.cpp @@ -7,9 +7,9 @@ #include "LayerCloneBase.hpp" #include <armnn/TypesUtils.hpp> -#include <backends/WorkloadData.hpp> -#include <backends/WorkloadFactory.hpp> -#include <backends/MemCopyWorkload.hpp> +#include <backendsCommon/WorkloadData.hpp> +#include <backendsCommon/WorkloadFactory.hpp> +#include <backendsCommon/MemCopyWorkload.hpp> namespace armnn { diff --git a/src/armnn/layers/MergerLayer.cpp b/src/armnn/layers/MergerLayer.cpp index f73f55b3c1..e80661a493 100644 --- a/src/armnn/layers/MergerLayer.cpp +++ b/src/armnn/layers/MergerLayer.cpp @@ -6,8 +6,8 @@ #include "LayerCloneBase.hpp" #include <armnn/TypesUtils.hpp> -#include <backends/WorkloadData.hpp> -#include <backends/WorkloadFactory.hpp> +#include <backendsCommon/WorkloadData.hpp> +#include <backendsCommon/WorkloadFactory.hpp> #include <queue> diff --git a/src/armnn/layers/MultiplicationLayer.cpp b/src/armnn/layers/MultiplicationLayer.cpp index 8a0edf42da..2abcf8609d 100644 --- a/src/armnn/layers/MultiplicationLayer.cpp +++ b/src/armnn/layers/MultiplicationLayer.cpp @@ -7,8 +7,8 @@ #include "LayerCloneBase.hpp" #include <armnn/TypesUtils.hpp> -#include <backends/WorkloadData.hpp> -#include <backends/WorkloadFactory.hpp> +#include <backendsCommon/WorkloadData.hpp> +#include <backendsCommon/WorkloadFactory.hpp> namespace armnn { diff --git a/src/armnn/layers/NormalizationLayer.cpp b/src/armnn/layers/NormalizationLayer.cpp index 1fc2bb496f..140d628452 100644 --- a/src/armnn/layers/NormalizationLayer.cpp +++ b/src/armnn/layers/NormalizationLayer.cpp @@ -7,8 +7,8 @@ #include "LayerCloneBase.hpp" #include <armnn/TypesUtils.hpp> -#include <backends/WorkloadData.hpp> -#include <backends/WorkloadFactory.hpp> +#include <backendsCommon/WorkloadData.hpp> +#include <backendsCommon/WorkloadFactory.hpp> namespace armnn { diff --git a/src/armnn/layers/OutputLayer.cpp b/src/armnn/layers/OutputLayer.cpp index 211e097718..db11a3d005 100644 --- a/src/armnn/layers/OutputLayer.cpp +++ b/src/armnn/layers/OutputLayer.cpp @@ -6,8 +6,8 @@ #include "LayerCloneBase.hpp" -#include <backends/WorkloadData.hpp> -#include <backends/WorkloadFactory.hpp> +#include <backendsCommon/WorkloadData.hpp> +#include <backendsCommon/WorkloadFactory.hpp> namespace armnn { diff --git a/src/armnn/layers/PadLayer.cpp b/src/armnn/layers/PadLayer.cpp index 7511e80dae..5e5f8ca106 100644 --- a/src/armnn/layers/PadLayer.cpp +++ b/src/armnn/layers/PadLayer.cpp @@ -6,9 +6,9 @@ #include "PadLayer.hpp" #include "LayerCloneBase.hpp" -#include <backends/CpuTensorHandle.hpp> -#include <backends/WorkloadData.hpp> -#include <backends/WorkloadFactory.hpp> +#include <backendsCommon/CpuTensorHandle.hpp> +#include <backendsCommon/WorkloadData.hpp> +#include <backendsCommon/WorkloadFactory.hpp> #include <cstring> diff --git a/src/armnn/layers/PermuteLayer.cpp b/src/armnn/layers/PermuteLayer.cpp index ab7a3e5f91..6d0d7e011f 100644 --- a/src/armnn/layers/PermuteLayer.cpp +++ b/src/armnn/layers/PermuteLayer.cpp @@ -7,8 +7,8 @@ #include "LayerCloneBase.hpp" #include <armnn/TypesUtils.hpp> -#include <backends/WorkloadData.hpp> -#include <backends/WorkloadFactory.hpp> +#include <backendsCommon/WorkloadData.hpp> +#include <backendsCommon/WorkloadFactory.hpp> #include <Permute.hpp> diff --git a/src/armnn/layers/Pooling2dLayer.cpp b/src/armnn/layers/Pooling2dLayer.cpp index 779ac2041e..821c011cd0 100644 --- a/src/armnn/layers/Pooling2dLayer.cpp +++ b/src/armnn/layers/Pooling2dLayer.cpp @@ -7,8 +7,8 @@ #include "LayerCloneBase.hpp" #include <armnn/TypesUtils.hpp> -#include <backends/WorkloadData.hpp> -#include <backends/WorkloadFactory.hpp> +#include <backendsCommon/WorkloadData.hpp> +#include <backendsCommon/WorkloadFactory.hpp> namespace armnn { diff --git a/src/armnn/layers/ReshapeLayer.cpp b/src/armnn/layers/ReshapeLayer.cpp index a3cc96aa19..2a069808f1 100644 --- a/src/armnn/layers/ReshapeLayer.cpp +++ b/src/armnn/layers/ReshapeLayer.cpp @@ -7,8 +7,8 @@ #include "LayerCloneBase.hpp" #include <armnn/TypesUtils.hpp> -#include <backends/WorkloadData.hpp> -#include <backends/WorkloadFactory.hpp> +#include <backendsCommon/WorkloadData.hpp> +#include <backendsCommon/WorkloadFactory.hpp> namespace armnn { diff --git a/src/armnn/layers/ResizeBilinearLayer.cpp b/src/armnn/layers/ResizeBilinearLayer.cpp index fda93da99f..69ce69eea5 100644 --- a/src/armnn/layers/ResizeBilinearLayer.cpp +++ b/src/armnn/layers/ResizeBilinearLayer.cpp @@ -7,8 +7,8 @@ #include "LayerCloneBase.hpp" #include <armnn/TypesUtils.hpp> -#include <backends/WorkloadData.hpp> -#include <backends/WorkloadFactory.hpp> +#include <backendsCommon/WorkloadData.hpp> +#include <backendsCommon/WorkloadFactory.hpp> namespace armnn { diff --git a/src/armnn/layers/SoftmaxLayer.cpp b/src/armnn/layers/SoftmaxLayer.cpp index 1c12c04989..4c2456d49c 100644 --- a/src/armnn/layers/SoftmaxLayer.cpp +++ b/src/armnn/layers/SoftmaxLayer.cpp @@ -7,8 +7,8 @@ #include "LayerCloneBase.hpp" #include <armnn/TypesUtils.hpp> -#include <backends/WorkloadData.hpp> -#include <backends/WorkloadFactory.hpp> +#include <backendsCommon/WorkloadData.hpp> +#include <backendsCommon/WorkloadFactory.hpp> namespace armnn { diff --git a/src/armnn/layers/SpaceToBatchNdLayer.cpp b/src/armnn/layers/SpaceToBatchNdLayer.cpp index 9c87ab5975..cc93886e50 100644 --- a/src/armnn/layers/SpaceToBatchNdLayer.cpp +++ b/src/armnn/layers/SpaceToBatchNdLayer.cpp @@ -8,8 +8,9 @@ #include "LayerCloneBase.hpp" #include <armnn/TypesUtils.hpp> -#include <backends/WorkloadData.hpp> -#include <backends/WorkloadFactory.hpp> + +#include <backendsCommon/WorkloadData.hpp> +#include <backendsCommon/WorkloadFactory.hpp> #include <numeric> diff --git a/src/armnn/layers/SplitterLayer.cpp b/src/armnn/layers/SplitterLayer.cpp index 1e4c36e92f..5cf1f6b3b1 100644 --- a/src/armnn/layers/SplitterLayer.cpp +++ b/src/armnn/layers/SplitterLayer.cpp @@ -7,8 +7,8 @@ #include "LayerCloneBase.hpp" #include <armnn/TypesUtils.hpp> -#include <backends/WorkloadData.hpp> -#include <backends/WorkloadFactory.hpp> +#include <backendsCommon/WorkloadData.hpp> +#include <backendsCommon/WorkloadFactory.hpp> namespace armnn { diff --git a/src/armnn/layers/SubtractionLayer.cpp b/src/armnn/layers/SubtractionLayer.cpp index 6239868b11..2b158acadd 100644 --- a/src/armnn/layers/SubtractionLayer.cpp +++ b/src/armnn/layers/SubtractionLayer.cpp @@ -7,8 +7,8 @@ #include "LayerCloneBase.hpp" #include <armnn/TypesUtils.hpp> -#include <backends/WorkloadData.hpp> -#include <backends/WorkloadFactory.hpp> +#include <backendsCommon/WorkloadData.hpp> +#include <backendsCommon/WorkloadFactory.hpp> namespace armnn { diff --git a/src/armnn/optimizations/ConvertConstants.hpp b/src/armnn/optimizations/ConvertConstants.hpp index d92ea28717..bb38ae8811 100644 --- a/src/armnn/optimizations/ConvertConstants.hpp +++ b/src/armnn/optimizations/ConvertConstants.hpp @@ -7,10 +7,10 @@ #include "Optimization.hpp" -#include <backends/CpuTensorHandle.hpp> +#include <backendsCommon/CpuTensorHandle.hpp> #include <FloatingPointConverter.hpp> -#include <armnnUtils/Half.hpp> +#include <Half.hpp> namespace armnn { diff --git a/src/armnn/test/CreateWorkload.hpp b/src/armnn/test/CreateWorkload.hpp index c0d2ab1c7f..07f9079b5d 100644 --- a/src/armnn/test/CreateWorkload.hpp +++ b/src/armnn/test/CreateWorkload.hpp @@ -8,9 +8,9 @@ #include <boost/cast.hpp> -#include <backends/WorkloadData.hpp> -#include <backends/WorkloadFactory.hpp> -#include <backends/CpuTensorHandle.hpp> +#include <backendsCommon/WorkloadData.hpp> +#include <backendsCommon/WorkloadFactory.hpp> +#include <backendsCommon/CpuTensorHandle.hpp> #include <Graph.hpp> @@ -54,7 +54,7 @@ void CreateTensorHandles(armnn::Graph& graph, armnn::IWorkloadFactory& factory) } ///////////////////////////////////////////////////////////////////////////////////////////// -// The following functions are called by backends/test/CreateWorkload*.cpp +// The following functions are called by backendsCommon/test/CreateWorkload*.cpp // They build very simple graphs, and then create a workload. // Some checks are performed on the workload to ensure parameters have been passed correctly. // They return the created workloads so that backend-specific checks can be performed. diff --git a/src/armnn/test/EndToEndTest.cpp b/src/armnn/test/EndToEndTest.cpp index 4f202f174e..d25e197f63 100644 --- a/src/armnn/test/EndToEndTest.cpp +++ b/src/armnn/test/EndToEndTest.cpp @@ -7,7 +7,7 @@ #include <armnn/IRuntime.hpp> #include <armnn/INetwork.hpp> -#include <backends/test/QuantizeHelper.hpp> +#include <backendsCommon/test/QuantizeHelper.hpp> #include <boost/core/ignore_unused.hpp> #include <boost/test/unit_test.hpp> diff --git a/src/armnn/test/FloatingPointConverterTest.cpp b/src/armnn/test/FloatingPointConverterTest.cpp index ec4288c438..9299b90e29 100644 --- a/src/armnn/test/FloatingPointConverterTest.cpp +++ b/src/armnn/test/FloatingPointConverterTest.cpp @@ -4,7 +4,7 @@ // #include "FloatingPointConverter.hpp" -#include <armnnUtils/Half.hpp> +#include <Half.hpp> #include <malloc.h> #include <iostream> diff --git a/src/armnn/test/GraphTests.cpp b/src/armnn/test/GraphTests.cpp index e99cb153fc..0c0ba8b000 100644 --- a/src/armnn/test/GraphTests.cpp +++ b/src/armnn/test/GraphTests.cpp @@ -13,7 +13,7 @@ #include <Graph.hpp> #include <Layer.hpp> -#include <backends/CpuTensorHandle.hpp> +#include <backendsCommon/CpuTensorHandle.hpp> /// Checks that first comes before second in the order. diff --git a/src/armnn/test/GraphUtils.hpp b/src/armnn/test/GraphUtils.hpp index 3325405eaf..04f9727dc0 100644 --- a/src/armnn/test/GraphUtils.hpp +++ b/src/armnn/test/GraphUtils.hpp @@ -4,7 +4,7 @@ // #pragma once -#include <armnn/Graph.hpp> +#include <Graph.hpp> #include <string> diff --git a/src/armnn/test/NetworkTests.cpp b/src/armnn/test/NetworkTests.cpp index 91ff7fa983..0963df6222 100644 --- a/src/armnn/test/NetworkTests.cpp +++ b/src/armnn/test/NetworkTests.cpp @@ -6,7 +6,7 @@ #include "GraphUtils.hpp" #include <armnn/ArmNN.hpp> -#include <armnn/Network.hpp> +#include <Network.hpp> #include <boost/test/unit_test.hpp> diff --git a/src/armnn/test/OptimizerTests.cpp b/src/armnn/test/OptimizerTests.cpp index 30df6eb0e6..8bd7d3dbee 100644 --- a/src/armnn/test/OptimizerTests.cpp +++ b/src/armnn/test/OptimizerTests.cpp @@ -7,7 +7,7 @@ #include <armnn/ArmNN.hpp> #include <Graph.hpp> #include <Optimizer.hpp> -#include <backends/CpuTensorHandle.hpp> +#include <backendsCommon/CpuTensorHandle.hpp> #include <FloatingPointConverter.hpp> namespace diff --git a/src/armnn/test/RuntimeTests.cpp b/src/armnn/test/RuntimeTests.cpp index 8a4e85ee23..08e3190414 100644 --- a/src/armnn/test/RuntimeTests.cpp +++ b/src/armnn/test/RuntimeTests.cpp @@ -6,11 +6,11 @@ #include <armnn/Descriptors.hpp> #include <armnn/IRuntime.hpp> #include <armnn/INetwork.hpp> -#include <armnn/Runtime.hpp> +#include <Runtime.hpp> #include <armnn/TypesUtils.hpp> -#include <armnnUtils/HeapProfiling.hpp> -#include <armnnUtils/LeakChecking.hpp> +#include <HeapProfiling.hpp> +#include <LeakChecking.hpp> #ifdef WITH_VALGRIND #include <valgrind/memcheck.h> diff --git a/src/armnn/test/RuntimeTests.hpp b/src/armnn/test/RuntimeTests.hpp index ba2a37baea..588a760472 100644 --- a/src/armnn/test/RuntimeTests.hpp +++ b/src/armnn/test/RuntimeTests.hpp @@ -4,7 +4,7 @@ // #pragma once -#include <armnn/Runtime.hpp> +#include <Runtime.hpp> namespace armnn { diff --git a/src/armnn/test/SubGraphTests.cpp b/src/armnn/test/SubGraphTests.cpp index 4f8b0a920c..e516ac0fa6 100644 --- a/src/armnn/test/SubGraphTests.cpp +++ b/src/armnn/test/SubGraphTests.cpp @@ -10,7 +10,7 @@ #include <SubGraph.hpp> #include <SubGraphSelector.hpp> -#include <backends/CpuTensorHandle.hpp> +#include <backendsCommon/CpuTensorHandle.hpp> using namespace armnn; diff --git a/src/armnn/test/TensorHelpers.hpp b/src/armnn/test/TensorHelpers.hpp index f1ab6c99b5..4501c3532c 100644 --- a/src/armnn/test/TensorHelpers.hpp +++ b/src/armnn/test/TensorHelpers.hpp @@ -18,7 +18,7 @@ #include <armnn/Tensor.hpp> -#include <backends/test/QuantizeHelper.hpp> +#include <backendsCommon/test/QuantizeHelper.hpp> #include <cmath> diff --git a/src/armnn/test/UnitTests.hpp b/src/armnn/test/UnitTests.hpp index e8c5908d72..40765e8e4f 100644 --- a/src/armnn/test/UnitTests.hpp +++ b/src/armnn/test/UnitTests.hpp @@ -6,8 +6,8 @@ #include <Logging.hpp> #include <armnn/Utils.hpp> -#include <backends/reference/RefWorkloadFactory.hpp> -#include <backends/test/LayerTests.hpp> +#include <reference/RefWorkloadFactory.hpp> +#include <backendsCommon/test/LayerTests.hpp> #include "TensorHelpers.hpp" #include <boost/test/unit_test.hpp> diff --git a/src/armnnTfLiteParser/test/ParserFlatbuffersFixture.hpp b/src/armnnTfLiteParser/test/ParserFlatbuffersFixture.hpp index 9c33b4f254..6247fc3153 100644 --- a/src/armnnTfLiteParser/test/ParserFlatbuffersFixture.hpp +++ b/src/armnnTfLiteParser/test/ParserFlatbuffersFixture.hpp @@ -15,7 +15,7 @@ #include "armnnTfLiteParser/ITfLiteParser.hpp" -#include <backends/BackendRegistry.hpp> +#include <backendsCommon/BackendRegistry.hpp> #include "flatbuffers/idl.h" #include "flatbuffers/util.h" diff --git a/src/armnnUtils/ParserPrototxtFixture.hpp b/src/armnnUtils/ParserPrototxtFixture.hpp index 2287de515a..b10590342e 100644 --- a/src/armnnUtils/ParserPrototxtFixture.hpp +++ b/src/armnnUtils/ParserPrototxtFixture.hpp @@ -6,13 +6,13 @@ #pragma once #include <armnn/IRuntime.hpp> -#include <armnn/test/TensorHelpers.hpp> +#include <test/TensorHelpers.hpp> #include <armnnOnnxParser/IOnnxParser.hpp> -#include <armnnUtils/VerificationHelpers.hpp> +#include <VerificationHelpers.hpp> -#include <backends/BackendRegistry.hpp> +#include <backendsCommon/BackendRegistry.hpp> #include <boost/format.hpp> diff --git a/src/backends/aclCommon/ArmComputeTensorUtils.cpp b/src/backends/aclCommon/ArmComputeTensorUtils.cpp index d48408c430..9fb78f8a80 100644 --- a/src/backends/aclCommon/ArmComputeTensorUtils.cpp +++ b/src/backends/aclCommon/ArmComputeTensorUtils.cpp @@ -2,8 +2,8 @@ // Copyright © 2017 Arm Ltd. All rights reserved. // SPDX-License-Identifier: MIT // -#include <backends/aclCommon/ArmComputeTensorUtils.hpp> -#include <backends/aclCommon/ArmComputeUtils.hpp> +#include <aclCommon/ArmComputeTensorUtils.hpp> +#include <aclCommon/ArmComputeUtils.hpp> #include "armnn/Exceptions.hpp" #include <armnn/Descriptors.hpp> diff --git a/src/backends/aclCommon/CMakeLists.txt b/src/backends/aclCommon/CMakeLists.txt index 9282e1056a..83c7c87cd0 100644 --- a/src/backends/aclCommon/CMakeLists.txt +++ b/src/backends/aclCommon/CMakeLists.txt @@ -28,6 +28,6 @@ if(BUILD_UNIT_TESTS) endif() add_library(armnnAclCommon OBJECT ${armnnAclCommon_sources}) -target_include_directories(armnnAclCommon PRIVATE ${PROJECT_SOURCE_DIR}/src) target_include_directories(armnnAclCommon PRIVATE ${PROJECT_SOURCE_DIR}/src/armnn) target_include_directories(armnnAclCommon PRIVATE ${PROJECT_SOURCE_DIR}/src/armnnUtils) +target_include_directories(armnnAclCommon PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) diff --git a/src/backends/aclCommon/memory/BaseMemoryManager.hpp b/src/backends/aclCommon/memory/BaseMemoryManager.hpp index 2afc1cb130..a6ffff7086 100644 --- a/src/backends/aclCommon/memory/BaseMemoryManager.hpp +++ b/src/backends/aclCommon/memory/BaseMemoryManager.hpp @@ -4,7 +4,7 @@ // #pragma once -#include <backends/WorkloadFactory.hpp> +#include <backendsCommon/WorkloadFactory.hpp> #ifdef ARMCOMPUTENEON_ENABLED #include <arm_compute/runtime/MemoryGroup.h> diff --git a/src/backends/aclCommon/test/CMakeLists.txt b/src/backends/aclCommon/test/CMakeLists.txt index 4378276961..637b724b14 100644 --- a/src/backends/aclCommon/test/CMakeLists.txt +++ b/src/backends/aclCommon/test/CMakeLists.txt @@ -10,6 +10,6 @@ list(APPEND armnnAclCommonUnitTests_sources ) add_library(armnnAclCommonUnitTests OBJECT ${armnnAclCommonUnitTests_sources}) -target_include_directories(armnnAclCommonUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src) target_include_directories(armnnAclCommonUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/armnn) target_include_directories(armnnAclCommonUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/armnnUtils) +target_include_directories(armnnAclCommonUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) diff --git a/src/backends/aclCommon/test/CreateWorkloadClNeon.hpp b/src/backends/aclCommon/test/CreateWorkloadClNeon.hpp index a79cfe6b0d..ec2072d243 100644 --- a/src/backends/aclCommon/test/CreateWorkloadClNeon.hpp +++ b/src/backends/aclCommon/test/CreateWorkloadClNeon.hpp @@ -4,17 +4,17 @@ // #pragma once -#include <armnn/test/CreateWorkload.hpp> +#include <test/CreateWorkload.hpp> -#include <backends/MemCopyWorkload.hpp> -#include <backends/reference/RefWorkloadFactory.hpp> +#include <backendsCommon/MemCopyWorkload.hpp> +#include <reference/RefWorkloadFactory.hpp> #if ARMCOMPUTECL_ENABLED -#include <backends/cl/ClTensorHandle.hpp> +#include <cl/ClTensorHandle.hpp> #endif #if ARMCOMPUTENEON_ENABLED -#include <backends/neon/NeonTensorHandle.hpp> +#include <neon/NeonTensorHandle.hpp> #endif using namespace armnn; diff --git a/src/backends/aclCommon/test/MemCopyTestImpl.hpp b/src/backends/aclCommon/test/MemCopyTestImpl.hpp index 322cb07c1a..6cafaadd88 100644 --- a/src/backends/aclCommon/test/MemCopyTestImpl.hpp +++ b/src/backends/aclCommon/test/MemCopyTestImpl.hpp @@ -4,11 +4,11 @@ // #pragma once -#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 <armnn/test/TensorHelpers.hpp> +#include <test/TensorHelpers.hpp> #include <boost/multi_array.hpp> diff --git a/src/backends/aclCommon/test/MemCopyTests.cpp b/src/backends/aclCommon/test/MemCopyTests.cpp index d8b407d1bc..3d4236dd36 100644 --- a/src/backends/aclCommon/test/MemCopyTests.cpp +++ b/src/backends/aclCommon/test/MemCopyTests.cpp @@ -3,13 +3,13 @@ // SPDX-License-Identifier: MIT // -#include <backends/aclCommon/ArmComputeTensorUtils.hpp> -#include <backends/cl/ClWorkloadFactory.hpp> -#include <backends/neon/NeonWorkloadFactory.hpp> +#include <aclCommon/ArmComputeTensorUtils.hpp> +#include <cl/ClWorkloadFactory.hpp> +#include <neon/NeonWorkloadFactory.hpp> #if ARMCOMPUTECL_ENABLED && ARMCOMPUTENEON_ENABLED -#include <backends/aclCommon/test/MemCopyTestImpl.hpp> -#include <backends/cl/test/ClContextControlFixture.hpp> +#include <aclCommon/test/MemCopyTestImpl.hpp> +#include <cl/test/ClContextControlFixture.hpp> #endif #include <boost/test/unit_test.hpp> diff --git a/src/backends/backends.cmake b/src/backends/backends.cmake index caa8b8a058..c82de8d8e8 100644 --- a/src/backends/backends.cmake +++ b/src/backends/backends.cmake @@ -3,10 +3,6 @@ # SPDX-License-Identifier: MIT # -add_subdirectory(${PROJECT_SOURCE_DIR}/src/backends) -list(APPEND armnnLibraries armnnBackendsCommon) -list(APPEND armnnUnitTestLibraries armnnBackendsCommonUnitTests) - # single place to use wildcards, so we can include # yet unknown backend modules and corresponding common libraries FILE(GLOB commonIncludes ${PROJECT_SOURCE_DIR}/src/backends/*/common.cmake) diff --git a/src/backends/BackendContextRegistry.cpp b/src/backends/backendsCommon/BackendContextRegistry.cpp index 0168a127af..0168a127af 100644 --- a/src/backends/BackendContextRegistry.cpp +++ b/src/backends/backendsCommon/BackendContextRegistry.cpp diff --git a/src/backends/BackendContextRegistry.hpp b/src/backends/backendsCommon/BackendContextRegistry.hpp index c48d5b2c4b..23830a0105 100644 --- a/src/backends/BackendContextRegistry.hpp +++ b/src/backends/backendsCommon/BackendContextRegistry.hpp @@ -4,10 +4,11 @@ // #pragma once -#include <armnn/Types.hpp> -#include <armnn/IRuntime.hpp> -#include "RegistryCommon.hpp" #include "IBackendContext.hpp" +#include "RegistryCommon.hpp" + +#include <armnn/IRuntime.hpp> +#include <armnn/Types.hpp> namespace armnn { diff --git a/src/backends/BackendRegistry.cpp b/src/backends/backendsCommon/BackendRegistry.cpp index e9361210f2..e9361210f2 100644 --- a/src/backends/BackendRegistry.cpp +++ b/src/backends/backendsCommon/BackendRegistry.cpp diff --git a/src/backends/BackendRegistry.hpp b/src/backends/backendsCommon/BackendRegistry.hpp index 8f8ad37481..ba2d26aaea 100644 --- a/src/backends/BackendRegistry.hpp +++ b/src/backends/backendsCommon/BackendRegistry.hpp @@ -4,9 +4,10 @@ // #pragma once -#include <armnn/Types.hpp> -#include "RegistryCommon.hpp" #include "IBackendInternal.hpp" +#include "RegistryCommon.hpp" + +#include <armnn/Types.hpp> namespace armnn { diff --git a/src/backends/CMakeLists.txt b/src/backends/backendsCommon/CMakeLists.txt index 481d21aab0..cb89aebc4e 100644 --- a/src/backends/CMakeLists.txt +++ b/src/backends/backendsCommon/CMakeLists.txt @@ -41,6 +41,6 @@ if(BUILD_UNIT_TESTS) endif() add_library(armnnBackendsCommon OBJECT ${armnnBackendsCommon_sources}) -target_include_directories(armnnBackendsCommon PRIVATE ${PROJECT_SOURCE_DIR}/src) target_include_directories(armnnBackendsCommon PRIVATE ${PROJECT_SOURCE_DIR}/src/armnn) target_include_directories(armnnBackendsCommon PRIVATE ${PROJECT_SOURCE_DIR}/src/armnnUtils) +target_include_directories(armnnBackendsCommon PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) diff --git a/src/backends/CpuTensorHandle.cpp b/src/backends/backendsCommon/CpuTensorHandle.cpp index 4059a1d565..46a7cb8251 100644 --- a/src/backends/CpuTensorHandle.cpp +++ b/src/backends/backendsCommon/CpuTensorHandle.cpp @@ -3,7 +3,8 @@ // SPDX-License-Identifier: MIT // #include <armnn/Exceptions.hpp> -#include <backends/CpuTensorHandle.hpp> + +#include <backendsCommon/CpuTensorHandle.hpp> #include <cstring> diff --git a/src/backends/CpuTensorHandle.hpp b/src/backends/backendsCommon/CpuTensorHandle.hpp index 2a686fe07f..4138812822 100644 --- a/src/backends/CpuTensorHandle.hpp +++ b/src/backends/backendsCommon/CpuTensorHandle.hpp @@ -5,8 +5,10 @@ #pragma once #include "CpuTensorHandleFwd.hpp" + #include <armnn/TypesUtils.hpp> -#include <backends/OutputHandler.hpp> + +#include <backendsCommon/OutputHandler.hpp> #include <algorithm> diff --git a/src/backends/CpuTensorHandleFwd.hpp b/src/backends/backendsCommon/CpuTensorHandleFwd.hpp index d439d0bbe6..d439d0bbe6 100644 --- a/src/backends/CpuTensorHandleFwd.hpp +++ b/src/backends/backendsCommon/CpuTensorHandleFwd.hpp diff --git a/src/backends/IBackendContext.hpp b/src/backends/backendsCommon/IBackendContext.hpp index d073d12868..d073d12868 100644 --- a/src/backends/IBackendContext.hpp +++ b/src/backends/backendsCommon/IBackendContext.hpp diff --git a/src/backends/IBackendInternal.hpp b/src/backends/backendsCommon/IBackendInternal.hpp index a24b60064a..a24b60064a 100644 --- a/src/backends/IBackendInternal.hpp +++ b/src/backends/backendsCommon/IBackendInternal.hpp diff --git a/src/backends/ILayerSupport.cpp b/src/backends/backendsCommon/ILayerSupport.cpp index ebfff5d429..ebfff5d429 100644 --- a/src/backends/ILayerSupport.cpp +++ b/src/backends/backendsCommon/ILayerSupport.cpp diff --git a/src/backends/ITensorHandle.hpp b/src/backends/backendsCommon/ITensorHandle.hpp index 02f4ed6e5a..02f4ed6e5a 100644 --- a/src/backends/ITensorHandle.hpp +++ b/src/backends/backendsCommon/ITensorHandle.hpp diff --git a/src/backends/LayerSupportRegistry.cpp b/src/backends/backendsCommon/LayerSupportRegistry.cpp index 63b4da7337..63b4da7337 100644 --- a/src/backends/LayerSupportRegistry.cpp +++ b/src/backends/backendsCommon/LayerSupportRegistry.cpp diff --git a/src/backends/LayerSupportRegistry.hpp b/src/backends/backendsCommon/LayerSupportRegistry.hpp index 6124685032..6124685032 100644 --- a/src/backends/LayerSupportRegistry.hpp +++ b/src/backends/backendsCommon/LayerSupportRegistry.hpp diff --git a/src/backends/MakeWorkloadHelper.hpp b/src/backends/backendsCommon/MakeWorkloadHelper.hpp index 78a9669530..78a9669530 100644 --- a/src/backends/MakeWorkloadHelper.hpp +++ b/src/backends/backendsCommon/MakeWorkloadHelper.hpp diff --git a/src/backends/MemCopyWorkload.cpp b/src/backends/backendsCommon/MemCopyWorkload.cpp index 29f629ae50..0fa04f8f46 100644 --- a/src/backends/MemCopyWorkload.cpp +++ b/src/backends/backendsCommon/MemCopyWorkload.cpp @@ -2,13 +2,17 @@ // Copyright © 2017 Arm Ltd. All rights reserved. // SPDX-License-Identifier: MIT // + #include "MemCopyWorkload.hpp" + #include "CpuTensorHandle.hpp" + #include <TypeUtils.hpp> -#include <cstring> #include <boost/cast.hpp> +#include <cstring> + namespace armnn { diff --git a/src/backends/MemCopyWorkload.hpp b/src/backends/backendsCommon/MemCopyWorkload.hpp index 782ce835aa..bcbba168df 100644 --- a/src/backends/MemCopyWorkload.hpp +++ b/src/backends/backendsCommon/MemCopyWorkload.hpp @@ -7,6 +7,7 @@ #include "CpuTensorHandleFwd.hpp" #include "Workload.hpp" #include "WorkloadUtils.hpp" + #include <utility> namespace armnn diff --git a/src/backends/OutputHandler.cpp b/src/backends/backendsCommon/OutputHandler.cpp index 5516c221c5..2df2fb5181 100644 --- a/src/backends/OutputHandler.cpp +++ b/src/backends/backendsCommon/OutputHandler.cpp @@ -2,15 +2,17 @@ // Copyright © 2017 Arm Ltd. All rights reserved. // SPDX-License-Identifier: MIT // + #include "OutputHandler.hpp" +#include "ITensorHandle.hpp" +#include "WorkloadDataCollector.hpp" + +#include <backendsCommon/WorkloadFactory.hpp> + #include <boost/assert.hpp> #include <boost/log/trivial.hpp> -#include <backends/WorkloadFactory.hpp> -#include "WorkloadDataCollector.hpp" -#include "ITensorHandle.hpp" - namespace armnn { diff --git a/src/backends/OutputHandler.hpp b/src/backends/backendsCommon/OutputHandler.hpp index ad4a2931cd..240b369fab 100644 --- a/src/backends/OutputHandler.hpp +++ b/src/backends/backendsCommon/OutputHandler.hpp @@ -4,22 +4,22 @@ // #pragma once -#include <backends/WorkloadDataFwd.hpp> +#include "ITensorHandle.hpp" -#include <string> -#include <vector> +#include <armnn/Descriptors.hpp> +#include <armnn/INetwork.hpp> +#include <armnn/Tensor.hpp> +#include <armnn/Types.hpp> + +#include <backendsCommon/WorkloadDataFwd.hpp> #include <memory> #include <set> +#include <string> +#include <vector> #include <boost/assert.hpp> -#include <armnn/INetwork.hpp> -#include <armnn/Types.hpp> -#include <armnn/Descriptors.hpp> -#include <armnn/Tensor.hpp> -#include "ITensorHandle.hpp" - namespace armnn { diff --git a/src/backends/RegistryCommon.hpp b/src/backends/backendsCommon/RegistryCommon.hpp index 044a9e4250..3dbfad2a66 100644 --- a/src/backends/RegistryCommon.hpp +++ b/src/backends/backendsCommon/RegistryCommon.hpp @@ -6,6 +6,7 @@ #include <armnn/BackendId.hpp> #include <armnn/Exceptions.hpp> + #include <functional> #include <memory> #include <sstream> diff --git a/src/backends/StringMapping.cpp b/src/backends/backendsCommon/StringMapping.cpp index 3ca8843812..3ca8843812 100644 --- a/src/backends/StringMapping.cpp +++ b/src/backends/backendsCommon/StringMapping.cpp diff --git a/src/backends/StringMapping.hpp b/src/backends/backendsCommon/StringMapping.hpp index 6312e68945..6312e68945 100644 --- a/src/backends/StringMapping.hpp +++ b/src/backends/backendsCommon/StringMapping.hpp diff --git a/src/backends/Workload.hpp b/src/backends/backendsCommon/Workload.hpp index 4cfffd4646..309d53f48e 100644 --- a/src/backends/Workload.hpp +++ b/src/backends/backendsCommon/Workload.hpp @@ -6,8 +6,10 @@ #include "WorkloadData.hpp" #include "WorkloadInfo.hpp" + +#include <Profiling.hpp> + #include <algorithm> -#include "Profiling.hpp" namespace armnn { diff --git a/src/backends/WorkloadData.cpp b/src/backends/backendsCommon/WorkloadData.cpp index 495d4ecde9..62cbd05c13 100644 --- a/src/backends/WorkloadData.cpp +++ b/src/backends/backendsCommon/WorkloadData.cpp @@ -7,9 +7,9 @@ #include "CpuTensorHandle.hpp" #include <algorithm> +#include <iomanip> #include <string> #include <sstream> -#include <iomanip> #include <boost/format.hpp> diff --git a/src/backends/WorkloadData.hpp b/src/backends/backendsCommon/WorkloadData.hpp index 867d9f2159..7fb8855bf6 100644 --- a/src/backends/WorkloadData.hpp +++ b/src/backends/backendsCommon/WorkloadData.hpp @@ -4,18 +4,18 @@ // #pragma once +#include "CpuTensorHandleFwd.hpp" #include "WorkloadDataFwd.hpp" -#include <armnn/Types.hpp> -#include <armnn/Tensor.hpp> +#include <InternalTypes.hpp> + #include <armnn/Descriptors.hpp> #include <armnn/Exceptions.hpp> -#include <backends/WorkloadInfo.hpp> - -#include <InternalTypes.hpp> -#include <backends/OutputHandler.hpp> +#include <armnn/Types.hpp> +#include <armnn/Tensor.hpp> -#include "CpuTensorHandleFwd.hpp" +#include <backendsCommon/OutputHandler.hpp> +#include <backendsCommon/WorkloadInfo.hpp> namespace armnn { diff --git a/src/backends/WorkloadDataCollector.hpp b/src/backends/backendsCommon/WorkloadDataCollector.hpp index ac8c2e2ab9..ac8c2e2ab9 100644 --- a/src/backends/WorkloadDataCollector.hpp +++ b/src/backends/backendsCommon/WorkloadDataCollector.hpp diff --git a/src/backends/WorkloadDataFwd.hpp b/src/backends/backendsCommon/WorkloadDataFwd.hpp index 9ae20e0ce1..9ae20e0ce1 100644 --- a/src/backends/WorkloadDataFwd.hpp +++ b/src/backends/backendsCommon/WorkloadDataFwd.hpp diff --git a/src/backends/WorkloadFactory.cpp b/src/backends/backendsCommon/WorkloadFactory.cpp index e9c2ab7a5d..83a20e8675 100644 --- a/src/backends/WorkloadFactory.cpp +++ b/src/backends/backendsCommon/WorkloadFactory.cpp @@ -2,19 +2,23 @@ // Copyright © 2017 Arm Ltd. All rights reserved. // SPDX-License-Identifier: MIT // -#include <backends/WorkloadFactory.hpp> -#include <backends/LayerSupportRegistry.hpp> -#include <armnn/Types.hpp> -#include <armnn/LayerSupport.hpp> +#include "CpuTensorHandle.hpp" + #include <Layer.hpp> #include <LayersFwd.hpp> -#include "CpuTensorHandle.hpp" + +#include <armnn/Types.hpp> +#include <armnn/LayerSupport.hpp> + +#include <backendsCommon/LayerSupportRegistry.hpp> +#include <backendsCommon/WorkloadFactory.hpp> #include <boost/cast.hpp> -#include <cstring> #include <boost/iterator/transform_iterator.hpp> +#include <cstring> + namespace armnn { diff --git a/src/backends/WorkloadFactory.hpp b/src/backends/backendsCommon/WorkloadFactory.hpp index 96906cb7f5..34c1349021 100644 --- a/src/backends/WorkloadFactory.hpp +++ b/src/backends/backendsCommon/WorkloadFactory.hpp @@ -4,11 +4,13 @@ // #pragma once -#include <memory> #include <armnn/TensorFwd.hpp> #include <armnn/Optional.hpp> -#include <backends/OutputHandler.hpp> -#include <backends/Workload.hpp> + +#include <backendsCommon/OutputHandler.hpp> +#include <backendsCommon/Workload.hpp> + +#include <memory> namespace armnn { diff --git a/src/backends/WorkloadInfo.hpp b/src/backends/backendsCommon/WorkloadInfo.hpp index 304bc0bf06..304bc0bf06 100644 --- a/src/backends/WorkloadInfo.hpp +++ b/src/backends/backendsCommon/WorkloadInfo.hpp diff --git a/src/backends/WorkloadUtils.hpp b/src/backends/backendsCommon/WorkloadUtils.hpp index 65c58eabd9..b7e0e060f2 100644 --- a/src/backends/WorkloadUtils.hpp +++ b/src/backends/backendsCommon/WorkloadUtils.hpp @@ -5,9 +5,10 @@ #pragma once -#include "armnn/Tensor.hpp" #include "ITensorHandle.hpp" +#include <armnn/Tensor.hpp> + #include <boost/cast.hpp> namespace armnn diff --git a/src/backends/backendsCommon/common.cmake b/src/backends/backendsCommon/common.cmake new file mode 100644 index 0000000000..347d60254b --- /dev/null +++ b/src/backends/backendsCommon/common.cmake @@ -0,0 +1,8 @@ +# +# Copyright © 2017 Arm Ltd. All rights reserved. +# SPDX-License-Identifier: MIT +# + +add_subdirectory(${PROJECT_SOURCE_DIR}/src/backends/backendsCommon) +list(APPEND armnnLibraries armnnBackendsCommon) +list(APPEND armnnUnitTestLibraries armnnBackendsCommonUnitTests) diff --git a/src/backends/common.mk b/src/backends/backendsCommon/common.mk index 152ada3532..152ada3532 100644 --- a/src/backends/common.mk +++ b/src/backends/backendsCommon/common.mk diff --git a/src/backends/test/ActivationFixture.hpp b/src/backends/backendsCommon/test/ActivationFixture.hpp index 5028b252e1..8ff77f6c5d 100644 --- a/src/backends/test/ActivationFixture.hpp +++ b/src/backends/backendsCommon/test/ActivationFixture.hpp @@ -7,7 +7,7 @@ #include "TensorCopyUtils.hpp" #include "WorkloadTestUtils.hpp" -#include <armnn/test/TensorHelpers.hpp> +#include <test/TensorHelpers.hpp> #include <boost/numeric/conversion/cast.hpp> #include <boost/multi_array.hpp> diff --git a/src/backends/test/ActivationTestImpl.hpp b/src/backends/backendsCommon/test/ActivationTestImpl.hpp index 63716453cd..3b3ee9361c 100644 --- a/src/backends/test/ActivationTestImpl.hpp +++ b/src/backends/backendsCommon/test/ActivationTestImpl.hpp @@ -4,16 +4,17 @@ // #pragma once +#include "ActivationFixture.hpp" +#include "QuantizeHelper.hpp" + #include <armnn/ArmNN.hpp> #include <armnn/Tensor.hpp> #include <armnn/TypesUtils.hpp> -#include <test/TensorHelpers.hpp> -#include "QuantizeHelper.hpp" +#include <backendsCommon/CpuTensorHandle.hpp> +#include <backendsCommon/WorkloadFactory.hpp> -#include <backends/CpuTensorHandle.hpp> -#include <backends/WorkloadFactory.hpp> -#include "ActivationFixture.hpp" +#include <test/TensorHelpers.hpp> #include <algorithm> diff --git a/src/backends/test/BackendIdTests.cpp b/src/backends/backendsCommon/test/BackendIdTests.cpp index 0ef0a20d7f..e11c13e6ae 100644 --- a/src/backends/test/BackendIdTests.cpp +++ b/src/backends/backendsCommon/test/BackendIdTests.cpp @@ -2,11 +2,12 @@ // Copyright © 2017 Arm Ltd. All rights reserved. // SPDX-License-Identifier: MIT // -#include <boost/test/unit_test.hpp> #include <armnn/BackendId.hpp> #include <armnn/Types.hpp> +#include <boost/test/unit_test.hpp> + using namespace armnn; BOOST_AUTO_TEST_SUITE(BackendIdTests) diff --git a/src/backends/test/BackendRegistryTests.cpp b/src/backends/backendsCommon/test/BackendRegistryTests.cpp index bfeefda6bd..4afe273de4 100644 --- a/src/backends/test/BackendRegistryTests.cpp +++ b/src/backends/backendsCommon/test/BackendRegistryTests.cpp @@ -2,11 +2,13 @@ // Copyright © 2017 Arm Ltd. All rights reserved. // SPDX-License-Identifier: MIT // -#include <boost/test/unit_test.hpp> -#include <backends/BackendRegistry.hpp> #include <armnn/Types.hpp> +#include <backendsCommon/BackendRegistry.hpp> + +#include <boost/test/unit_test.hpp> + namespace { diff --git a/src/backends/test/BatchNormTestImpl.hpp b/src/backends/backendsCommon/test/BatchNormTestImpl.hpp index 166c44435d..2360fd56e2 100644 --- a/src/backends/test/BatchNormTestImpl.hpp +++ b/src/backends/backendsCommon/test/BatchNormTestImpl.hpp @@ -7,12 +7,11 @@ #include <armnn/ArmNN.hpp> #include <armnn/Tensor.hpp> -#include <test/TensorHelpers.hpp> - -#include <backends/CpuTensorHandle.hpp> -#include <backends/WorkloadFactory.hpp> +#include <backendsCommon/CpuTensorHandle.hpp> +#include <backendsCommon/WorkloadFactory.hpp> +#include <backendsCommon/test/QuantizeHelper.hpp> -#include <backends/test/QuantizeHelper.hpp> +#include <test/TensorHelpers.hpp> template<typename T> LayerTestResult<T, 4> BatchNormTestImpl(armnn::IWorkloadFactory& workloadFactory, diff --git a/src/backends/test/CMakeLists.txt b/src/backends/backendsCommon/test/CMakeLists.txt index 39038cfd7d..ae94ad5462 100644 --- a/src/backends/test/CMakeLists.txt +++ b/src/backends/backendsCommon/test/CMakeLists.txt @@ -36,6 +36,6 @@ list(APPEND armnnBackendsCommonUnitTests_sources ) add_library(armnnBackendsCommonUnitTests OBJECT ${armnnBackendsCommonUnitTests_sources}) -target_include_directories(armnnBackendsCommonUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src) target_include_directories(armnnBackendsCommonUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/armnn) -target_include_directories(armnnBackendsCommonUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/armnnUtils)
\ No newline at end of file +target_include_directories(armnnBackendsCommonUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/armnnUtils) +target_include_directories(armnnBackendsCommonUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/backends)
\ No newline at end of file diff --git a/src/backends/test/Conv2dTestImpl.hpp b/src/backends/backendsCommon/test/Conv2dTestImpl.hpp index 3791fb0a8e..aa3a44db5d 100755 --- a/src/backends/test/Conv2dTestImpl.hpp +++ b/src/backends/backendsCommon/test/Conv2dTestImpl.hpp @@ -12,8 +12,8 @@ #include <test/TensorHelpers.hpp> #include "QuantizeHelper.hpp" -#include <backends/CpuTensorHandle.hpp> -#include <backends/WorkloadFactory.hpp> +#include <backendsCommon/CpuTensorHandle.hpp> +#include <backendsCommon/WorkloadFactory.hpp> #include "Permute.hpp" #include <boost/numeric/conversion/cast.hpp> diff --git a/src/backends/test/ConvertFp16ToFp32TestImpl.hpp b/src/backends/backendsCommon/test/ConvertFp16ToFp32TestImpl.hpp index 2455e9691a..a63f0cbd1d 100644 --- a/src/backends/test/ConvertFp16ToFp32TestImpl.hpp +++ b/src/backends/backendsCommon/test/ConvertFp16ToFp32TestImpl.hpp @@ -8,12 +8,12 @@ #include <armnn/ArmNN.hpp> #include <armnn/Tensor.hpp> #include <armnn/TypesUtils.hpp> -#include <armnnUtils/Half.hpp> -#include <backends/CpuTensorHandle.hpp> +#include <Half.hpp> -#include <test/TensorHelpers.hpp> +#include <backendsCommon/CpuTensorHandle.hpp> +#include <test/TensorHelpers.hpp> LayerTestResult<float, 4> SimpleConvertFp16ToFp32Test(armnn::IWorkloadFactory& workloadFactory) { diff --git a/src/backends/test/ConvertFp32ToFp16TestImpl.hpp b/src/backends/backendsCommon/test/ConvertFp32ToFp16TestImpl.hpp index 4eee274357..3513823b4e 100644 --- a/src/backends/test/ConvertFp32ToFp16TestImpl.hpp +++ b/src/backends/backendsCommon/test/ConvertFp32ToFp16TestImpl.hpp @@ -5,12 +5,13 @@ #pragma once +#include <Half.hpp> + #include <armnn/ArmNN.hpp> #include <armnn/Tensor.hpp> #include <armnn/TypesUtils.hpp> -#include <armnnUtils/Half.hpp> -#include <backends/CpuTensorHandle.hpp> +#include <backendsCommon/CpuTensorHandle.hpp> #include <test/TensorHelpers.hpp> diff --git a/src/backends/test/EndToEndTestImpl.hpp b/src/backends/backendsCommon/test/EndToEndTestImpl.hpp index 5f17f782f3..e16116ee10 100644 --- a/src/backends/test/EndToEndTestImpl.hpp +++ b/src/backends/backendsCommon/test/EndToEndTestImpl.hpp @@ -6,7 +6,7 @@ #include <armnn/ArmNN.hpp> -#include <backends/test/QuantizeHelper.hpp> +#include <backendsCommon/test/QuantizeHelper.hpp> #include <vector> diff --git a/src/backends/test/FullyConnectedTestImpl.hpp b/src/backends/backendsCommon/test/FullyConnectedTestImpl.hpp index 125b7e62b1..125b7e62b1 100644 --- a/src/backends/test/FullyConnectedTestImpl.hpp +++ b/src/backends/backendsCommon/test/FullyConnectedTestImpl.hpp diff --git a/src/backends/test/IsLayerSupportedTestImpl.hpp b/src/backends/backendsCommon/test/IsLayerSupportedTestImpl.hpp index 722d82d8ab..2c992bc10b 100644 --- a/src/backends/test/IsLayerSupportedTestImpl.hpp +++ b/src/backends/backendsCommon/test/IsLayerSupportedTestImpl.hpp @@ -4,7 +4,9 @@ // #pragma once -#include "Graph.hpp" +#include <Graph.hpp> + +#include <backendsCommon/WorkloadFactory.hpp> #include <boost/core/ignore_unused.hpp> diff --git a/src/backends/test/JsonPrinterTestImpl.hpp b/src/backends/backendsCommon/test/JsonPrinterTestImpl.hpp index 47e0ec761b..a286b28307 100644 --- a/src/backends/test/JsonPrinterTestImpl.hpp +++ b/src/backends/backendsCommon/test/JsonPrinterTestImpl.hpp @@ -3,10 +3,11 @@ // SPDX-License-Identifier: MIT // +#include <Profiling.hpp> + #include <armnn/Descriptors.hpp> #include <armnn/IRuntime.hpp> #include <armnn/INetwork.hpp> -#include <armnn/Profiling.hpp> #include <boost/test/unit_test.hpp> #include <boost/algorithm/string.hpp> diff --git a/src/backends/test/LayerReleaseConstantDataTest.cpp b/src/backends/backendsCommon/test/LayerReleaseConstantDataTest.cpp index 7549dfd5f8..fc32fdcd02 100644 --- a/src/backends/test/LayerReleaseConstantDataTest.cpp +++ b/src/backends/backendsCommon/test/LayerReleaseConstantDataTest.cpp @@ -3,16 +3,17 @@ // SPDX-License-Identifier: MIT // -#include <boost/test/unit_test.hpp> -#include <boost/cast.hpp> - -#include <backends/WorkloadData.hpp> #include <Graph.hpp> -#include <utility> +#include <backendsCommon/CpuTensorHandle.hpp> +#include <backendsCommon/WorkloadData.hpp> + +#include <cl/ClWorkloadFactory.hpp> -#include <backends/CpuTensorHandle.hpp> -#include <backends/cl/ClWorkloadFactory.hpp> +#include <boost/cast.hpp> +#include <boost/test/unit_test.hpp> + +#include <utility> using namespace armnn; using namespace std; diff --git a/src/backends/test/LayerTests.cpp b/src/backends/backendsCommon/test/LayerTests.cpp index b5fd629d66..12a7063e22 100755 --- a/src/backends/test/LayerTests.cpp +++ b/src/backends/backendsCommon/test/LayerTests.cpp @@ -13,8 +13,8 @@ #include <armnn/LayerSupport.hpp> -#include <backends/CpuTensorHandle.hpp> -#include <backends/WorkloadFactory.hpp> +#include <backendsCommon/CpuTensorHandle.hpp> +#include <backendsCommon/WorkloadFactory.hpp> #include <algorithm> #include <boost/cast.hpp> diff --git a/src/backends/test/LayerTests.hpp b/src/backends/backendsCommon/test/LayerTests.hpp index 26dec60e0b..57383d3276 100644 --- a/src/backends/test/LayerTests.hpp +++ b/src/backends/backendsCommon/test/LayerTests.hpp @@ -4,12 +4,14 @@ // #pragma once -#include "armnn/ArmNN.hpp" -#include "armnn/Tensor.hpp" -#include "armnnUtils/Half.hpp" +#include <armnn/ArmNN.hpp> +#include <armnn/Tensor.hpp> + +#include <Half.hpp> #include <boost/multi_array.hpp> #include <boost/assert.hpp> + #include <array> // Layer callables. diff --git a/src/backends/test/LstmTestImpl.hpp b/src/backends/backendsCommon/test/LstmTestImpl.hpp index a7e595c941..758f294d48 100644 --- a/src/backends/test/LstmTestImpl.hpp +++ b/src/backends/backendsCommon/test/LstmTestImpl.hpp @@ -4,15 +4,16 @@ // #pragma once +#include "QuantizeHelper.hpp" + #include <armnn/ArmNN.hpp> #include <armnn/Tensor.hpp> #include <armnn/TypesUtils.hpp> #include <test/TensorHelpers.hpp> -#include "QuantizeHelper.hpp" -#include <backends/CpuTensorHandle.hpp> -#include <backends/WorkloadFactory.hpp> +#include <backendsCommon/CpuTensorHandle.hpp> +#include <backendsCommon/WorkloadFactory.hpp> LayerTestResult<float, 2> LstmNoCifgNoPeepholeNoProjectionTestImpl(armnn::IWorkloadFactory& workloadFactory, const boost::multi_array<float, 2>& input, diff --git a/src/backends/test/NormTestImpl.hpp b/src/backends/backendsCommon/test/NormTestImpl.hpp index de954b95e0..0d8d4340a8 100644 --- a/src/backends/test/NormTestImpl.hpp +++ b/src/backends/backendsCommon/test/NormTestImpl.hpp @@ -7,8 +7,8 @@ #include <armnn/LayerSupport.hpp> #include "armnn/Types.hpp" -#include <backends/CpuTensorHandle.hpp> -#include <backends/WorkloadFactory.hpp> +#include <backendsCommon/CpuTensorHandle.hpp> +#include <backendsCommon/WorkloadFactory.hpp> LayerTestResult<float,4> SimpleNormalizationTestImpl(armnn::IWorkloadFactory& workloadFactory, armnn::NormalizationAlgorithmChannel normChannel, diff --git a/src/backends/test/OptimizedNetworkTests.cpp b/src/backends/backendsCommon/test/OptimizedNetworkTests.cpp index 72a35f99e0..8d88241000 100644 --- a/src/backends/test/OptimizedNetworkTests.cpp +++ b/src/backends/backendsCommon/test/OptimizedNetworkTests.cpp @@ -4,10 +4,11 @@ // #include <armnn/ArmNN.hpp> -#include <armnn/Graph.hpp> -#include <armnn/Network.hpp> -#include <backends/reference/RefWorkloadFactory.hpp> +#include <Graph.hpp> +#include <Network.hpp> + +#include <reference/RefWorkloadFactory.hpp> #include <boost/test/unit_test.hpp> diff --git a/src/backends/test/PermuteTestImpl.hpp b/src/backends/backendsCommon/test/PermuteTestImpl.hpp index 9e5dda491f..529f9d34e0 100644 --- a/src/backends/test/PermuteTestImpl.hpp +++ b/src/backends/backendsCommon/test/PermuteTestImpl.hpp @@ -4,15 +4,16 @@ // #pragma once +#include "QuantizeHelper.hpp" + #include <armnn/ArmNN.hpp> #include <armnn/Tensor.hpp> #include <armnn/TypesUtils.hpp> #include <test/TensorHelpers.hpp> -#include "QuantizeHelper.hpp" -#include <backends/CpuTensorHandle.hpp> -#include <backends/WorkloadFactory.hpp> +#include <backendsCommon/CpuTensorHandle.hpp> +#include <backendsCommon/WorkloadFactory.hpp> template<typename T> LayerTestResult<T, 4> SimplePermuteTestImpl( diff --git a/src/backends/test/Pooling2dTestImpl.hpp b/src/backends/backendsCommon/test/Pooling2dTestImpl.hpp index eea423275c..ded45ab999 100644 --- a/src/backends/test/Pooling2dTestImpl.hpp +++ b/src/backends/backendsCommon/test/Pooling2dTestImpl.hpp @@ -4,19 +4,23 @@ // #pragma once -#include <string> +#include "QuantizeHelper.hpp" + #include <armnn/ArmNN.hpp> +#include <Permute.hpp> + +#include <backendsCommon/CpuTensorHandle.hpp> +#include <backendsCommon/WorkloadFactory.hpp> +#include <backendsCommon/WorkloadInfo.hpp> + #include <test/TensorHelpers.hpp> -#include "QuantizeHelper.hpp" -#include <backends/CpuTensorHandle.hpp> -#include <backends/WorkloadFactory.hpp> -#include <backends/WorkloadInfo.hpp> -#include <algorithm> -#include "Permute.hpp" #include <boost/numeric/conversion/cast.hpp> +#include <algorithm> +#include <string> + template<typename T> LayerTestResult<T, 4> SimplePooling2dTestImpl(armnn::IWorkloadFactory& workloadFactory, armnn::Pooling2dDescriptor descriptor, diff --git a/src/backends/test/QuantizeHelper.hpp b/src/backends/backendsCommon/test/QuantizeHelper.hpp index bb4e561d59..bb4e561d59 100644 --- a/src/backends/test/QuantizeHelper.hpp +++ b/src/backends/backendsCommon/test/QuantizeHelper.hpp diff --git a/src/backends/test/ReshapeTestImpl.hpp b/src/backends/backendsCommon/test/ReshapeTestImpl.hpp index 198de53595..fee992deb6 100644 --- a/src/backends/test/ReshapeTestImpl.hpp +++ b/src/backends/backendsCommon/test/ReshapeTestImpl.hpp @@ -4,15 +4,16 @@ // #pragma once +#include "QuantizeHelper.hpp" + #include <armnn/ArmNN.hpp> #include <armnn/Tensor.hpp> #include <armnn/TypesUtils.hpp> -#include <test/TensorHelpers.hpp> -#include "QuantizeHelper.hpp" +#include <backendsCommon/CpuTensorHandle.hpp> +#include <backendsCommon/WorkloadFactory.hpp> -#include <backends/CpuTensorHandle.hpp> -#include <backends/WorkloadFactory.hpp> +#include <test/TensorHelpers.hpp> template<typename T> LayerTestResult<T, 4> SimpleReshapeTestImpl( diff --git a/src/backends/test/RuntimeTestImpl.hpp b/src/backends/backendsCommon/test/RuntimeTestImpl.hpp index 671f94b0bb..b446fc48c3 100644 --- a/src/backends/test/RuntimeTestImpl.hpp +++ b/src/backends/backendsCommon/test/RuntimeTestImpl.hpp @@ -5,7 +5,8 @@ #pragma once #include <armnn/ArmNN.hpp> -#include <armnn/Runtime.hpp> + +#include <Runtime.hpp> namespace { diff --git a/src/backends/test/SoftmaxTestImpl.hpp b/src/backends/backendsCommon/test/SoftmaxTestImpl.hpp index 0bca8be49d..1e145a1a2e 100644 --- a/src/backends/test/SoftmaxTestImpl.hpp +++ b/src/backends/backendsCommon/test/SoftmaxTestImpl.hpp @@ -4,15 +4,16 @@ // #pragma once +#include "QuantizeHelper.hpp" + #include <armnn/ArmNN.hpp> #include <armnn/Tensor.hpp> #include <armnn/TypesUtils.hpp> -#include <test/TensorHelpers.hpp> -#include "QuantizeHelper.hpp" +#include <backendsCommon/CpuTensorHandle.hpp> +#include <backendsCommon/WorkloadFactory.hpp> -#include <backends/CpuTensorHandle.hpp> -#include <backends/WorkloadFactory.hpp> +#include <test/TensorHelpers.hpp> #include <algorithm> diff --git a/src/backends/test/SplitterTestImpl.hpp b/src/backends/backendsCommon/test/SplitterTestImpl.hpp index 396cc1bcb2..677950cf2d 100644 --- a/src/backends/test/SplitterTestImpl.hpp +++ b/src/backends/backendsCommon/test/SplitterTestImpl.hpp @@ -7,13 +7,11 @@ #include <armnn/ArmNN.hpp> #include <armnn/Tensor.hpp> -#include <test/TensorHelpers.hpp> - -#include <backends/CpuTensorHandle.hpp> -#include <backends/WorkloadFactory.hpp> - -#include <backends/test/QuantizeHelper.hpp> +#include <backendsCommon/CpuTensorHandle.hpp> +#include <backendsCommon/WorkloadFactory.hpp> +#include <backendsCommon/test/QuantizeHelper.hpp> +#include <test/TensorHelpers.hpp> template<typename T> std::vector<LayerTestResult<T,3>> SplitterTestCommon(armnn::IWorkloadFactory& workloadFactory, diff --git a/src/backends/test/TensorCopyUtils.cpp b/src/backends/backendsCommon/test/TensorCopyUtils.cpp index 7e17e8b9fd..acc28c9c03 100644 --- a/src/backends/test/TensorCopyUtils.cpp +++ b/src/backends/backendsCommon/test/TensorCopyUtils.cpp @@ -5,24 +5,24 @@ #include "TensorCopyUtils.hpp" -#include <armnnUtils/Half.hpp> - +#include <Half.hpp> #ifdef ARMCOMPUTECL_ENABLED -#include <backends/cl/ClTensorHandle.hpp> +#include <cl/ClTensorHandle.hpp> #endif #if ARMCOMPUTENEON_ENABLED -#include <backends/neon/NeonTensorHandle.hpp> +#include <neon/NeonTensorHandle.hpp> #endif #if ARMCOMPUTECLENABLED || ARMCOMPUTENEON_ENABLED -#include <backends/aclCommon/ArmComputeTensorUtils.hpp> +#include <aclCommon/ArmComputeTensorUtils.hpp> #endif -#include <backends/CpuTensorHandle.hpp> +#include <backendsCommon/CpuTensorHandle.hpp> #include <boost/cast.hpp> + #include <algorithm> #include <cstring> diff --git a/src/backends/test/TensorCopyUtils.hpp b/src/backends/backendsCommon/test/TensorCopyUtils.hpp index 4a3ba64239..2187523edb 100644 --- a/src/backends/test/TensorCopyUtils.hpp +++ b/src/backends/backendsCommon/test/TensorCopyUtils.hpp @@ -5,7 +5,8 @@ #pragma once #include <armnn/Tensor.hpp> -#include <backends/ITensorHandle.hpp> + +#include <backendsCommon/ITensorHandle.hpp> void CopyDataToITensorHandle(armnn::ITensorHandle* tensorHandle, const void* mem); diff --git a/src/backends/test/WorkloadDataValidation.cpp b/src/backends/backendsCommon/test/WorkloadDataValidation.cpp index 7e3a90feda..3664d56c28 100644 --- a/src/backends/test/WorkloadDataValidation.cpp +++ b/src/backends/backendsCommon/test/WorkloadDataValidation.cpp @@ -2,15 +2,18 @@ // Copyright © 2017 Arm Ltd. All rights reserved. // SPDX-License-Identifier: MIT // -#include <boost/test/unit_test.hpp> -#include <backends/CpuTensorHandle.hpp> -#include <backends/Workload.hpp> -#include <backends/reference/workloads/RefWorkloads.hpp> -#include <backends/reference/RefWorkloadFactory.hpp> + +#include "WorkloadTestUtils.hpp" #include <armnn/Exceptions.hpp> -#include "WorkloadTestUtils.hpp" +#include <backendsCommon/CpuTensorHandle.hpp> +#include <backendsCommon/Workload.hpp> + +#include <reference/workloads/RefWorkloads.hpp> +#include <reference/RefWorkloadFactory.hpp> + +#include <boost/test/unit_test.hpp> using namespace armnn; diff --git a/src/backends/test/WorkloadTestUtils.hpp b/src/backends/backendsCommon/test/WorkloadTestUtils.hpp index 97f8ebd7d2..05f6dde35f 100644 --- a/src/backends/test/WorkloadTestUtils.hpp +++ b/src/backends/backendsCommon/test/WorkloadTestUtils.hpp @@ -6,6 +6,8 @@ #include <armnn/Tensor.hpp> +#include <backendsCommon/WorkloadInfo.hpp> + namespace armnn { class ITensorHandle; diff --git a/src/backends/cl/CMakeLists.txt b/src/backends/cl/CMakeLists.txt index a0f1e4d9cc..30254582b2 100644 --- a/src/backends/cl/CMakeLists.txt +++ b/src/backends/cl/CMakeLists.txt @@ -32,7 +32,7 @@ if(ARMCOMPUTECL) endif() add_library(armnnClBackend OBJECT ${armnnClBackend_sources}) -target_include_directories(armnnClBackend PRIVATE ${PROJECT_SOURCE_DIR}/src) target_include_directories(armnnClBackend PRIVATE ${PROJECT_SOURCE_DIR}/src/armnn) target_include_directories(armnnClBackend PRIVATE ${PROJECT_SOURCE_DIR}/src/armnnUtils) +target_include_directories(armnnClBackend PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) diff --git a/src/backends/cl/ClBackend.cpp b/src/backends/cl/ClBackend.cpp index da91de8e48..5d5cad572c 100644 --- a/src/backends/cl/ClBackend.cpp +++ b/src/backends/cl/ClBackend.cpp @@ -7,7 +7,7 @@ #include "ClBackendId.hpp" #include "ClWorkloadFactory.hpp" -#include <backends/BackendRegistry.hpp> +#include <backendsCommon/BackendRegistry.hpp> #include <boost/log/trivial.hpp> namespace armnn diff --git a/src/backends/cl/ClBackend.hpp b/src/backends/cl/ClBackend.hpp index 201702eee3..381d808036 100644 --- a/src/backends/cl/ClBackend.hpp +++ b/src/backends/cl/ClBackend.hpp @@ -4,7 +4,7 @@ // #pragma once -#include <backends/IBackendInternal.hpp> +#include <backendsCommon/IBackendInternal.hpp> namespace armnn { diff --git a/src/backends/cl/ClBackendContext.cpp b/src/backends/cl/ClBackendContext.cpp index 4d1be33fc6..7789415f89 100644 --- a/src/backends/cl/ClBackendContext.cpp +++ b/src/backends/cl/ClBackendContext.cpp @@ -7,7 +7,7 @@ #include "ClBackendId.hpp" #include "ClContextControl.hpp" -#include <backends/BackendContextRegistry.hpp> +#include <backendsCommon/BackendContextRegistry.hpp> #include <boost/log/trivial.hpp> #include <mutex> diff --git a/src/backends/cl/ClBackendContext.hpp b/src/backends/cl/ClBackendContext.hpp index 3df403efc5..4aaa8a9afe 100644 --- a/src/backends/cl/ClBackendContext.hpp +++ b/src/backends/cl/ClBackendContext.hpp @@ -4,7 +4,7 @@ // #pragma once -#include <backends/IBackendContext.hpp> +#include <backendsCommon/IBackendContext.hpp> namespace armnn { diff --git a/src/backends/cl/ClLayerSupport.cpp b/src/backends/cl/ClLayerSupport.cpp index ebb90a5abf..ab62eee41e 100644 --- a/src/backends/cl/ClLayerSupport.cpp +++ b/src/backends/cl/ClLayerSupport.cpp @@ -7,10 +7,10 @@ #include "ClBackendId.hpp" #include <armnn/Descriptors.hpp> -#include <armnn/InternalTypes.hpp> -#include <armnn/LayerSupportCommon.hpp> +#include <InternalTypes.hpp> +#include <LayerSupportCommon.hpp> -#include <backends/LayerSupportRegistry.hpp> +#include <backendsCommon/LayerSupportRegistry.hpp> #include <boost/core/ignore_unused.hpp> diff --git a/src/backends/cl/ClTensorHandle.hpp b/src/backends/cl/ClTensorHandle.hpp index 556e4479b6..0f1f583bbe 100644 --- a/src/backends/cl/ClTensorHandle.hpp +++ b/src/backends/cl/ClTensorHandle.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/CL/CLTensor.h> #include <arm_compute/runtime/CL/CLSubTensor.h> diff --git a/src/backends/cl/ClWorkloadFactory.cpp b/src/backends/cl/ClWorkloadFactory.cpp index ae9d471f13..e205cf1746 100644 --- a/src/backends/cl/ClWorkloadFactory.cpp +++ b/src/backends/cl/ClWorkloadFactory.cpp @@ -9,7 +9,7 @@ #include <armnn/Utils.hpp> #include <string> -#include <backends/CpuTensorHandle.hpp> +#include <backendsCommon/CpuTensorHandle.hpp> #include <Layer.hpp> #ifdef ARMCOMPUTECL_ENABLED @@ -17,16 +17,16 @@ #include <arm_compute/runtime/CL/CLBufferAllocator.h> #include <arm_compute/runtime/CL/CLScheduler.h> -#include <backends/MemCopyWorkload.hpp> +#include <backendsCommon/MemCopyWorkload.hpp> -#include <backends/aclCommon/memory/IPoolManager.hpp> +#include <aclCommon/memory/IPoolManager.hpp> -#include <backends/cl/ClTensorHandle.hpp> -#include <backends/cl/workloads/ClWorkloads.hpp> -#include <backends/cl/workloads/ClWorkloadUtils.hpp> +#include <cl/ClTensorHandle.hpp> +#include <cl/workloads/ClWorkloads.hpp> +#include <cl/workloads/ClWorkloadUtils.hpp> #endif -#include <backends/MakeWorkloadHelper.hpp> +#include <backendsCommon/MakeWorkloadHelper.hpp> #include <boost/polymorphic_cast.hpp> #include <boost/format.hpp> diff --git a/src/backends/cl/ClWorkloadFactory.hpp b/src/backends/cl/ClWorkloadFactory.hpp index bd4ab50be0..ff7e56c385 100644 --- a/src/backends/cl/ClWorkloadFactory.hpp +++ b/src/backends/cl/ClWorkloadFactory.hpp @@ -7,8 +7,8 @@ #include <armnn/IRuntime.hpp> #include <armnn/Optional.hpp> -#include <backends/OutputHandler.hpp> -#include <backends/aclCommon/memory/BaseMemoryManager.hpp> +#include <backendsCommon/OutputHandler.hpp> +#include <aclCommon/memory/BaseMemoryManager.hpp> namespace armnn { diff --git a/src/backends/cl/OpenClTimer.hpp b/src/backends/cl/OpenClTimer.hpp index 0dc9ff7f2b..5539e885d8 100644 --- a/src/backends/cl/OpenClTimer.hpp +++ b/src/backends/cl/OpenClTimer.hpp @@ -5,7 +5,7 @@ #pragma once -#include <armnn/Instrument.hpp> +#include <Instrument.hpp> #include <arm_compute/runtime/CL/CLScheduler.h> #include <arm_compute/core/CL/OpenCL.h> diff --git a/src/backends/cl/test/CMakeLists.txt b/src/backends/cl/test/CMakeLists.txt index c017377768..574edf4f58 100644 --- a/src/backends/cl/test/CMakeLists.txt +++ b/src/backends/cl/test/CMakeLists.txt @@ -17,6 +17,6 @@ list(APPEND armnnClBackendUnitTests_sources ) add_library(armnnClBackendUnitTests OBJECT ${armnnClBackendUnitTests_sources}) -target_include_directories(armnnClBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src) target_include_directories(armnnClBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/armnn) target_include_directories(armnnClBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/armnnUtils) +target_include_directories(armnnClBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) diff --git a/src/backends/cl/test/ClContextControlFixture.hpp b/src/backends/cl/test/ClContextControlFixture.hpp index fd53e3fcf3..52e34147bb 100644 --- a/src/backends/cl/test/ClContextControlFixture.hpp +++ b/src/backends/cl/test/ClContextControlFixture.hpp @@ -5,7 +5,7 @@ #pragma once -#include <backends/cl/ClContextControl.hpp> +#include <cl/ClContextControl.hpp> template<bool ProfilingEnabled> struct ClContextControlFixtureBase diff --git a/src/backends/cl/test/ClCreateWorkloadTests.cpp b/src/backends/cl/test/ClCreateWorkloadTests.cpp index 2a705de99b..72a2eb27e1 100644 --- a/src/backends/cl/test/ClCreateWorkloadTests.cpp +++ b/src/backends/cl/test/ClCreateWorkloadTests.cpp @@ -5,14 +5,14 @@ #include "ClContextControlFixture.hpp" -#include <backends/MemCopyWorkload.hpp> +#include <backendsCommon/MemCopyWorkload.hpp> -#include <backends/aclCommon/test/CreateWorkloadClNeon.hpp> +#include <aclCommon/test/CreateWorkloadClNeon.hpp> -#include <backends/cl/ClTensorHandle.hpp> -#include <backends/cl/ClWorkloadFactory.hpp> -#include <backends/cl/workloads/ClWorkloads.hpp> -#include <backends/cl/workloads/ClWorkloadUtils.hpp> +#include <cl/ClTensorHandle.hpp> +#include <cl/ClWorkloadFactory.hpp> +#include <cl/workloads/ClWorkloads.hpp> +#include <cl/workloads/ClWorkloadUtils.hpp> boost::test_tools::predicate_result CompareIClTensorHandleShape(IClTensorHandle* tensorHandle, std::initializer_list<unsigned int> expectedDimensions) diff --git a/src/backends/cl/test/ClEndToEndTests.cpp b/src/backends/cl/test/ClEndToEndTests.cpp index d6fd8875c4..b374079e78 100644 --- a/src/backends/cl/test/ClEndToEndTests.cpp +++ b/src/backends/cl/test/ClEndToEndTests.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/cl/test/ClJsonPrinterTests.cpp b/src/backends/cl/test/ClJsonPrinterTests.cpp index f0b4b7acae..6a27e8c6c7 100644 --- a/src/backends/cl/test/ClJsonPrinterTests.cpp +++ b/src/backends/cl/test/ClJsonPrinterTests.cpp @@ -5,8 +5,8 @@ #include <armnn/BackendId.hpp> -#include <backends/cl/test/ClContextControlFixture.hpp> -#include <backends/test/JsonPrinterTestImpl.hpp> +#include <cl/test/ClContextControlFixture.hpp> +#include <backendsCommon/test/JsonPrinterTestImpl.hpp> #include <boost/test/unit_test.hpp> diff --git a/src/backends/cl/test/ClLayerSupportTests.cpp b/src/backends/cl/test/ClLayerSupportTests.cpp index 513366e8dc..0019afed6b 100644 --- a/src/backends/cl/test/ClLayerSupportTests.cpp +++ b/src/backends/cl/test/ClLayerSupportTests.cpp @@ -3,15 +3,15 @@ // 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/cl/ClWorkloadFactory.hpp> -#include <backends/cl/test/ClContextControlFixture.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 <cl/ClWorkloadFactory.hpp> +#include <cl/test/ClContextControlFixture.hpp> +#include <backendsCommon/test/IsLayerSupportedTestImpl.hpp> +#include <backendsCommon/test/LayerTests.hpp> #include <boost/test/unit_test.hpp> diff --git a/src/backends/cl/test/ClLayerTests.cpp b/src/backends/cl/test/ClLayerTests.cpp index 3ff3c093be..102ebbdf6f 100755 --- a/src/backends/cl/test/ClLayerTests.cpp +++ b/src/backends/cl/test/ClLayerTests.cpp @@ -8,13 +8,13 @@ #include "test/TensorHelpers.hpp" #include "test/UnitTests.hpp" -#include <backends/CpuTensorHandle.hpp> -#include <backends/cl/ClLayerSupport.hpp> -#include <backends/cl/ClWorkloadFactory.hpp> -#include <backends/cl/workloads/ClWorkloadUtils.hpp> -#include <backends/reference/RefWorkloadFactory.hpp> -#include <backends/test/ActivationFixture.hpp> -#include <backends/test/LayerTests.hpp> +#include <backendsCommon/CpuTensorHandle.hpp> +#include <cl/ClLayerSupport.hpp> +#include <cl/ClWorkloadFactory.hpp> +#include <cl/workloads/ClWorkloadUtils.hpp> +#include <reference/RefWorkloadFactory.hpp> +#include <backendsCommon/test/ActivationFixture.hpp> +#include <backendsCommon/test/LayerTests.hpp> #include <arm_compute/core/CL/CLKernelLibrary.h> #include <arm_compute/runtime/CL/CLScheduler.h> diff --git a/src/backends/cl/test/ClMemCopyTests.cpp b/src/backends/cl/test/ClMemCopyTests.cpp index 2635495e46..93b8df17bf 100644 --- a/src/backends/cl/test/ClMemCopyTests.cpp +++ b/src/backends/cl/test/ClMemCopyTests.cpp @@ -3,9 +3,9 @@ // SPDX-License-Identifier: MIT // -#include <backends/cl/ClWorkloadFactory.hpp> -#include <backends/reference/RefWorkloadFactory.hpp> -#include <backends/aclCommon/test/MemCopyTestImpl.hpp> +#include <cl/ClWorkloadFactory.hpp> +#include <reference/RefWorkloadFactory.hpp> +#include <aclCommon/test/MemCopyTestImpl.hpp> #include <boost/test/unit_test.hpp> diff --git a/src/backends/cl/test/ClOptimizedNetworkTests.cpp b/src/backends/cl/test/ClOptimizedNetworkTests.cpp index b39a4b1304..cd8a770812 100644 --- a/src/backends/cl/test/ClOptimizedNetworkTests.cpp +++ b/src/backends/cl/test/ClOptimizedNetworkTests.cpp @@ -4,11 +4,11 @@ // #include <armnn/ArmNN.hpp> -#include <armnn/Network.hpp> +#include <Network.hpp> -#include <armnn/test/GraphUtils.hpp> +#include <test/GraphUtils.hpp> -#include <backends/cl/ClWorkloadFactory.hpp> +#include <cl/ClWorkloadFactory.hpp> #include <boost/test/unit_test.hpp> diff --git a/src/backends/cl/test/ClRuntimeTests.cpp b/src/backends/cl/test/ClRuntimeTests.cpp index d29cd5b1c2..c6da261c15 100644 --- a/src/backends/cl/test/ClRuntimeTests.cpp +++ b/src/backends/cl/test/ClRuntimeTests.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/core/ignore_unused.hpp> #include <boost/test/unit_test.hpp> diff --git a/src/backends/cl/test/Fp16SupportTest.cpp b/src/backends/cl/test/Fp16SupportTest.cpp index e8d459170e..dac1ebcd02 100644 --- a/src/backends/cl/test/Fp16SupportTest.cpp +++ b/src/backends/cl/test/Fp16SupportTest.cpp @@ -7,12 +7,12 @@ #include <armnn/Descriptors.hpp> #include <armnn/IRuntime.hpp> #include <armnn/INetwork.hpp> -#include <armnnUtils/Half.hpp> +#include <Half.hpp> #include <Graph.hpp> #include <Optimizer.hpp> -#include <backends/CpuTensorHandle.hpp> -#include <backends/test/QuantizeHelper.hpp> +#include <backendsCommon/CpuTensorHandle.hpp> +#include <backendsCommon/test/QuantizeHelper.hpp> #include <boost/core/ignore_unused.hpp> #include <boost/test/unit_test.hpp> diff --git a/src/backends/cl/test/OpenClTimerTest.cpp b/src/backends/cl/test/OpenClTimerTest.cpp index 70ceac2a3f..0c40a868eb 100644 --- a/src/backends/cl/test/OpenClTimerTest.cpp +++ b/src/backends/cl/test/OpenClTimerTest.cpp @@ -5,17 +5,17 @@ #if (defined(__aarch64__)) || (defined(__x86_64__)) // disable test failing on FireFly/Armv7 -#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/cl/ClContextControl.hpp> -#include <backends/cl/ClWorkloadFactory.hpp> -#include <backends/cl/OpenClTimer.hpp> +#include <cl/ClContextControl.hpp> +#include <cl/ClWorkloadFactory.hpp> +#include <cl/OpenClTimer.hpp> -#include <backends/test/TensorCopyUtils.hpp> -#include <backends/test/WorkloadTestUtils.hpp> +#include <backendsCommon/test/TensorCopyUtils.hpp> +#include <backendsCommon/test/WorkloadTestUtils.hpp> #include <arm_compute/runtime/CL/CLScheduler.h> 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> 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> 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> diff --git a/tests/InferenceModel.hpp b/tests/InferenceModel.hpp index ac895b9a0c..9ca7dfd683 100644 --- a/tests/InferenceModel.hpp +++ b/tests/InferenceModel.hpp @@ -14,7 +14,7 @@ #include <armnnOnnxParser/IOnnxParser.hpp> #endif -#include <backends/BackendRegistry.hpp> +#include <backends/backendsCommon/BackendRegistry.hpp> #include <boost/exception/exception.hpp> #include <boost/exception/diagnostic_information.hpp> |