From 61ba0697756af0e4dc191af158669af0cee2be79 Mon Sep 17 00:00:00 2001 From: Georgios Pinitas Date: Sun, 10 Jan 2021 04:07:39 +0000 Subject: Make Concatenate kernels and operator stateless - Rename all concatenate kernels to use the Cpu prefix and move appropriately Change-Id: If647173e84969936ebd211d4d5ae6d1e73150bdc Signed-off-by: Georgios Pinitas Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/4799 Comments-Addressed: Arm Jenkins Tested-by: Arm Jenkins Reviewed-by: Sang-Hoon Park Reviewed-by: Giorgio Arena --- Android.bp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'Android.bp') diff --git a/Android.bp b/Android.bp index 2675068e91..5ebcb30b37 100644 --- a/Android.bp +++ b/Android.bp @@ -228,7 +228,6 @@ cc_library_static { "src/core/NEON/kernels/NEAccumulateKernel.cpp", "src/core/NEON/kernels/NEArithmeticAdditionKernel.cpp", "src/core/NEON/kernels/NEArithmeticSubtractionKernel.cpp", - "src/core/NEON/kernels/NEBatchConcatenateLayerKernel.cpp", "src/core/NEON/kernels/NEBatchNormalizationLayerKernel.cpp", "src/core/NEON/kernels/NEBatchToSpaceLayerKernel.cpp", "src/core/NEON/kernels/NEBitwiseAndKernel.cpp", @@ -249,7 +248,6 @@ cc_library_static { "src/core/NEON/kernels/NECopyKernel.cpp", "src/core/NEON/kernels/NECropKernel.cpp", "src/core/NEON/kernels/NECumulativeDistributionKernel.cpp", - "src/core/NEON/kernels/NEDepthConcatenateLayerKernel.cpp", "src/core/NEON/kernels/NEDepthConvertLayerKernel.cpp", "src/core/NEON/kernels/NEDepthToSpaceLayerKernel.cpp", "src/core/NEON/kernels/NEDepthwiseConvolutionLayerNativeKernel.cpp", @@ -288,7 +286,6 @@ cc_library_static { "src/core/NEON/kernels/NEHOGDescriptorKernel.cpp", "src/core/NEON/kernels/NEHOGDetectorKernel.cpp", "src/core/NEON/kernels/NEHarrisCornersKernel.cpp", - "src/core/NEON/kernels/NEHeightConcatenateLayerKernel.cpp", "src/core/NEON/kernels/NEHistogramKernel.cpp", "src/core/NEON/kernels/NEIm2ColKernel.cpp", "src/core/NEON/kernels/NEInstanceNormalizationLayerKernel.cpp", @@ -339,7 +336,6 @@ cc_library_static { "src/core/NEON/kernels/NETransposeKernel.cpp", "src/core/NEON/kernels/NEWarpKernel.cpp", "src/core/NEON/kernels/NEWeightsReshapeKernel.cpp", - "src/core/NEON/kernels/NEWidthConcatenateLayerKernel.cpp", "src/core/NEON/kernels/NEWinogradConvolutionLayerKernel.cpp", "src/core/NEON/kernels/arithmetic_addition/impl/NEON/integer.cpp", "src/core/NEON/kernels/arithmetic_addition/impl/NEON/qasymm8.cpp", @@ -424,6 +420,10 @@ cc_library_static { "src/core/Validate.cpp", "src/core/Version.cpp", "src/core/cpu/kernels/CpuActivationKernel.cpp", + "src/core/cpu/kernels/CpuConcatenateBatchKernel.cpp", + "src/core/cpu/kernels/CpuConcatenateDepthKernel.cpp", + "src/core/cpu/kernels/CpuConcatenateHeightKernel.cpp", + "src/core/cpu/kernels/CpuConcatenateWidthKernel.cpp", "src/core/cpu/kernels/CpuFloorKernel.cpp", "src/core/cpu/kernels/activation/NEON/fp16.cpp", "src/core/cpu/kernels/activation/NEON/fp32.cpp", @@ -774,6 +774,7 @@ cc_library_static { "src/runtime/TensorAllocator.cpp", "src/runtime/Utils.cpp", "src/runtime/cpu/operators/CpuActivation.cpp", + "src/runtime/cpu/operators/CpuConcatenate.cpp", "src/runtime/cpu/operators/CpuFloor.cpp", "utils/CommonGraphOptions.cpp", "utils/GraphUtils.cpp", -- cgit v1.2.1