From 6124390be4690ba06c404d56449f7e5d390cef53 Mon Sep 17 00:00:00 2001 From: Sheri Zhang Date: Tue, 12 Jan 2021 18:25:16 +0000 Subject: Make Add kernel and operator stateless - Rename NEArithmeticAdditionKernel to CpuAddKernel Cpu and move files appropriately - Add CpuAdd under src/runtime/cpu/operators Partially resolves: COMPMID-4005 Signed-off-by: Sheri Zhang Change-Id: I1d8d406df9773fea198899f50327407d7125c38d Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/4867 Comments-Addressed: Arm Jenkins Tested-by: Arm Jenkins Reviewed-by: Gian Marco Iodice Reviewed-by: Georgios Pinitas --- Android.bp | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'Android.bp') diff --git a/Android.bp b/Android.bp index 5ebcb30b37..e686bdf78a 100644 --- a/Android.bp +++ b/Android.bp @@ -226,7 +226,6 @@ cc_library_static { "src/core/MultiImageInfo.cpp", "src/core/NEON/kernels/NEAbsoluteDifferenceKernel.cpp", "src/core/NEON/kernels/NEAccumulateKernel.cpp", - "src/core/NEON/kernels/NEArithmeticAdditionKernel.cpp", "src/core/NEON/kernels/NEArithmeticSubtractionKernel.cpp", "src/core/NEON/kernels/NEBatchNormalizationLayerKernel.cpp", "src/core/NEON/kernels/NEBatchToSpaceLayerKernel.cpp", @@ -337,14 +336,6 @@ cc_library_static { "src/core/NEON/kernels/NEWarpKernel.cpp", "src/core/NEON/kernels/NEWeightsReshapeKernel.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", - "src/core/NEON/kernels/arithmetic_addition/impl/NEON/qasymm8_signed.cpp", - "src/core/NEON/kernels/arithmetic_addition/impl/NEON/qsymm16.cpp", - "src/core/NEON/kernels/arithmetic_addition/impl/SVE/integer.cpp", - "src/core/NEON/kernels/arithmetic_addition/impl/SVE/qasymm8.cpp", - "src/core/NEON/kernels/arithmetic_addition/impl/SVE/qasymm8_signed.cpp", - "src/core/NEON/kernels/arithmetic_addition/impl/SVE/qsymm16.cpp", "src/core/NEON/kernels/arm_gemm/gemm_bf16.cpp", "src/core/NEON/kernels/arm_gemm/gemm_fp16.cpp", "src/core/NEON/kernels/arm_gemm/gemm_fp32.cpp", @@ -420,6 +411,7 @@ cc_library_static { "src/core/Validate.cpp", "src/core/Version.cpp", "src/core/cpu/kernels/CpuActivationKernel.cpp", + "src/core/cpu/kernels/CpuAddKernel.cpp", "src/core/cpu/kernels/CpuConcatenateBatchKernel.cpp", "src/core/cpu/kernels/CpuConcatenateDepthKernel.cpp", "src/core/cpu/kernels/CpuConcatenateHeightKernel.cpp", @@ -435,6 +427,14 @@ cc_library_static { "src/core/cpu/kernels/activation/SVE/qasymm8.cpp", "src/core/cpu/kernels/activation/SVE/qasymm8_signed.cpp", "src/core/cpu/kernels/activation/SVE/qsymm16.cpp", + "src/core/cpu/kernels/add/neon/integer.cpp", + "src/core/cpu/kernels/add/neon/qasymm8.cpp", + "src/core/cpu/kernels/add/neon/qasymm8_signed.cpp", + "src/core/cpu/kernels/add/neon/qsymm16.cpp", + "src/core/cpu/kernels/add/sve/integer.cpp", + "src/core/cpu/kernels/add/sve/qasymm8.cpp", + "src/core/cpu/kernels/add/sve/qasymm8_signed.cpp", + "src/core/cpu/kernels/add/sve/qsymm16.cpp", "src/core/cpu/kernels/floor/NEON/fp16.cpp", "src/core/cpu/kernels/floor/NEON/fp32.cpp", "src/core/helpers/SoftmaxHelpers.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/CpuAdd.cpp", "src/runtime/cpu/operators/CpuConcatenate.cpp", "src/runtime/cpu/operators/CpuFloor.cpp", "utils/CommonGraphOptions.cpp", -- cgit v1.2.1