From 60c3b0e6821a80d78ffca5be30e05d062d071cd2 Mon Sep 17 00:00:00 2001 From: Michalis Spyrou Date: Thu, 8 Apr 2021 12:02:58 +0100 Subject: Port DepthwiseConvolution to new API Resolves: COMPMID-4185 Change-Id: Ib5f22356356a022d567bb18d44ea272b62d10ebf Signed-off-by: Michalis Spyrou Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/5424 Reviewed-by: Michele Di Giorgio Tested-by: Arm Jenkins Comments-Addressed: Arm Jenkins --- Android.bp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'Android.bp') diff --git a/Android.bp b/Android.bp index 3736ef754f..d968f029a2 100644 --- a/Android.bp +++ b/Android.bp @@ -176,7 +176,6 @@ cc_library_static { "src/core/NEON/kernels/NECropKernel.cpp", "src/core/NEON/kernels/NEDepthConvertLayerKernel.cpp", "src/core/NEON/kernels/NEDepthToSpaceLayerKernel.cpp", - "src/core/NEON/kernels/NEDepthwiseConvolutionLayerNativeKernel.cpp", "src/core/NEON/kernels/NEFFTDigitReverseKernel.cpp", "src/core/NEON/kernels/NEFFTRadixStageKernel.cpp", "src/core/NEON/kernels/NEFFTScaleKernel.cpp", @@ -299,6 +298,7 @@ cc_library_static { "src/core/cpu/kernels/CpuConcatenateHeightKernel.cpp", "src/core/cpu/kernels/CpuConcatenateWidthKernel.cpp", "src/core/cpu/kernels/CpuCopyKernel.cpp", + "src/core/cpu/kernels/CpuDepthwiseConvolutionNativeKernel.cpp", "src/core/cpu/kernels/CpuDequantizationKernel.cpp", "src/core/cpu/kernels/CpuDirectConvolutionKernel.cpp", "src/core/cpu/kernels/CpuDirectConvolutionStageKernel.cpp", @@ -612,7 +612,6 @@ cc_library_static { "src/runtime/NEON/functions/NETranspose.cpp", "src/runtime/NEON/functions/NEUnstack.cpp", "src/runtime/NEON/functions/NEWinogradConvolutionLayer.cpp", - "src/runtime/NEON/functions/assembly/NEDepthwiseConvolutionAssemblyDispatch.cpp", "src/runtime/OMP/OMPScheduler.cpp", "src/runtime/OffsetLifetimeManager.cpp", "src/runtime/OffsetMemoryPool.cpp", @@ -630,6 +629,8 @@ cc_library_static { "src/runtime/cpu/operators/CpuAdd.cpp", "src/runtime/cpu/operators/CpuConcatenate.cpp", "src/runtime/cpu/operators/CpuCopy.cpp", + "src/runtime/cpu/operators/CpuDepthwiseConvolution.cpp", + "src/runtime/cpu/operators/CpuDepthwiseConvolutionAssemblyDispatch.cpp", "src/runtime/cpu/operators/CpuDequantization.cpp", "src/runtime/cpu/operators/CpuDirectConvolution.cpp", "src/runtime/cpu/operators/CpuElementwise.cpp", -- cgit v1.2.1