From 7891a73ef36f4ad7b71069b3c57694f85bb79454 Mon Sep 17 00:00:00 2001 From: Georgios Pinitas Date: Fri, 20 Aug 2021 21:39:25 +0100 Subject: Move CPU/GPU files from Core/Runtime to the respective backend folders Legacy structure contained two libraries core/runtime with two backends in each. We reduce the core/runtime libraries to a single library thus merging the backend files Signed-off-by: Georgios Pinitas Change-Id: I69545765fe7a730368105cdbd067d3135ec7a174 Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/6155 Comments-Addressed: Arm Jenkins Reviewed-by: Michele Di Giorgio Tested-by: Arm Jenkins --- src/runtime/NEON/functions/NEActivationLayer.cpp | 2 +- src/runtime/NEON/functions/NEArithmeticAddition.cpp | 2 +- src/runtime/NEON/functions/NEArithmeticSubtraction.cpp | 2 +- src/runtime/NEON/functions/NECast.cpp | 2 +- src/runtime/NEON/functions/NEConcatenateLayer.cpp | 2 +- src/runtime/NEON/functions/NEConvertFullyConnectedWeights.cpp | 2 +- src/runtime/NEON/functions/NEConvolutionLayer.cpp | 10 +++++----- src/runtime/NEON/functions/NECopy.cpp | 2 +- src/runtime/NEON/functions/NEDepthConvertLayer.cpp | 2 +- src/runtime/NEON/functions/NEDepthwiseConvolutionLayer.cpp | 2 +- src/runtime/NEON/functions/NEDequantizationLayer.cpp | 2 +- src/runtime/NEON/functions/NEDirectConvolutionLayer.cpp | 2 +- src/runtime/NEON/functions/NEElementwiseOperations.cpp | 2 +- src/runtime/NEON/functions/NEElementwiseUnaryLayer.cpp | 2 +- src/runtime/NEON/functions/NEFill.cpp | 2 +- src/runtime/NEON/functions/NEFlattenLayer.cpp | 2 +- src/runtime/NEON/functions/NEFloor.cpp | 2 +- src/runtime/NEON/functions/NEFullyConnectedLayer.cpp | 2 +- src/runtime/NEON/functions/NEGEMM.cpp | 2 +- src/runtime/NEON/functions/NEGEMMConv2d.cpp | 2 +- src/runtime/NEON/functions/NEGEMMConvolutionLayer.cpp | 2 +- src/runtime/NEON/functions/NEGEMMLowpMatrixMultiplyCore.cpp | 2 +- src/runtime/NEON/functions/NEGEMMLowpOutputStage.cpp | 2 +- src/runtime/NEON/functions/NEPReluLayer.cpp | 2 +- src/runtime/NEON/functions/NEPermute.cpp | 2 +- src/runtime/NEON/functions/NEPixelWiseMultiplication.cpp | 2 +- src/runtime/NEON/functions/NEPoolingLayer.cpp | 2 +- src/runtime/NEON/functions/NEQLSTMLayer.cpp | 2 +- src/runtime/NEON/functions/NEQuantizationLayer.cpp | 2 +- src/runtime/NEON/functions/NEReshapeLayer.cpp | 2 +- src/runtime/NEON/functions/NEScale.cpp | 2 +- src/runtime/NEON/functions/NESoftmaxLayer.cpp | 4 ++-- src/runtime/NEON/functions/NETranspose.cpp | 2 +- src/runtime/NEON/functions/NEWinogradConvolutionLayer.cpp | 4 ++-- 34 files changed, 40 insertions(+), 40 deletions(-) (limited to 'src/runtime/NEON') diff --git a/src/runtime/NEON/functions/NEActivationLayer.cpp b/src/runtime/NEON/functions/NEActivationLayer.cpp index 2b5c51fa5a..e48aede590 100644 --- a/src/runtime/NEON/functions/NEActivationLayer.cpp +++ b/src/runtime/NEON/functions/NEActivationLayer.cpp @@ -24,7 +24,7 @@ #include "arm_compute/runtime/NEON/functions/NEActivationLayer.h" #include "arm_compute/core/Validate.h" -#include "src/runtime/cpu/operators/CpuActivation.h" +#include "src/cpu/operators/CpuActivation.h" namespace arm_compute { diff --git a/src/runtime/NEON/functions/NEArithmeticAddition.cpp b/src/runtime/NEON/functions/NEArithmeticAddition.cpp index 2e4755b949..a7581ca9f4 100644 --- a/src/runtime/NEON/functions/NEArithmeticAddition.cpp +++ b/src/runtime/NEON/functions/NEArithmeticAddition.cpp @@ -24,7 +24,7 @@ #include "arm_compute/runtime/NEON/functions/NEArithmeticAddition.h" #include "arm_compute/core/Validate.h" -#include "src/runtime/cpu/operators/CpuAdd.h" +#include "src/cpu/operators/CpuAdd.h" #include diff --git a/src/runtime/NEON/functions/NEArithmeticSubtraction.cpp b/src/runtime/NEON/functions/NEArithmeticSubtraction.cpp index 0263d4cbb6..6fdd4267bf 100644 --- a/src/runtime/NEON/functions/NEArithmeticSubtraction.cpp +++ b/src/runtime/NEON/functions/NEArithmeticSubtraction.cpp @@ -24,7 +24,7 @@ #include "arm_compute/runtime/NEON/functions/NEArithmeticSubtraction.h" #include "arm_compute/core/ITensor.h" -#include "src/runtime/cpu/operators/CpuSub.h" +#include "src/cpu/operators/CpuSub.h" #include diff --git a/src/runtime/NEON/functions/NECast.cpp b/src/runtime/NEON/functions/NECast.cpp index b519576ad5..a39e639ad4 100644 --- a/src/runtime/NEON/functions/NECast.cpp +++ b/src/runtime/NEON/functions/NECast.cpp @@ -24,7 +24,7 @@ #include "arm_compute/runtime/NEON/functions/NECast.h" #include "arm_compute/core/Validate.h" -#include "src/runtime/cpu/operators/CpuCast.h" +#include "src/cpu/operators/CpuCast.h" namespace arm_compute { diff --git a/src/runtime/NEON/functions/NEConcatenateLayer.cpp b/src/runtime/NEON/functions/NEConcatenateLayer.cpp index dcc5cd3a64..ceb697aad6 100644 --- a/src/runtime/NEON/functions/NEConcatenateLayer.cpp +++ b/src/runtime/NEON/functions/NEConcatenateLayer.cpp @@ -23,7 +23,7 @@ */ #include "arm_compute/runtime/NEON/functions/NEConcatenateLayer.h" -#include "src/runtime/cpu/operators/CpuConcatenate.h" +#include "src/cpu/operators/CpuConcatenate.h" #include "arm_compute/core/utils/misc/ShapeCalculator.h" #include "arm_compute/runtime/NEON/NEScheduler.h" diff --git a/src/runtime/NEON/functions/NEConvertFullyConnectedWeights.cpp b/src/runtime/NEON/functions/NEConvertFullyConnectedWeights.cpp index 1f6b3c94e2..535ac99001 100644 --- a/src/runtime/NEON/functions/NEConvertFullyConnectedWeights.cpp +++ b/src/runtime/NEON/functions/NEConvertFullyConnectedWeights.cpp @@ -24,7 +24,7 @@ #include "arm_compute/runtime/NEON/functions/NEConvertFullyConnectedWeights.h" #include "arm_compute/core/Validate.h" -#include "src/runtime/cpu/operators/CpuConvertFullyConnectedWeights.h" +#include "src/cpu/operators/CpuConvertFullyConnectedWeights.h" namespace arm_compute { diff --git a/src/runtime/NEON/functions/NEConvolutionLayer.cpp b/src/runtime/NEON/functions/NEConvolutionLayer.cpp index 8bd1119a69..ca62a40cc8 100644 --- a/src/runtime/NEON/functions/NEConvolutionLayer.cpp +++ b/src/runtime/NEON/functions/NEConvolutionLayer.cpp @@ -28,11 +28,11 @@ #include "arm_compute/core/Validate.h" #include "arm_compute/runtime/NEON/functions/NEFFTConvolutionLayer.h" #include "src/core/helpers/MemoryHelpers.h" -#include "src/runtime/cpu/operators/CpuConv2d.h" -#include "src/runtime/cpu/operators/CpuDirectConv2d.h" -#include "src/runtime/cpu/operators/CpuGemmConv2d.h" -#include "src/runtime/cpu/operators/CpuGemmDirectConv2d.h" -#include "src/runtime/cpu/operators/CpuWinogradConv2d.h" +#include "src/cpu/operators/CpuConv2d.h" +#include "src/cpu/operators/CpuDirectConv2d.h" +#include "src/cpu/operators/CpuGemmConv2d.h" +#include "src/cpu/operators/CpuGemmDirectConv2d.h" +#include "src/cpu/operators/CpuWinogradConv2d.h" namespace arm_compute { diff --git a/src/runtime/NEON/functions/NECopy.cpp b/src/runtime/NEON/functions/NECopy.cpp index 20642b5eed..c2059e8e98 100644 --- a/src/runtime/NEON/functions/NECopy.cpp +++ b/src/runtime/NEON/functions/NECopy.cpp @@ -24,7 +24,7 @@ #include "arm_compute/runtime/NEON/functions/NECopy.h" #include "arm_compute/core/Validate.h" -#include "src/runtime/cpu/operators/CpuCopy.h" +#include "src/cpu/operators/CpuCopy.h" #include diff --git a/src/runtime/NEON/functions/NEDepthConvertLayer.cpp b/src/runtime/NEON/functions/NEDepthConvertLayer.cpp index 07e985c25e..1ec32074a5 100644 --- a/src/runtime/NEON/functions/NEDepthConvertLayer.cpp +++ b/src/runtime/NEON/functions/NEDepthConvertLayer.cpp @@ -24,7 +24,7 @@ #include "arm_compute/runtime/NEON/functions/NEDepthConvertLayer.h" #include "arm_compute/core/Validate.h" -#include "src/runtime/cpu/operators/CpuCast.h" +#include "src/cpu/operators/CpuCast.h" #include diff --git a/src/runtime/NEON/functions/NEDepthwiseConvolutionLayer.cpp b/src/runtime/NEON/functions/NEDepthwiseConvolutionLayer.cpp index daa5fd5ab9..ed6dec3850 100644 --- a/src/runtime/NEON/functions/NEDepthwiseConvolutionLayer.cpp +++ b/src/runtime/NEON/functions/NEDepthwiseConvolutionLayer.cpp @@ -27,7 +27,7 @@ #include "arm_compute/core/utils/misc/ShapeCalculator.h" #include "arm_compute/core/utils/quantization/AsymmHelpers.h" #include "arm_compute/runtime/NEON/NEScheduler.h" -#include "src/runtime/cpu/operators/CpuDepthwiseConv2d.h" +#include "src/cpu/operators/CpuDepthwiseConv2d.h" using namespace arm_compute::misc; using namespace arm_compute::misc::shape_calculator; diff --git a/src/runtime/NEON/functions/NEDequantizationLayer.cpp b/src/runtime/NEON/functions/NEDequantizationLayer.cpp index 91e37594af..83e0131c83 100644 --- a/src/runtime/NEON/functions/NEDequantizationLayer.cpp +++ b/src/runtime/NEON/functions/NEDequantizationLayer.cpp @@ -26,7 +26,7 @@ #include "arm_compute/core/Validate.h" #include "arm_compute/runtime/Tensor.h" -#include "src/runtime/cpu/operators/CpuDequantize.h" +#include "src/cpu/operators/CpuDequantize.h" namespace arm_compute { diff --git a/src/runtime/NEON/functions/NEDirectConvolutionLayer.cpp b/src/runtime/NEON/functions/NEDirectConvolutionLayer.cpp index 58530e4a8f..ef3d3d6055 100644 --- a/src/runtime/NEON/functions/NEDirectConvolutionLayer.cpp +++ b/src/runtime/NEON/functions/NEDirectConvolutionLayer.cpp @@ -27,7 +27,7 @@ #include "arm_compute/core/Utils.h" #include "arm_compute/core/Validate.h" #include "arm_compute/runtime/NEON/NEScheduler.h" -#include "src/runtime/cpu/operators/CpuDirectConv2d.h" +#include "src/cpu/operators/CpuDirectConv2d.h" namespace arm_compute { diff --git a/src/runtime/NEON/functions/NEElementwiseOperations.cpp b/src/runtime/NEON/functions/NEElementwiseOperations.cpp index 946bbb24b8..c958adf97c 100644 --- a/src/runtime/NEON/functions/NEElementwiseOperations.cpp +++ b/src/runtime/NEON/functions/NEElementwiseOperations.cpp @@ -23,7 +23,7 @@ */ #include "arm_compute/runtime/NEON/functions/NEElementwiseOperations.h" #include "arm_compute/core/Validate.h" -#include "src/runtime/cpu/operators/CpuElementwise.h" +#include "src/cpu/operators/CpuElementwise.h" #include "arm_compute/core/ITensor.h" diff --git a/src/runtime/NEON/functions/NEElementwiseUnaryLayer.cpp b/src/runtime/NEON/functions/NEElementwiseUnaryLayer.cpp index 1a9e8839ca..a0674ec320 100644 --- a/src/runtime/NEON/functions/NEElementwiseUnaryLayer.cpp +++ b/src/runtime/NEON/functions/NEElementwiseUnaryLayer.cpp @@ -22,7 +22,7 @@ * SOFTWARE. */ #include "arm_compute/runtime/NEON/functions/NEElementwiseUnaryLayer.h" -#include "src/runtime/cpu/operators/CpuElementwiseUnary.h" +#include "src/cpu/operators/CpuElementwiseUnary.h" #include namespace arm_compute diff --git a/src/runtime/NEON/functions/NEFill.cpp b/src/runtime/NEON/functions/NEFill.cpp index ee539fdfc8..43667783bf 100644 --- a/src/runtime/NEON/functions/NEFill.cpp +++ b/src/runtime/NEON/functions/NEFill.cpp @@ -24,7 +24,7 @@ #include "arm_compute/runtime/NEON/functions/NEFill.h" #include "arm_compute/core/Validate.h" -#include "src/runtime/cpu/operators/CpuFill.h" +#include "src/cpu/operators/CpuFill.h" #include diff --git a/src/runtime/NEON/functions/NEFlattenLayer.cpp b/src/runtime/NEON/functions/NEFlattenLayer.cpp index 4d1054ad25..f435842634 100644 --- a/src/runtime/NEON/functions/NEFlattenLayer.cpp +++ b/src/runtime/NEON/functions/NEFlattenLayer.cpp @@ -27,7 +27,7 @@ #include "arm_compute/core/Validate.h" #include "arm_compute/core/utils/misc/ShapeCalculator.h" #include "src/core/helpers/AutoConfiguration.h" -#include "src/runtime/cpu/operators/CpuFlatten.h" +#include "src/cpu/operators/CpuFlatten.h" namespace arm_compute { diff --git a/src/runtime/NEON/functions/NEFloor.cpp b/src/runtime/NEON/functions/NEFloor.cpp index f8a3c13d6d..d2dc48a159 100644 --- a/src/runtime/NEON/functions/NEFloor.cpp +++ b/src/runtime/NEON/functions/NEFloor.cpp @@ -24,7 +24,7 @@ #include "arm_compute/runtime/NEON/functions/NEFloor.h" #include "arm_compute/core/Validate.h" -#include "src/runtime/cpu/operators/CpuFloor.h" +#include "src/cpu/operators/CpuFloor.h" namespace arm_compute { diff --git a/src/runtime/NEON/functions/NEFullyConnectedLayer.cpp b/src/runtime/NEON/functions/NEFullyConnectedLayer.cpp index cb7e2dc7ec..3f55a1f34e 100644 --- a/src/runtime/NEON/functions/NEFullyConnectedLayer.cpp +++ b/src/runtime/NEON/functions/NEFullyConnectedLayer.cpp @@ -28,7 +28,7 @@ #include "arm_compute/runtime/MemoryGroup.h" #include "arm_compute/runtime/NEON/functions/NEConvertFullyConnectedWeights.h" #include "src/core/helpers/MemoryHelpers.h" -#include "src/runtime/cpu/operators/CpuFullyConnected.h" +#include "src/cpu/operators/CpuFullyConnected.h" namespace arm_compute { diff --git a/src/runtime/NEON/functions/NEGEMM.cpp b/src/runtime/NEON/functions/NEGEMM.cpp index b470afe1c6..58ade9fb3a 100644 --- a/src/runtime/NEON/functions/NEGEMM.cpp +++ b/src/runtime/NEON/functions/NEGEMM.cpp @@ -30,7 +30,7 @@ #include "arm_compute/runtime/Tensor.h" #include "src/core/CPP/Validate.h" #include "src/core/helpers/MemoryHelpers.h" -#include "src/runtime/cpu/operators/CpuGemm.h" +#include "src/cpu/operators/CpuGemm.h" using namespace arm_compute::experimental; diff --git a/src/runtime/NEON/functions/NEGEMMConv2d.cpp b/src/runtime/NEON/functions/NEGEMMConv2d.cpp index 2230e80e4b..42b8b70405 100644 --- a/src/runtime/NEON/functions/NEGEMMConv2d.cpp +++ b/src/runtime/NEON/functions/NEGEMMConv2d.cpp @@ -26,7 +26,7 @@ #include "arm_compute/core/utils/misc/ShapeCalculator.h" #include "arm_compute/runtime/Tensor.h" #include "src/core/helpers/MemoryHelpers.h" -#include "src/runtime/cpu/operators/CpuGemmDirectConv2d.h" +#include "src/cpu/operators/CpuGemmDirectConv2d.h" namespace arm_compute { diff --git a/src/runtime/NEON/functions/NEGEMMConvolutionLayer.cpp b/src/runtime/NEON/functions/NEGEMMConvolutionLayer.cpp index 47ab16816a..c780d63763 100644 --- a/src/runtime/NEON/functions/NEGEMMConvolutionLayer.cpp +++ b/src/runtime/NEON/functions/NEGEMMConvolutionLayer.cpp @@ -28,7 +28,7 @@ #include "arm_compute/core/Validate.h" #include "arm_compute/runtime/Tensor.h" #include "src/core/helpers/MemoryHelpers.h" -#include "src/runtime/cpu/operators/CpuGemmConv2d.h" +#include "src/cpu/operators/CpuGemmConv2d.h" using namespace arm_compute::experimental; diff --git a/src/runtime/NEON/functions/NEGEMMLowpMatrixMultiplyCore.cpp b/src/runtime/NEON/functions/NEGEMMLowpMatrixMultiplyCore.cpp index b85530c70f..6c179f8387 100644 --- a/src/runtime/NEON/functions/NEGEMMLowpMatrixMultiplyCore.cpp +++ b/src/runtime/NEON/functions/NEGEMMLowpMatrixMultiplyCore.cpp @@ -31,7 +31,7 @@ #include "arm_compute/runtime/Tensor.h" #include "src/core/helpers/MemoryHelpers.h" -#include "src/runtime/cpu/operators/CpuGemmLowpMatrixMultiplyCore.h" +#include "src/cpu/operators/CpuGemmLowpMatrixMultiplyCore.h" using namespace arm_compute::experimental; diff --git a/src/runtime/NEON/functions/NEGEMMLowpOutputStage.cpp b/src/runtime/NEON/functions/NEGEMMLowpOutputStage.cpp index 8351cc66d0..7e1de3c257 100644 --- a/src/runtime/NEON/functions/NEGEMMLowpOutputStage.cpp +++ b/src/runtime/NEON/functions/NEGEMMLowpOutputStage.cpp @@ -25,7 +25,7 @@ #include "arm_compute/core/ITensor.h" #include "arm_compute/core/Validate.h" -#include "src/runtime/cpu/operators/CpuGemmLowpOutputStage.h" +#include "src/cpu/operators/CpuGemmLowpOutputStage.h" namespace arm_compute { diff --git a/src/runtime/NEON/functions/NEPReluLayer.cpp b/src/runtime/NEON/functions/NEPReluLayer.cpp index a05b545e9a..80c5690a4e 100644 --- a/src/runtime/NEON/functions/NEPReluLayer.cpp +++ b/src/runtime/NEON/functions/NEPReluLayer.cpp @@ -24,7 +24,7 @@ #include "arm_compute/runtime/NEON/functions/NEPReluLayer.h" #include "arm_compute/core/ITensor.h" -#include "src/runtime/cpu/operators/CpuPRelu.h" +#include "src/cpu/operators/CpuPRelu.h" namespace arm_compute { diff --git a/src/runtime/NEON/functions/NEPermute.cpp b/src/runtime/NEON/functions/NEPermute.cpp index f707fad757..517b86a1cb 100644 --- a/src/runtime/NEON/functions/NEPermute.cpp +++ b/src/runtime/NEON/functions/NEPermute.cpp @@ -24,7 +24,7 @@ #include "arm_compute/runtime/NEON/functions/NEPermute.h" #include "arm_compute/core/Validate.h" -#include "src/runtime/cpu/operators/CpuPermute.h" +#include "src/cpu/operators/CpuPermute.h" namespace arm_compute { diff --git a/src/runtime/NEON/functions/NEPixelWiseMultiplication.cpp b/src/runtime/NEON/functions/NEPixelWiseMultiplication.cpp index 3a2f1984b4..ad83a26beb 100644 --- a/src/runtime/NEON/functions/NEPixelWiseMultiplication.cpp +++ b/src/runtime/NEON/functions/NEPixelWiseMultiplication.cpp @@ -24,7 +24,7 @@ #include "arm_compute/runtime/NEON/functions/NEPixelWiseMultiplication.h" #include "arm_compute/core/ITensor.h" -#include "src/runtime/cpu/operators/CpuMul.h" +#include "src/cpu/operators/CpuMul.h" #include diff --git a/src/runtime/NEON/functions/NEPoolingLayer.cpp b/src/runtime/NEON/functions/NEPoolingLayer.cpp index 8d267a32c0..5a3b9c5e7e 100644 --- a/src/runtime/NEON/functions/NEPoolingLayer.cpp +++ b/src/runtime/NEON/functions/NEPoolingLayer.cpp @@ -27,7 +27,7 @@ #include "arm_compute/core/Validate.h" #include "arm_compute/runtime/Tensor.h" #include "src/core/helpers/MemoryHelpers.h" -#include "src/runtime/cpu/operators/CpuPool2d.h" +#include "src/cpu/operators/CpuPool2d.h" namespace arm_compute { diff --git a/src/runtime/NEON/functions/NEQLSTMLayer.cpp b/src/runtime/NEON/functions/NEQLSTMLayer.cpp index 946791a104..565c5531c4 100644 --- a/src/runtime/NEON/functions/NEQLSTMLayer.cpp +++ b/src/runtime/NEON/functions/NEQLSTMLayer.cpp @@ -32,8 +32,8 @@ #include "arm_compute/core/utils/quantization/AsymmHelpers.h" #include "arm_compute/runtime/NEON/NEScheduler.h" #include "src/core/NEON/kernels/NEQLSTMLayerNormalizationKernel.h" -#include "src/core/cpu/kernels/CpuGemmLowpMatrixReductionKernel.h" #include "src/core/helpers/WindowHelpers.h" +#include "src/cpu/kernels/CpuGemmLowpMatrixReductionKernel.h" namespace arm_compute { diff --git a/src/runtime/NEON/functions/NEQuantizationLayer.cpp b/src/runtime/NEON/functions/NEQuantizationLayer.cpp index e607917615..dad246ac89 100644 --- a/src/runtime/NEON/functions/NEQuantizationLayer.cpp +++ b/src/runtime/NEON/functions/NEQuantizationLayer.cpp @@ -26,7 +26,7 @@ #include "arm_compute/core/Validate.h" #include "arm_compute/runtime/Tensor.h" -#include "src/runtime/cpu/operators/CpuQuantize.h" +#include "src/cpu/operators/CpuQuantize.h" namespace arm_compute { diff --git a/src/runtime/NEON/functions/NEReshapeLayer.cpp b/src/runtime/NEON/functions/NEReshapeLayer.cpp index c0c78ea652..3ccb42361e 100644 --- a/src/runtime/NEON/functions/NEReshapeLayer.cpp +++ b/src/runtime/NEON/functions/NEReshapeLayer.cpp @@ -24,7 +24,7 @@ #include "arm_compute/runtime/NEON/functions/NEReshapeLayer.h" #include "arm_compute/core/Validate.h" -#include "src/runtime/cpu/operators/CpuReshape.h" +#include "src/cpu/operators/CpuReshape.h" #include diff --git a/src/runtime/NEON/functions/NEScale.cpp b/src/runtime/NEON/functions/NEScale.cpp index 0fbad07d0f..b952858181 100644 --- a/src/runtime/NEON/functions/NEScale.cpp +++ b/src/runtime/NEON/functions/NEScale.cpp @@ -26,7 +26,7 @@ #include "arm_compute/core/Validate.h" #include "arm_compute/runtime/Tensor.h" #include "src/core/utils/ScaleUtils.h" -#include "src/runtime/cpu/operators/CpuScale.h" +#include "src/cpu/operators/CpuScale.h" #include "support/Rounding.h" namespace arm_compute diff --git a/src/runtime/NEON/functions/NESoftmaxLayer.cpp b/src/runtime/NEON/functions/NESoftmaxLayer.cpp index bee692c08b..0947ff94a6 100644 --- a/src/runtime/NEON/functions/NESoftmaxLayer.cpp +++ b/src/runtime/NEON/functions/NESoftmaxLayer.cpp @@ -25,10 +25,10 @@ #include "arm_compute/core/Validate.h" #include "arm_compute/runtime/MemoryGroup.h" #include "arm_compute/runtime/Tensor.h" -#include "src/core/cpu/kernels/CpuSoftmaxKernel.h" #include "src/core/helpers/MemoryHelpers.h" #include "src/core/helpers/SoftmaxHelpers.h" -#include "src/runtime/cpu/operators/CpuSoftmax.h" +#include "src/cpu/kernels/CpuSoftmaxKernel.h" +#include "src/cpu/operators/CpuSoftmax.h" namespace arm_compute { diff --git a/src/runtime/NEON/functions/NETranspose.cpp b/src/runtime/NEON/functions/NETranspose.cpp index 3b3023f3b3..b6bf15e428 100644 --- a/src/runtime/NEON/functions/NETranspose.cpp +++ b/src/runtime/NEON/functions/NETranspose.cpp @@ -24,7 +24,7 @@ #include "arm_compute/runtime/NEON/functions/NETranspose.h" #include "arm_compute/core/Validate.h" -#include "src/runtime/cpu/operators/CpuTranspose.h" +#include "src/cpu/operators/CpuTranspose.h" namespace arm_compute { diff --git a/src/runtime/NEON/functions/NEWinogradConvolutionLayer.cpp b/src/runtime/NEON/functions/NEWinogradConvolutionLayer.cpp index 98ff12590b..f0c153d4f4 100644 --- a/src/runtime/NEON/functions/NEWinogradConvolutionLayer.cpp +++ b/src/runtime/NEON/functions/NEWinogradConvolutionLayer.cpp @@ -29,9 +29,9 @@ #include "arm_compute/core/Validate.h" #include "arm_compute/core/utils/misc/ShapeCalculator.h" #include "src/core/CPP/Validate.h" -#include "src/core/cpu/kernels/CpuWinogradConv2dKernel.h" #include "src/core/helpers/MemoryHelpers.h" -#include "src/runtime/cpu/operators/CpuWinogradConv2d.h" +#include "src/cpu/kernels/CpuWinogradConv2dKernel.h" +#include "src/cpu/operators/CpuWinogradConv2d.h" #include "src/core/NEON/kernels/convolution/common/utils.hpp" #include "src/core/NEON/kernels/convolution/winograd/winograd.hpp" -- cgit v1.2.1