diff options
Diffstat (limited to 'Android.bp')
| -rw-r--r-- | Android.bp | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/Android.bp b/Android.bp index 18d16c029f..580f0db1cb 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/NEActivationLayerKernel.cpp", "src/core/NEON/kernels/NEArithmeticAdditionKernel.cpp", "src/core/NEON/kernels/NEArithmeticSubtractionKernel.cpp", "src/core/NEON/kernels/NEBatchConcatenateLayerKernel.cpp", @@ -342,16 +341,6 @@ cc_library_static { "src/core/NEON/kernels/NEWeightsReshapeKernel.cpp", "src/core/NEON/kernels/NEWidthConcatenateLayerKernel.cpp", "src/core/NEON/kernels/NEWinogradConvolutionLayerKernel.cpp", - "src/core/NEON/kernels/activation/impl/NEON/fp16.cpp", - "src/core/NEON/kernels/activation/impl/NEON/fp32.cpp", - "src/core/NEON/kernels/activation/impl/NEON/qasymm8.cpp", - "src/core/NEON/kernels/activation/impl/NEON/qasymm8_signed.cpp", - "src/core/NEON/kernels/activation/impl/NEON/qsymm16.cpp", - "src/core/NEON/kernels/activation/impl/SVE/fp16.cpp", - "src/core/NEON/kernels/activation/impl/SVE/fp32.cpp", - "src/core/NEON/kernels/activation/impl/SVE/qasymm8.cpp", - "src/core/NEON/kernels/activation/impl/SVE/qasymm8_signed.cpp", - "src/core/NEON/kernels/activation/impl/SVE/qsymm16.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", @@ -424,9 +413,20 @@ cc_library_static { "src/core/Utils.cpp", "src/core/Validate.cpp", "src/core/Version.cpp", - "src/core/cpu/kernels/floor/CpuFloorKernel.cpp", - "src/core/cpu/kernels/floor/impl/NEON/fp16.cpp", - "src/core/cpu/kernels/floor/impl/NEON/fp32.cpp", + "src/core/cpu/kernels/CpuActivationKernel.cpp", + "src/core/cpu/kernels/CpuFloorKernel.cpp", + "src/core/cpu/kernels/activation/NEON/fp16.cpp", + "src/core/cpu/kernels/activation/NEON/fp32.cpp", + "src/core/cpu/kernels/activation/NEON/qasymm8.cpp", + "src/core/cpu/kernels/activation/NEON/qasymm8_signed.cpp", + "src/core/cpu/kernels/activation/NEON/qsymm16.cpp", + "src/core/cpu/kernels/activation/SVE/fp16.cpp", + "src/core/cpu/kernels/activation/SVE/fp32.cpp", + "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/floor/NEON/fp16.cpp", + "src/core/cpu/kernels/floor/NEON/fp32.cpp", "src/core/helpers/SoftmaxHelpers.cpp", "src/core/helpers/WindowHelpers.cpp", "src/core/utils/ScaleUtils.cpp", @@ -763,6 +763,7 @@ cc_library_static { "src/runtime/Tensor.cpp", "src/runtime/TensorAllocator.cpp", "src/runtime/Utils.cpp", + "src/runtime/cpu/operators/CpuActivation.cpp", "src/runtime/cpu/operators/CpuFloor.cpp", "utils/CommonGraphOptions.cpp", "utils/GraphUtils.cpp", |