aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Conroy <james.conroy@arm.com>2019-11-01 16:51:06 +0000
committerJames Conroy <james.conroy@arm.com>2019-11-13 11:35:42 +0000
commit62c4d71199b6f5b7ef9fe5280f47fa3f912cbed1 (patch)
treeb81925fdcbe383157e26af6651cc433d3f7fc200
parent02dce097d4fc643c790609e750dfa3c84abe1a34 (diff)
downloadandroid-nn-driver-62c4d71199b6f5b7ef9fe5280f47fa3f912cbed1.tar.gz
IVGCVSW-4051 Update ACL pin to 94e0cf960ea6116eb57fa88d9b951f859b52c602
!armnn:2211 Signed-off-by: James Conroy <james.conroy@arm.com> Change-Id: I248bfb6a45c90f053a849f38607a4ba6c14f39d1
-rw-r--r--Android.bp27
1 files changed, 11 insertions, 16 deletions
diff --git a/Android.bp b/Android.bp
index fc17d31c..0ae64032 100644
--- a/Android.bp
+++ b/Android.bp
@@ -57,6 +57,7 @@ cc_library_static {
"clframework/src/core/AccessWindowAutoPadding.cpp",
"clframework/src/core/AccessWindowStatic.cpp",
"clframework/src/core/AccessWindowTranspose.cpp",
+ "clframework/src/core/CL/CLCoreRuntimeContext.cpp",
"clframework/src/core/CL/CLHelpers.cpp",
"clframework/src/core/CL/CLKernelLibrary.cpp",
"clframework/src/core/CL/gemm/CLGEMMHelpers.cpp",
@@ -104,15 +105,11 @@ cc_library_static {
"clframework/src/core/CL/kernels/CLDepthwiseConvolutionLayer3x3NCHWKernel.cpp",
"clframework/src/core/CL/kernels/CLDepthwiseConvolutionLayer3x3NHWCKernel.cpp",
"clframework/src/core/CL/kernels/CLDepthwiseConvolutionLayerNativeKernel.cpp",
- "clframework/src/core/CL/kernels/CLDepthwiseConvolutionLayerReshapeWeightsGenericKernel.cpp",
"clframework/src/core/CL/kernels/CLDepthwiseConvolutionLayerReshapeWeightsKernel.cpp",
- "clframework/src/core/CL/kernels/CLDepthwiseIm2ColKernel.cpp",
- "clframework/src/core/CL/kernels/CLDepthwiseVectorToTensorKernel.cpp",
"clframework/src/core/CL/kernels/CLDequantizationLayerKernel.cpp",
"clframework/src/core/CL/kernels/CLDerivativeKernel.cpp",
"clframework/src/core/CL/kernels/CLDilateKernel.cpp",
"clframework/src/core/CL/kernels/CLDirectConvolutionLayerKernel.cpp",
- "clframework/src/core/CL/kernels/CLDirectConvolutionOutputStageKernel.cpp",
"clframework/src/core/CL/kernels/CLElementwiseOperationKernel.cpp",
"clframework/src/core/CL/kernels/CLElementWiseUnaryLayerKernel.cpp",
"clframework/src/core/CL/kernels/CLErodeKernel.cpp",
@@ -239,11 +236,11 @@ cc_library_static {
"clframework/src/core/NEON/kernels/arm_gemm/gemm_quint8.cpp",
"clframework/src/core/NEON/kernels/arm_gemm/gemm_uint16.cpp",
"clframework/src/core/NEON/kernels/arm_gemm/gemm_uint8.cpp",
+ "clframework/src/core/NEON/kernels/arm_gemm/mergeresults.cpp",
"clframework/src/core/NEON/kernels/arm_gemm/misc.cpp",
"clframework/src/core/NEON/kernels/arm_gemm/quantized.cpp",
"clframework/src/core/NEON/kernels/assembly/Helpers.cpp",
"clframework/src/core/NEON/kernels/assembly/INEGEMMWrapperKernel.cpp",
- "clframework/src/core/NEON/kernels/assembly/NEGEMMNativeWrapperKernel.cpp",
"clframework/src/core/NEON/kernels/convolution/common/padding.cpp",
"clframework/src/core/NEON/kernels/convolution/common/qasymm8.cpp",
"clframework/src/core/NEON/kernels/convolution/common/utils.cpp",
@@ -296,6 +293,7 @@ cc_library_static {
"clframework/src/core/NEON/kernels/NECol2ImKernel.cpp",
"clframework/src/core/NEON/kernels/NEColorConvertKernel.cpp",
"clframework/src/core/NEON/kernels/NEConvertFullyConnectedWeightsKernel.cpp",
+ "clframework/src/core/NEON/kernels/NEConvertQuantizedSignednessKernel.cpp",
"clframework/src/core/NEON/kernels/NEConvolutionKernel.cpp",
"clframework/src/core/NEON/kernels/NECopyKernel.cpp",
"clframework/src/core/NEON/kernels/NECropKernel.cpp",
@@ -305,9 +303,6 @@ cc_library_static {
"clframework/src/core/NEON/kernels/NEDepthToSpaceLayerKernel.cpp",
"clframework/src/core/NEON/kernels/NEDepthwiseConvolutionLayer3x3Kernel.cpp",
"clframework/src/core/NEON/kernels/NEDepthwiseConvolutionLayerNativeKernel.cpp",
- "clframework/src/core/NEON/kernels/NEDepthwiseIm2ColKernel.cpp",
- "clframework/src/core/NEON/kernels/NEDepthwiseVectorToTensorKernel.cpp",
- "clframework/src/core/NEON/kernels/NEDepthwiseWeightsReshapeKernel.cpp",
"clframework/src/core/NEON/kernels/NEDequantizationLayerKernel.cpp",
"clframework/src/core/NEON/kernels/NEDerivativeKernel.cpp",
"clframework/src/core/NEON/kernels/NEDilateKernel.cpp",
@@ -418,7 +413,6 @@ cc_library_static {
"clframework/src/runtime/Allocator.cpp",
"clframework/src/runtime/BlobLifetimeManager.cpp",
"clframework/src/runtime/BlobMemoryPool.cpp",
- "clframework/src/runtime/IWeightsManager.cpp",
"clframework/src/runtime/CL/CLBufferAllocator.cpp",
"clframework/src/runtime/CL/CLDistribution1D.cpp",
"clframework/src/runtime/CL/CLHelpers.cpp",
@@ -430,6 +424,7 @@ cc_library_static {
"clframework/src/runtime/CL/CLMultiHOG.cpp",
"clframework/src/runtime/CL/CLMultiImage.cpp",
"clframework/src/runtime/CL/CLPyramid.cpp",
+ "clframework/src/runtime/CL/CLRuntimeContext.cpp",
"clframework/src/runtime/CL/CLScheduler.cpp",
"clframework/src/runtime/CL/CLSubTensor.cpp",
"clframework/src/runtime/CL/CLTensorAllocator.cpp",
@@ -582,6 +577,7 @@ cc_library_static {
"clframework/src/runtime/IScheduler.cpp",
"clframework/src/runtime/ISimpleLifetimeManager.cpp",
"clframework/src/runtime/ITensorAllocator.cpp",
+ "clframework/src/runtime/IWeightsManager.cpp",
"clframework/src/runtime/LutAllocator.cpp",
"clframework/src/runtime/Lut.cpp",
"clframework/src/runtime/Memory.cpp",
@@ -590,7 +586,6 @@ cc_library_static {
"clframework/src/runtime/MultiHOG.cpp",
"clframework/src/runtime/MultiImage.cpp",
"clframework/src/runtime/NEON/functions/assembly/NEDepthwiseConvolutionAssemblyDispatch.cpp",
- "clframework/src/runtime/NEON/functions/assembly/NEGEMMInterleavedWrapper.cpp",
"clframework/src/runtime/NEON/functions/NEAbsoluteDifference.cpp",
"clframework/src/runtime/NEON/functions/NEAccumulate.cpp",
"clframework/src/runtime/NEON/functions/NEActivationLayer.cpp",
@@ -625,6 +620,7 @@ cc_library_static {
"clframework/src/runtime/NEON/functions/NEDepthwiseConvolutionLayer.cpp",
"clframework/src/runtime/NEON/functions/NEDequantizationLayer.cpp",
"clframework/src/runtime/NEON/functions/NEDerivative.cpp",
+ "clframework/src/runtime/NEON/functions/NEDetectionPostProcessLayer.cpp",
"clframework/src/runtime/NEON/functions/NEDilate.cpp",
"clframework/src/runtime/NEON/functions/NEDirectConvolutionLayer.cpp",
"clframework/src/runtime/NEON/functions/NEElementwiseOperators.cpp",
@@ -763,14 +759,15 @@ cc_library_static {
"clframework/src/core/NEON/kernels/arm_gemm/kernels/a64_hybrid_s8s32_dot_16x4/generic.cpp",
"clframework/src/core/NEON/kernels/arm_gemm/kernels/a64_hybrid_u8u32_dot_16x4/a55.cpp",
"clframework/src/core/NEON/kernels/arm_gemm/kernels/a64_hybrid_u8u32_dot_16x4/generic.cpp",
+ "clframework/src/core/NEON/kernels/arm_gemm/kernels/a64_native_fp32_mla_16x4/generic.cpp",
"clframework/src/core/NEON/kernels/arm_gemm/kernels/a64_sgemm_12x8/a53.cpp",
"clframework/src/core/NEON/kernels/arm_gemm/kernels/a64_sgemm_12x8/a55.cpp",
"clframework/src/core/NEON/kernels/arm_gemm/kernels/a64_sgemm_12x8/a55r1.cpp",
"clframework/src/core/NEON/kernels/arm_gemm/kernels/a64_sgemm_12x8/generic.cpp",
- "clframework/src/core/NEON/kernels/arm_gemm/kernels/a64_sgemm_native_16x4/generic.cpp",
- "clframework/src/core/NEON/kernels/arm_gemm/kernels/a64_sgemm_nativeA_pretransposeB_16x4/generic.cpp",
"clframework/src/core/NEON/kernels/arm_gemm/kernels/a64_sgemv_pretransposed/generic.cpp",
"clframework/src/core/NEON/kernels/arm_gemm/kernels/a64_sgemv_trans/generic.cpp",
+ "clframework/src/core/NEON/kernels/arm_gemm/kernels/a64_smallK_hybrid_fp32_mla_4x6/generic.cpp",
+ "clframework/src/core/NEON/kernels/arm_gemm/kernels/a64_smallK_hybrid_fp32_mla_4x8/generic.cpp",
"clframework/src/core/NEON/kernels/arm_gemm/kernels/a64_smallK_hybrid_s8s32_dot_4x6/a55.cpp",
"clframework/src/core/NEON/kernels/arm_gemm/kernels/a64_smallK_hybrid_s8s32_dot_4x6/generic.cpp",
"clframework/src/core/NEON/kernels/arm_gemm/kernels/a64_smallK_hybrid_s8s32_dot_4x8/a55.cpp",
@@ -779,8 +776,6 @@ cc_library_static {
"clframework/src/core/NEON/kernels/arm_gemm/kernels/a64_smallK_hybrid_u8u32_dot_4x6/generic.cpp",
"clframework/src/core/NEON/kernels/arm_gemm/kernels/a64_smallK_hybrid_u8u32_dot_4x8/a55.cpp",
"clframework/src/core/NEON/kernels/arm_gemm/kernels/a64_smallK_hybrid_u8u32_dot_4x8/generic.cpp",
- "clframework/src/core/NEON/kernels/arm_gemm/kernels/sve_smallK_hybrid_s8s32_dot_1VLx8/generic.cpp",
- "clframework/src/core/NEON/kernels/arm_gemm/kernels/sve_smallK_hybrid_u8u32_dot_1VLx8/generic.cpp",
"clframework/src/core/NEON/kernels/arm_gemm/kernels/sve_hybrid_fp16_mla_4VLx4/generic.cpp",
"clframework/src/core/NEON/kernels/arm_gemm/kernels/sve_hybrid_fp32_mla_4VLx4/generic.cpp",
"clframework/src/core/NEON/kernels/arm_gemm/kernels/sve_hybrid_s8s32_dot_4VLx4/generic.cpp",
@@ -793,8 +788,8 @@ cc_library_static {
"clframework/src/core/NEON/kernels/arm_gemm/kernels/sve_native_fp32_mla_4VLx4/generic.cpp",
"clframework/src/core/NEON/kernels/arm_gemm/kernels/sve_native_s8s32_dot_4VLx4/generic.cpp",
"clframework/src/core/NEON/kernels/arm_gemm/kernels/sve_native_u8u32_dot_4VLx4/generic.cpp",
- "clframework/src/core/NEON/kernels/arm_gemm/kernels/sve_smallK_fp32_mla_1VLx4/generic.cpp",
- "clframework/src/core/NEON/kernels/arm_gemm/kernels/sve_smallK_hybrid_fp32_mla_1VLx4/generic.cpp",
+ "clframework/src/core/NEON/kernels/arm_gemm/kernels/sve_smallK_hybrid_s8s32_dot_1VLx8/generic.cpp",
+ "clframework/src/core/NEON/kernels/arm_gemm/kernels/sve_smallK_hybrid_u8u32_dot_1VLx8/generic.cpp",
],
},
},