diff options
| author | Georgios Pinitas <georgios.pinitas@arm.com> | 2021-01-08 17:25:55 +0000 |
|---|---|---|
| committer | Georgios Pinitas <georgios.pinitas@arm.com> | 2021-01-11 16:48:31 +0000 |
| commit | f8f0442e9a6105be0e32f4defec5fbc10248ea6e (patch) | |
| tree | d4e77c82f57df175dcec6c46ed2f74f4a8b72d7a /Android.bp | |
| parent | 4f77ba9f2dccbae1b46b2d4e17d862560f858050 (diff) | |
| download | ComputeLibrary-f8f0442e9a6105be0e32f4defec5fbc10248ea6e.tar.gz | |
Make CpuActivation stateless
- Rename NEActivationLayer to CpuActivation
- Add member function to generate execution window
Partially Resolves: COMPMID-3992
Signed-off-by: Georgios Pinitas <georgios.pinitas@arm.com>
Change-Id: I4e1ae15cf456b860d3080b2fedc4dbcce7d1bb79
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/4791
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Michalis Spyrou <michalis.spyrou@arm.com>
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", |