aboutsummaryrefslogtreecommitdiff
path: root/Android.bp
diff options
context:
space:
mode:
Diffstat (limited to 'Android.bp')
-rw-r--r--Android.bp26
1 files changed, 13 insertions, 13 deletions
diff --git a/Android.bp b/Android.bp
index 13b70ea0b3..d1003f2d7d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -283,18 +283,17 @@ cc_library_static {
"src/core/cpu/kernels/CpuConcatenateWidthKernel.cpp",
"src/core/cpu/kernels/CpuConvertFullyConnectedWeightsKernel.cpp",
"src/core/cpu/kernels/CpuCopyKernel.cpp",
- "src/core/cpu/kernels/CpuDepthwiseConvolutionNativeKernel.cpp",
+ "src/core/cpu/kernels/CpuDepthwiseConv2dNativeKernel.cpp",
"src/core/cpu/kernels/CpuDequantizeKernel.cpp",
- "src/core/cpu/kernels/CpuDirectConvolutionKernel.cpp",
- "src/core/cpu/kernels/CpuDirectConvolutionOutputStageKernel.cpp",
+ "src/core/cpu/kernels/CpuDirectConv2dKernel.cpp",
+ "src/core/cpu/kernels/CpuDirectConv2dOutputStageKernel.cpp",
"src/core/cpu/kernels/CpuElementwiseKernel.cpp",
"src/core/cpu/kernels/CpuElementwiseUnaryKernel.cpp",
"src/core/cpu/kernels/CpuFillKernel.cpp",
"src/core/cpu/kernels/CpuFloorKernel.cpp",
"src/core/cpu/kernels/CpuMulKernel.cpp",
"src/core/cpu/kernels/CpuPermuteKernel.cpp",
- "src/core/cpu/kernels/CpuPoolingAssemblyWrapperKernel.cpp",
- "src/core/cpu/kernels/CpuPoolingKernel.cpp",
+ "src/core/cpu/kernels/CpuPool2dKernel.cpp",
"src/core/cpu/kernels/CpuQuantizeKernel.cpp",
"src/core/cpu/kernels/CpuReshapeKernel.cpp",
"src/core/cpu/kernels/CpuScaleKernel.cpp",
@@ -321,6 +320,7 @@ cc_library_static {
"src/core/cpu/kernels/add/sve/qsymm16.cpp",
"src/core/cpu/kernels/floor/NEON/fp16.cpp",
"src/core/cpu/kernels/floor/NEON/fp32.cpp",
+ "src/core/cpu/kernels/internal/CpuPool2dAssemblyWrapperKernel.cpp",
"src/core/cpu/kernels/pooling/neon/fp16.cpp",
"src/core/cpu/kernels/pooling/neon/fp32.cpp",
"src/core/cpu/kernels/pooling/neon/nchw/all.cpp",
@@ -348,7 +348,7 @@ cc_library_static {
"src/core/gpu/cl/kernels/ClCropKernel.cpp",
"src/core/gpu/cl/kernels/ClDepthConcatenateKernel.cpp",
"src/core/gpu/cl/kernels/ClDequantizeKernel.cpp",
- "src/core/gpu/cl/kernels/ClDirectConvolutionKernel.cpp",
+ "src/core/gpu/cl/kernels/ClDirectConv2dKernel.cpp",
"src/core/gpu/cl/kernels/ClElementwiseKernel.cpp",
"src/core/gpu/cl/kernels/ClElementwiseUnaryKernel.cpp",
"src/core/gpu/cl/kernels/ClFillKernel.cpp",
@@ -362,7 +362,7 @@ cc_library_static {
"src/core/gpu/cl/kernels/ClHeightConcatenateKernel.cpp",
"src/core/gpu/cl/kernels/ClMulKernel.cpp",
"src/core/gpu/cl/kernels/ClPermuteKernel.cpp",
- "src/core/gpu/cl/kernels/ClPoolingKernel.cpp",
+ "src/core/gpu/cl/kernels/ClPool2dKernel.cpp",
"src/core/gpu/cl/kernels/ClQuantizeKernel.cpp",
"src/core/gpu/cl/kernels/ClReshapeKernel.cpp",
"src/core/gpu/cl/kernels/ClScaleKernel.cpp",
@@ -635,10 +635,10 @@ cc_library_static {
"src/runtime/cpu/operators/CpuConcatenate.cpp",
"src/runtime/cpu/operators/CpuConvertFullyConnectedWeights.cpp",
"src/runtime/cpu/operators/CpuCopy.cpp",
- "src/runtime/cpu/operators/CpuDepthwiseConvolution.cpp",
- "src/runtime/cpu/operators/CpuDepthwiseConvolutionAssemblyDispatch.cpp",
+ "src/runtime/cpu/operators/CpuDepthwiseConv2d.cpp",
+ "src/runtime/cpu/operators/CpuDepthwiseConv2dAssemblyDispatch.cpp",
"src/runtime/cpu/operators/CpuDequantize.cpp",
- "src/runtime/cpu/operators/CpuDirectConvolution.cpp",
+ "src/runtime/cpu/operators/CpuDirectConv2d.cpp",
"src/runtime/cpu/operators/CpuElementwise.cpp",
"src/runtime/cpu/operators/CpuElementwiseUnary.cpp",
"src/runtime/cpu/operators/CpuFill.cpp",
@@ -647,7 +647,7 @@ cc_library_static {
"src/runtime/cpu/operators/CpuGemmDirectConv2d.cpp",
"src/runtime/cpu/operators/CpuMul.cpp",
"src/runtime/cpu/operators/CpuPermute.cpp",
- "src/runtime/cpu/operators/CpuPooling.cpp",
+ "src/runtime/cpu/operators/CpuPool2d.cpp",
"src/runtime/cpu/operators/CpuQuantize.cpp",
"src/runtime/cpu/operators/CpuReshape.cpp",
"src/runtime/cpu/operators/CpuScale.cpp",
@@ -663,7 +663,7 @@ cc_library_static {
"src/runtime/gpu/cl/operators/ClCopy.cpp",
"src/runtime/gpu/cl/operators/ClCrop.cpp",
"src/runtime/gpu/cl/operators/ClDequantize.cpp",
- "src/runtime/gpu/cl/operators/ClDirectConvolution.cpp",
+ "src/runtime/gpu/cl/operators/ClDirectConv2d.cpp",
"src/runtime/gpu/cl/operators/ClElementwiseOperations.cpp",
"src/runtime/gpu/cl/operators/ClElementwiseUnary.cpp",
"src/runtime/gpu/cl/operators/ClFill.cpp",
@@ -674,7 +674,7 @@ cc_library_static {
"src/runtime/gpu/cl/operators/ClMul.cpp",
"src/runtime/gpu/cl/operators/ClPRelu.cpp",
"src/runtime/gpu/cl/operators/ClPermute.cpp",
- "src/runtime/gpu/cl/operators/ClPooling.cpp",
+ "src/runtime/gpu/cl/operators/ClPool2d.cpp",
"src/runtime/gpu/cl/operators/ClQuantize.cpp",
"src/runtime/gpu/cl/operators/ClReshape.cpp",
"src/runtime/gpu/cl/operators/ClScale.cpp",