From 11d8415aa57b69fb6c83e86a37e3026c22d1d37d Mon Sep 17 00:00:00 2001 From: Georgios Pinitas Date: Wed, 28 Apr 2021 10:20:18 +0100 Subject: Port DepthConvert to new Api - Renames DepthConvert to Cast - Ports both NEDepthConverLayer and CLDepthConvert variants - Removes legacy shift capability from DepthConvert, allowing only shifts of 0 Signed-off-by: Georgios Pinitas Change-Id: I806a0f8eb23d23502b632c529fda7edde19c8176 Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/5565 Tested-by: Arm Jenkins Reviewed-by: Michele Di Giorgio Comments-Addressed: Arm Jenkins --- Android.bp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'Android.bp') diff --git a/Android.bp b/Android.bp index 4be2bfd55d..c4438f9e76 100644 --- a/Android.bp +++ b/Android.bp @@ -85,7 +85,6 @@ cc_library_static { "src/core/CL/kernels/CLComparisonKernel.cpp", "src/core/CL/kernels/CLDeconvolutionLayerUpsampleKernel.cpp", "src/core/CL/kernels/CLDeconvolutionReshapeOutputKernel.cpp", - "src/core/CL/kernels/CLDepthConvertLayerKernel.cpp", "src/core/CL/kernels/CLDepthToSpaceLayerKernel.cpp", "src/core/CL/kernels/CLDepthwiseConvolutionLayer3x3NCHWKernel.cpp", "src/core/CL/kernels/CLDepthwiseConvolutionLayer3x3NHWCKernel.cpp", @@ -159,7 +158,6 @@ cc_library_static { "src/core/NEON/kernels/NECol2ImKernel.cpp", "src/core/NEON/kernels/NEConvertQuantizedSignednessKernel.cpp", "src/core/NEON/kernels/NECropKernel.cpp", - "src/core/NEON/kernels/NEDepthConvertLayerKernel.cpp", "src/core/NEON/kernels/NEDepthToSpaceLayerKernel.cpp", "src/core/NEON/kernels/NEFFTDigitReverseKernel.cpp", "src/core/NEON/kernels/NEFFTRadixStageKernel.cpp", @@ -278,6 +276,7 @@ cc_library_static { "src/core/Version.cpp", "src/core/cpu/kernels/CpuActivationKernel.cpp", "src/core/cpu/kernels/CpuAddKernel.cpp", + "src/core/cpu/kernels/CpuCastKernel.cpp", "src/core/cpu/kernels/CpuConcatenateBatchKernel.cpp", "src/core/cpu/kernels/CpuConcatenateDepthKernel.cpp", "src/core/cpu/kernels/CpuConcatenateHeightKernel.cpp", @@ -343,6 +342,7 @@ cc_library_static { "src/core/gpu/cl/ClKernelLibrary.cpp", "src/core/gpu/cl/kernels/ClActivationKernel.cpp", "src/core/gpu/cl/kernels/ClBatchConcatenateKernel.cpp", + "src/core/gpu/cl/kernels/ClCastKernel.cpp", "src/core/gpu/cl/kernels/ClConvertFullyConnectedWeightsKernel.cpp", "src/core/gpu/cl/kernels/ClCopyKernel.cpp", "src/core/gpu/cl/kernels/ClCropKernel.cpp", @@ -631,6 +631,7 @@ cc_library_static { "src/runtime/Utils.cpp", "src/runtime/cpu/operators/CpuActivation.cpp", "src/runtime/cpu/operators/CpuAdd.cpp", + "src/runtime/cpu/operators/CpuCast.cpp", "src/runtime/cpu/operators/CpuConcatenate.cpp", "src/runtime/cpu/operators/CpuConvertFullyConnectedWeights.cpp", "src/runtime/cpu/operators/CpuCopy.cpp", @@ -655,6 +656,7 @@ cc_library_static { "src/runtime/cpu/operators/internal/CpuGemmAssemblyDispatch.cpp", "src/runtime/gpu/cl/operators/ClActivation.cpp", "src/runtime/gpu/cl/operators/ClAdd.cpp", + "src/runtime/gpu/cl/operators/ClCast.cpp", "src/runtime/gpu/cl/operators/ClConcatenate.cpp", "src/runtime/gpu/cl/operators/ClConvertFullyConnectedWeights.cpp", "src/runtime/gpu/cl/operators/ClCopy.cpp", -- cgit v1.2.1