From 7a1518e3a7cd85c0b17eeb58f51ee50a1e85ef9c Mon Sep 17 00:00:00 2001 From: jimfly01 Date: Mon, 24 Sep 2018 12:59:11 +0100 Subject: IVGCVSW-1924: advancing clframework pointer !builder:149820 Change-Id: I1b3deb81f9dcb976cae6ec4bccc3149e43ae7d28 --- Android.bp | 49 ++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 44 insertions(+), 5 deletions(-) diff --git a/Android.bp b/Android.bp index 38ba27ae..7f28e903 100644 --- a/Android.bp +++ b/Android.bp @@ -19,7 +19,6 @@ cc_library_static { "clframework/src/core/AccessWindowAutoPadding.cpp", "clframework/src/core/AccessWindowStatic.cpp", "clframework/src/core/AccessWindowTranspose.cpp", - "clframework/src/core/GPUTarget.cpp", "clframework/src/core/CL/CLHelpers.cpp", "clframework/src/core/CL/CLKernelLibrary.cpp", "clframework/src/core/CL/ICLDistribution1D.cpp", @@ -36,9 +35,10 @@ cc_library_static { "clframework/src/core/CL/kernels/CLAccumulateKernel.cpp", "clframework/src/core/CL/kernels/CLActivationLayerKernel.cpp", "clframework/src/core/CL/kernels/CLArithmeticAdditionKernel.cpp", - "clframework/src/core/CL/kernels/CLArithmeticSubtractionKernel.cpp", "clframework/src/core/CL/kernels/CLArithmeticDivisionKernel.cpp", + "clframework/src/core/CL/kernels/CLArithmeticSubtractionKernel.cpp", "clframework/src/core/CL/kernels/CLBatchNormalizationLayerKernel.cpp", + "clframework/src/core/CL/kernels/CLBatchToSpaceLayerKernel.cpp", "clframework/src/core/CL/kernels/CLBitwiseAndKernel.cpp", "clframework/src/core/CL/kernels/CLBitwiseNotKernel.cpp", "clframework/src/core/CL/kernels/CLBitwiseOrKernel.cpp", @@ -97,17 +97,20 @@ cc_library_static { "clframework/src/core/CL/kernels/CLMagnitudePhaseKernel.cpp", "clframework/src/core/CL/kernels/CLMeanStdDevKernel.cpp", "clframework/src/core/CL/kernels/CLMedian3x3Kernel.cpp", + "clframework/src/core/CL/kernels/CLMemsetKernel.cpp", "clframework/src/core/CL/kernels/CLMinMaxLayerKernel.cpp", "clframework/src/core/CL/kernels/CLMinMaxLocationKernel.cpp", "clframework/src/core/CL/kernels/CLNonLinearFilterKernel.cpp", "clframework/src/core/CL/kernels/CLNonMaximaSuppression3x3Kernel.cpp", "clframework/src/core/CL/kernels/CLNormalizationLayerKernel.cpp", + "clframework/src/core/CL/kernels/CLNormalizePlanarYUVLayerKernel.cpp", "clframework/src/core/CL/kernels/CLPermuteKernel.cpp", "clframework/src/core/CL/kernels/CLPixelWiseMultiplicationKernel.cpp", "clframework/src/core/CL/kernels/CLPoolingLayerKernel.cpp", "clframework/src/core/CL/kernels/CLQuantizationLayerKernel.cpp", "clframework/src/core/CL/kernels/CLReductionOperationKernel.cpp", "clframework/src/core/CL/kernels/CLRemapKernel.cpp", + "clframework/src/core/CL/kernels/CLReorgLayerKernel.cpp", "clframework/src/core/CL/kernels/CLReshapeLayerKernel.cpp", "clframework/src/core/CL/kernels/CLROIPoolingLayerKernel.cpp", "clframework/src/core/CL/kernels/CLScaleKernel.cpp", @@ -116,9 +119,12 @@ cc_library_static { "clframework/src/core/CL/kernels/CLSobel5x5Kernel.cpp", "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/CLStridedSliceKernel.cpp", "clframework/src/core/CL/kernels/CLTableLookupKernel.cpp", "clframework/src/core/CL/kernels/CLThresholdKernel.cpp", "clframework/src/core/CL/kernels/CLTransposeKernel.cpp", + "clframework/src/core/CL/kernels/CLUpsampleLayerKernel.cpp", "clframework/src/core/CL/kernels/CLWarpAffineKernel.cpp", "clframework/src/core/CL/kernels/CLWarpPerspectiveKernel.cpp", "clframework/src/core/CL/kernels/CLWeightsReshapeKernel.cpp", @@ -126,6 +132,7 @@ cc_library_static { "clframework/src/core/CL/kernels/CLWinogradFilterTransformKernel.cpp", "clframework/src/core/CL/kernels/CLWinogradInputTransformKernel.cpp", "clframework/src/core/CL/kernels/CLWinogradOutputTransformKernel.cpp", + "clframework/src/core/CL/kernels/CLYOLOLayerKernel.cpp", "clframework/src/core/CL/OpenCL.cpp", "clframework/src/core/CPP/CPPTypes.cpp", "clframework/src/core/CPP/ICPPSimpleKernel.cpp", @@ -135,6 +142,7 @@ cc_library_static { "clframework/src/core/CPP/kernels/CPPSortEuclideanDistanceKernel.cpp", "clframework/src/core/CPP/kernels/CPPUpsampleKernel.cpp", "clframework/src/core/Error.cpp", + "clframework/src/core/GPUTarget.cpp", "clframework/src/core/Helpers.cpp", "clframework/src/core/HOGInfo.cpp", "clframework/src/core/IAccessWindow.cpp", @@ -149,6 +157,7 @@ cc_library_static { "clframework/src/core/NEON/kernels/arm_gemm/gemm_int8.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/assembly/Helpers.cpp", "clframework/src/core/NEON/kernels/assembly/INEGEMMWrapperKernel.cpp", "clframework/src/core/NEON/kernels/assembly/NEGEMMInterleavedMatrixMultiplyWrapper.cpp", "clframework/src/core/NEON/kernels/assembly/NEGEMMInterleavedPrepareBWrapperKernel.cpp", @@ -159,18 +168,28 @@ cc_library_static { "clframework/src/core/NEON/kernels/convolution/depthwise/depthwise_2x2_3x3_2x2_fp32_fp32.cpp", "clframework/src/core/NEON/kernels/convolution/depthwise/depthwise_3x3_3x3_1x1_fp32_fp32.cpp", "clframework/src/core/NEON/kernels/convolution/depthwise/depthwise_3x3_3x3_2x2_fp32_fp32.cpp", + "clframework/src/core/NEON/kernels/convolution/depthwise/depthwise_4x4_3x3_1x1_fp16_fp16.cpp", "clframework/src/core/NEON/kernels/convolution/depthwise/depthwise_4x4_3x3_1x1_fp32_fp32.cpp", + "clframework/src/core/NEON/kernels/convolution/depthwise/depthwise_4x4_3x3_1x1_u8_s32.cpp", + "clframework/src/core/NEON/kernels/convolution/depthwise/depthwise_4x4_3x3_2x2_fp16_fp16.cpp", "clframework/src/core/NEON/kernels/convolution/depthwise/depthwise_4x4_3x3_2x2_fp32_fp32.cpp", + "clframework/src/core/NEON/kernels/convolution/depthwise/depthwise_4x4_3x3_2x2_u8_s32.cpp", "clframework/src/core/NEON/kernels/convolution/winograd/batched_blocked_gemm.cpp", + "clframework/src/core/NEON/kernels/convolution/winograd/transforms/input_1x8_fp32.cpp", "clframework/src/core/NEON/kernels/convolution/winograd/transforms/input_2x2_3x3_fp32.cpp", - "clframework/src/core/NEON/kernels/convolution/winograd/transforms/input_2x2_5x5_fp32.cpp", - "clframework/src/core/NEON/kernels/convolution/winograd/transforms/input_4x4_3x3_fp32.cpp", + "clframework/src/core/NEON/kernels/convolution/winograd/transforms/input_6x6_fp32.cpp", + "clframework/src/core/NEON/kernels/convolution/winograd/transforms/output_2_7_fp32.cpp", "clframework/src/core/NEON/kernels/convolution/winograd/transforms/output_2x2_3x3_fp32.cpp", "clframework/src/core/NEON/kernels/convolution/winograd/transforms/output_2x2_5x5_fp32.cpp", + "clframework/src/core/NEON/kernels/convolution/winograd/transforms/output_4_5_fp32.cpp", "clframework/src/core/NEON/kernels/convolution/winograd/transforms/output_4x4_3x3_fp32.cpp", + "clframework/src/core/NEON/kernels/convolution/winograd/transforms/output_6_3_fp32.cpp", + "clframework/src/core/NEON/kernels/convolution/winograd/transforms/weights_2_7_fp32.cpp", "clframework/src/core/NEON/kernels/convolution/winograd/transforms/weights_2x2_3x3_fp32.cpp", "clframework/src/core/NEON/kernels/convolution/winograd/transforms/weights_2x2_5x5_fp32.cpp", + "clframework/src/core/NEON/kernels/convolution/winograd/transforms/weights_4_5_fp32.cpp", "clframework/src/core/NEON/kernels/convolution/winograd/transforms/weights_4x4_3x3_fp32.cpp", + "clframework/src/core/NEON/kernels/convolution/winograd/transforms/weights_6_3_fp32.cpp", "clframework/src/core/NEON/kernels/convolution/winograd/winograd_gemm.cpp", "clframework/src/core/NEON/kernels/NEAbsoluteDifferenceKernel.cpp", "clframework/src/core/NEON/kernels/NEAccumulateKernel.cpp", @@ -190,6 +209,7 @@ cc_library_static { "clframework/src/core/NEON/kernels/NEColorConvertKernel.cpp", "clframework/src/core/NEON/kernels/NEConvertFullyConnectedWeightsKernel.cpp", "clframework/src/core/NEON/kernels/NEConvolutionKernel.cpp", + "clframework/src/core/NEON/kernels/NECopyKernel.cpp", "clframework/src/core/NEON/kernels/NECumulativeDistributionKernel.cpp", "clframework/src/core/NEON/kernels/NEDepthConcatenateLayerKernel.cpp", "clframework/src/core/NEON/kernels/NEDepthConvertLayerKernel.cpp", @@ -207,6 +227,7 @@ cc_library_static { "clframework/src/core/NEON/kernels/NEFillArrayKernel.cpp", "clframework/src/core/NEON/kernels/NEFillBorderKernel.cpp", "clframework/src/core/NEON/kernels/NEFillInnerBorderKernel.cpp", + "clframework/src/core/NEON/kernels/NEFlattenLayerKernel.cpp", "clframework/src/core/NEON/kernels/NEFloorKernel.cpp", "clframework/src/core/NEON/kernels/NEGaussian3x3Kernel.cpp", "clframework/src/core/NEON/kernels/NEGaussian5x5Kernel.cpp", @@ -245,6 +266,7 @@ cc_library_static { "clframework/src/core/NEON/kernels/NEQuantizationLayerKernel.cpp", "clframework/src/core/NEON/kernels/NEReductionOperationKernel.cpp", "clframework/src/core/NEON/kernels/NERemapKernel.cpp", + "clframework/src/core/NEON/kernels/NEReorgLayerKernel.cpp", "clframework/src/core/NEON/kernels/NEReshapeLayerKernel.cpp", "clframework/src/core/NEON/kernels/NEROIPoolingLayerKernel.cpp", "clframework/src/core/NEON/kernels/NEScaleKernel.cpp", @@ -260,11 +282,13 @@ cc_library_static { "clframework/src/core/NEON/kernels/NEWeightsReshapeKernel.cpp", "clframework/src/core/NEON/kernels/NEWidthConcatenateLayerKernel.cpp", "clframework/src/core/NEON/kernels/NEWinogradConvolutionLayerKernel.cpp", + "clframework/src/core/NEON/kernels/NEYOLOLayerKernel.cpp", "clframework/src/core/PyramidInfo.cpp", "clframework/src/core/Rounding.cpp", "clframework/src/core/SubTensorInfo.cpp", "clframework/src/core/TensorInfo.cpp", "clframework/src/core/Utils.cpp", + "clframework/src/core/utils/helpers/tensor_transform.cpp", "clframework/src/core/utils/io/FileHandler.cpp", "clframework/src/core/utils/logging/FilePrinter.cpp", "clframework/src/core/utils/logging/Helpers.cpp", @@ -297,6 +321,7 @@ cc_library_static { "clframework/src/runtime/CL/functions/CLArithmeticDivision.cpp", "clframework/src/runtime/CL/functions/CLArithmeticSubtraction.cpp", "clframework/src/runtime/CL/functions/CLBatchNormalizationLayer.cpp", + "clframework/src/runtime/CL/functions/CLBatchToSpaceLayer.cpp", "clframework/src/runtime/CL/functions/CLBitwiseAnd.cpp", "clframework/src/runtime/CL/functions/CLBitwiseNot.cpp", "clframework/src/runtime/CL/functions/CLBitwiseOr.cpp", @@ -357,7 +382,9 @@ cc_library_static { "clframework/src/runtime/CL/functions/CLNonLinearFilter.cpp", "clframework/src/runtime/CL/functions/CLNonMaximaSuppression3x3.cpp", "clframework/src/runtime/CL/functions/CLNormalizationLayer.cpp", + "clframework/src/runtime/CL/functions/CLNormalizePlanarYUVLayer.cpp", "clframework/src/runtime/CL/functions/CLOpticalFlow.cpp", + "clframework/src/runtime/CL/functions/CLPadLayer.cpp", "clframework/src/runtime/CL/functions/CLPermute.cpp", "clframework/src/runtime/CL/functions/CLPhase.cpp", "clframework/src/runtime/CL/functions/CLPixelWiseMultiplication.cpp", @@ -365,23 +392,30 @@ cc_library_static { "clframework/src/runtime/CL/functions/CLQuantizationLayer.cpp", "clframework/src/runtime/CL/functions/CLReductionOperation.cpp", "clframework/src/runtime/CL/functions/CLRemap.cpp", + "clframework/src/runtime/CL/functions/CLReorgLayer.cpp", "clframework/src/runtime/CL/functions/CLReshapeLayer.cpp", "clframework/src/runtime/CL/functions/CLRNNLayer.cpp", "clframework/src/runtime/CL/functions/CLROIPoolingLayer.cpp", "clframework/src/runtime/CL/functions/CLScale.cpp", "clframework/src/runtime/CL/functions/CLScharr3x3.cpp", + "clframework/src/runtime/CL/functions/CLSlice.cpp", "clframework/src/runtime/CL/functions/CLSobel3x3.cpp", "clframework/src/runtime/CL/functions/CLSobel5x5.cpp", "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/CLSplit.cpp", + "clframework/src/runtime/CL/functions/CLStridedSlice.cpp", "clframework/src/runtime/CL/functions/CLTableLookup.cpp", "clframework/src/runtime/CL/functions/CLThreshold.cpp", "clframework/src/runtime/CL/functions/CLTranspose.cpp", + "clframework/src/runtime/CL/functions/CLUpsampleLayer.cpp", "clframework/src/runtime/CL/functions/CLWarpAffine.cpp", "clframework/src/runtime/CL/functions/CLWarpPerspective.cpp", "clframework/src/runtime/CL/functions/CLWidthConcatenateLayer.cpp", "clframework/src/runtime/CL/functions/CLWinogradConvolutionLayer.cpp", "clframework/src/runtime/CL/functions/CLWinogradInputTransform.cpp", + "clframework/src/runtime/CL/functions/CLYOLOLayer.cpp", "clframework/src/runtime/CL/ICLSimpleFunction.cpp", "clframework/src/runtime/CL/tuners/BifrostTuner.cpp", "clframework/src/runtime/CL/tuners/MidgardTuner.cpp", @@ -424,6 +458,7 @@ cc_library_static { "clframework/src/runtime/NEON/functions/NEConvertFullyConnectedWeights.cpp", "clframework/src/runtime/NEON/functions/NEConvolution.cpp", "clframework/src/runtime/NEON/functions/NEConvolutionLayer.cpp", + "clframework/src/runtime/NEON/functions/NECopy.cpp", "clframework/src/runtime/NEON/functions/NEDeconvolutionLayer.cpp", "clframework/src/runtime/NEON/functions/NEDepthConcatenateLayer.cpp", "clframework/src/runtime/NEON/functions/NEDepthConvertLayer.cpp", @@ -463,6 +498,7 @@ cc_library_static { "clframework/src/runtime/NEON/functions/NELaplacianPyramid.cpp", "clframework/src/runtime/NEON/functions/NELaplacianReconstruct.cpp", "clframework/src/runtime/NEON/functions/NELocallyConnectedLayer.cpp", + "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/NEMedian3x3.cpp", @@ -478,9 +514,10 @@ cc_library_static { "clframework/src/runtime/NEON/functions/NEQuantizationLayer.cpp", "clframework/src/runtime/NEON/functions/NEReductionOperation.cpp", "clframework/src/runtime/NEON/functions/NERemap.cpp", + "clframework/src/runtime/NEON/functions/NEReorgLayer.cpp", "clframework/src/runtime/NEON/functions/NEReshapeLayer.cpp", - "clframework/src/runtime/NEON/functions/NEROIPoolingLayer.cpp", "clframework/src/runtime/NEON/functions/NERNNLayer.cpp", + "clframework/src/runtime/NEON/functions/NEROIPoolingLayer.cpp", "clframework/src/runtime/NEON/functions/NEScale.cpp", "clframework/src/runtime/NEON/functions/NEScharr3x3.cpp", "clframework/src/runtime/NEON/functions/NESimpleAssemblyFunction.cpp", @@ -495,9 +532,11 @@ cc_library_static { "clframework/src/runtime/NEON/functions/NEWarpPerspective.cpp", "clframework/src/runtime/NEON/functions/NEWidthConcatenateLayer.cpp", "clframework/src/runtime/NEON/functions/NEWinogradConvolutionLayer.cpp", + "clframework/src/runtime/NEON/functions/NEYOLOLayer.cpp", "clframework/src/runtime/NEON/INESimpleFunction.cpp", "clframework/src/runtime/OffsetLifetimeManager.cpp", "clframework/src/runtime/OffsetMemoryPool.cpp", + "clframework/src/runtime/OMP/OMPScheduler.cpp", "clframework/src/runtime/PoolManager.cpp", "clframework/src/runtime/Pyramid.cpp", "clframework/src/runtime/Scheduler.cpp", -- cgit v1.2.1