diff options
Diffstat (limited to 'src/armnn/layers')
30 files changed, 66 insertions, 65 deletions
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 { |