aboutsummaryrefslogtreecommitdiff
path: root/Android.bp
diff options
context:
space:
mode:
authorGeorgios Pinitas <georgios.pinitas@arm.com>2021-01-10 04:07:39 +0000
committerGeorgios Pinitas <georgios.pinitas@arm.com>2021-01-18 16:48:25 +0000
commit61ba0697756af0e4dc191af158669af0cee2be79 (patch)
tree1f04c06a759bfaa691728ea92d03375c08f5435f /Android.bp
parentb5a450a1acc1149f99f7bb06b10694fba554f4e3 (diff)
downloadComputeLibrary-61ba0697756af0e4dc191af158669af0cee2be79.tar.gz
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 <georgios.pinitas@arm.com> Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/4799 Comments-Addressed: Arm Jenkins <bsgcomp@arm.com> Tested-by: Arm Jenkins <bsgcomp@arm.com> Reviewed-by: Sang-Hoon Park <sang-hoon.park@arm.com> Reviewed-by: Giorgio Arena <giorgio.arena@arm.com>
Diffstat (limited to 'Android.bp')
-rw-r--r--Android.bp9
1 files changed, 5 insertions, 4 deletions
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",