From 3bb28a1615a958125b1b932f5d56332c2c053dbe Mon Sep 17 00:00:00 2001 From: Ferran Balaguer Date: Wed, 26 Jun 2019 11:31:52 +0100 Subject: Update the CL pin to the latest master !armnn:1394 Signed-off-by: Ferran Balaguer Change-Id: I45799a26bccabf852aeadf61d4f4a81090534fed --- Android.bp | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/Android.bp b/Android.bp index 07487e53..ed9df0f3 100644 --- a/Android.bp +++ b/Android.bp @@ -97,6 +97,7 @@ cc_library_static { "clframework/src/core/CL/kernels/CLDeconvolutionReshapeOutputKernel.cpp", "clframework/src/core/CL/kernels/CLDepthConcatenateLayerKernel.cpp", "clframework/src/core/CL/kernels/CLDepthConvertLayerKernel.cpp", + "clframework/src/core/CL/kernels/CLDepthToSpaceLayerKernel.cpp", "clframework/src/core/CL/kernels/CLDepthwiseConvolutionLayer3x3NCHWKernel.cpp", "clframework/src/core/CL/kernels/CLDepthwiseConvolutionLayer3x3NHWCKernel.cpp", "clframework/src/core/CL/kernels/CLDepthwiseConvolutionLayerReshapeWeightsGenericKernel.cpp", @@ -124,6 +125,7 @@ cc_library_static { "clframework/src/core/CL/kernels/CLGaussian5x5Kernel.cpp", "clframework/src/core/CL/kernels/CLGaussianPyramidKernel.cpp", "clframework/src/core/CL/kernels/CLGEMMLowpMatrixMultiplyKernel.cpp", + "clframework/src/core/CL/kernels/CLGEMMLowpMatrixMultiplyNativeKernel.cpp", "clframework/src/core/CL/kernels/CLGEMMLowpMatrixMultiplyReshapedKernel.cpp", "clframework/src/core/CL/kernels/CLGEMMLowpMatrixMultiplyReshapedOnlyRHSKernel.cpp", "clframework/src/core/CL/kernels/CLGEMMLowpOffsetContributionKernel.cpp", @@ -135,6 +137,7 @@ cc_library_static { "clframework/src/core/CL/kernels/CLGEMMMatrixAccumulateBiasesKernel.cpp", "clframework/src/core/CL/kernels/CLGEMMMatrixAdditionKernel.cpp", "clframework/src/core/CL/kernels/CLGEMMMatrixMultiplyKernel.cpp", + "clframework/src/core/CL/kernels/CLGEMMMatrixMultiplyNativeKernel.cpp", "clframework/src/core/CL/kernels/CLGEMMMatrixMultiplyReshapedKernel.cpp", "clframework/src/core/CL/kernels/CLGEMMMatrixMultiplyReshapedOnlyRHSKernel.cpp", "clframework/src/core/CL/kernels/CLGEMMMatrixVectorMultiplyKernel.cpp", @@ -153,6 +156,7 @@ cc_library_static { "clframework/src/core/CL/kernels/CLLocallyConnectedMatrixMultiplyKernel.cpp", "clframework/src/core/CL/kernels/CLMagnitudePhaseKernel.cpp", "clframework/src/core/CL/kernels/CLMeanStdDevKernel.cpp", + "clframework/src/core/CL/kernels/CLMeanStdDevNormalizationKernel.cpp", "clframework/src/core/CL/kernels/CLMedian3x3Kernel.cpp", "clframework/src/core/CL/kernels/CLMemsetKernel.cpp", "clframework/src/core/CL/kernels/CLMinMaxLayerKernel.cpp", @@ -182,6 +186,7 @@ cc_library_static { "clframework/src/core/CL/kernels/CLSobel7x7Kernel.cpp", "clframework/src/core/CL/kernels/CLSoftmaxLayerKernel.cpp", "clframework/src/core/CL/kernels/CLSpaceToBatchLayerKernel.cpp", + "clframework/src/core/CL/kernels/CLSpaceToDepthLayerKernel.cpp", "clframework/src/core/CL/kernels/CLStackLayerKernel.cpp", "clframework/src/core/CL/kernels/CLStridedSliceKernel.cpp", "clframework/src/core/CL/kernels/CLTableLookupKernel.cpp", @@ -284,6 +289,7 @@ cc_library_static { "clframework/src/core/NEON/kernels/NECumulativeDistributionKernel.cpp", "clframework/src/core/NEON/kernels/NEDepthConcatenateLayerKernel.cpp", "clframework/src/core/NEON/kernels/NEDepthConvertLayerKernel.cpp", + "clframework/src/core/NEON/kernels/NEDepthToSpaceLayerKernel.cpp", "clframework/src/core/NEON/kernels/NEDepthwiseConvolutionLayer3x3Kernel.cpp", "clframework/src/core/NEON/kernels/NEDepthwiseIm2ColKernel.cpp", "clframework/src/core/NEON/kernels/NEDepthwiseVectorToTensorKernel.cpp", @@ -334,6 +340,7 @@ cc_library_static { "clframework/src/core/NEON/kernels/NELocallyConnectedMatrixMultiplyKernel.cpp", "clframework/src/core/NEON/kernels/NEMagnitudePhaseKernel.cpp", "clframework/src/core/NEON/kernels/NEMeanStdDevKernel.cpp", + "clframework/src/core/NEON/kernels/NEMeanStdDevNormalizationKernel.cpp", "clframework/src/core/NEON/kernels/NEMedian3x3Kernel.cpp", "clframework/src/core/NEON/kernels/NEMemsetKernel.cpp", "clframework/src/core/NEON/kernels/NEMinMaxLayerKernel.cpp", @@ -361,6 +368,7 @@ cc_library_static { "clframework/src/core/NEON/kernels/NESobel7x7Kernel.cpp", "clframework/src/core/NEON/kernels/NESoftmaxLayerKernel.cpp", "clframework/src/core/NEON/kernels/NESpaceToBatchLayerKernel.cpp", + "clframework/src/core/NEON/kernels/NESpaceToDepthLayerKernel.cpp", "clframework/src/core/NEON/kernels/NEStackLayerKernel.cpp", "clframework/src/core/NEON/kernels/NEStridedSliceKernel.cpp", "clframework/src/core/NEON/kernels/NETableLookupKernel.cpp", @@ -385,6 +393,7 @@ cc_library_static { "clframework/src/core/utils/logging/Helpers.cpp", "clframework/src/core/utils/logging/Logger.cpp", "clframework/src/core/utils/logging/LoggerRegistry.cpp", + "clframework/src/core/utils/misc/MMappedFile.cpp", "clframework/src/core/utils/quantization/AsymmHelpers.cpp", "clframework/src/core/Validate.cpp", "clframework/src/runtime/Allocator.cpp", @@ -435,6 +444,7 @@ cc_library_static { "clframework/src/runtime/CL/functions/CLDeconvolutionLayer.cpp", "clframework/src/runtime/CL/functions/CLDeconvolutionLayerUpsample.cpp", "clframework/src/runtime/CL/functions/CLDepthConvertLayer.cpp", + "clframework/src/runtime/CL/functions/CLDepthToSpaceLayer.cpp", "clframework/src/runtime/CL/functions/CLDepthwiseConvolutionLayer.cpp", "clframework/src/runtime/CL/functions/CLDepthwiseSeparableConvolutionLayer.cpp", "clframework/src/runtime/CL/functions/CLDequantizationLayer.cpp", @@ -479,6 +489,7 @@ cc_library_static { "clframework/src/runtime/CL/functions/CLLSTMLayer.cpp", "clframework/src/runtime/CL/functions/CLMagnitude.cpp", "clframework/src/runtime/CL/functions/CLMeanStdDev.cpp", + "clframework/src/runtime/CL/functions/CLMeanStdDevNormalizationLayer.cpp", "clframework/src/runtime/CL/functions/CLMedian3x3.cpp", "clframework/src/runtime/CL/functions/CLMinMaxLocation.cpp", "clframework/src/runtime/CL/functions/CLNonLinearFilter.cpp", @@ -491,6 +502,7 @@ cc_library_static { "clframework/src/runtime/CL/functions/CLPhase.cpp", "clframework/src/runtime/CL/functions/CLPixelWiseMultiplication.cpp", "clframework/src/runtime/CL/functions/CLPoolingLayer.cpp", + "clframework/src/runtime/CL/functions/CLPReluLayer.cpp", "clframework/src/runtime/CL/functions/CLPriorBoxLayer.cpp", "clframework/src/runtime/CL/functions/CLQuantizationLayer.cpp", "clframework/src/runtime/CL/functions/CLRange.cpp", @@ -512,6 +524,7 @@ cc_library_static { "clframework/src/runtime/CL/functions/CLSobel7x7.cpp", "clframework/src/runtime/CL/functions/CLSoftmaxLayer.cpp", "clframework/src/runtime/CL/functions/CLSpaceToBatchLayer.cpp", + "clframework/src/runtime/CL/functions/CLSpaceToDepthLayer.cpp", "clframework/src/runtime/CL/functions/CLSplit.cpp", "clframework/src/runtime/CL/functions/CLStackLayer.cpp", "clframework/src/runtime/CL/functions/CLStridedSlice.cpp", @@ -568,6 +581,7 @@ cc_library_static { "clframework/src/runtime/NEON/functions/NEBitwiseXor.cpp", "clframework/src/runtime/NEON/functions/NEBox3x3.cpp", "clframework/src/runtime/NEON/functions/NECannyEdge.cpp", + "clframework/src/runtime/NEON/functions/NECast.cpp", "clframework/src/runtime/NEON/functions/NEChannelCombine.cpp", "clframework/src/runtime/NEON/functions/NEChannelExtract.cpp", "clframework/src/runtime/NEON/functions/NEChannelShuffleLayer.cpp", @@ -581,6 +595,7 @@ cc_library_static { "clframework/src/runtime/NEON/functions/NECropResize.cpp", "clframework/src/runtime/NEON/functions/NEDeconvolutionLayer.cpp", "clframework/src/runtime/NEON/functions/NEDepthConvertLayer.cpp", + "clframework/src/runtime/NEON/functions/NEDepthToSpaceLayer.cpp", "clframework/src/runtime/NEON/functions/NEDepthwiseConvolutionLayer.cpp", "clframework/src/runtime/NEON/functions/NEDepthwiseSeparableConvolutionLayer.cpp", "clframework/src/runtime/NEON/functions/NEDequantizationLayer.cpp", @@ -627,6 +642,7 @@ cc_library_static { "clframework/src/runtime/NEON/functions/NELSTMLayer.cpp", "clframework/src/runtime/NEON/functions/NEMagnitude.cpp", "clframework/src/runtime/NEON/functions/NEMeanStdDev.cpp", + "clframework/src/runtime/NEON/functions/NEMeanStdDevNormalizationLayer.cpp", "clframework/src/runtime/NEON/functions/NEMedian3x3.cpp", "clframework/src/runtime/NEON/functions/NEMinMaxLocation.cpp", "clframework/src/runtime/NEON/functions/NENonLinearFilter.cpp", @@ -638,6 +654,7 @@ cc_library_static { "clframework/src/runtime/NEON/functions/NEPhase.cpp", "clframework/src/runtime/NEON/functions/NEPixelWiseMultiplication.cpp", "clframework/src/runtime/NEON/functions/NEPoolingLayer.cpp", + "clframework/src/runtime/NEON/functions/NEPReluLayer.cpp", "clframework/src/runtime/NEON/functions/NEPriorBoxLayer.cpp", "clframework/src/runtime/NEON/functions/NEQuantizationLayer.cpp", "clframework/src/runtime/NEON/functions/NERange.cpp", @@ -659,6 +676,7 @@ cc_library_static { "clframework/src/runtime/NEON/functions/NESobel7x7.cpp", "clframework/src/runtime/NEON/functions/NESoftmaxLayer.cpp", "clframework/src/runtime/NEON/functions/NESpaceToBatchLayer.cpp", + "clframework/src/runtime/NEON/functions/NESpaceToDepthLayer.cpp", "clframework/src/runtime/NEON/functions/NESplit.cpp", "clframework/src/runtime/NEON/functions/NEStackLayer.cpp", "clframework/src/runtime/NEON/functions/NEStridedSlice.cpp", -- cgit v1.2.1