diff options
Diffstat (limited to 'src/armnn')
52 files changed, 103 insertions, 102 deletions
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> |