From d844c08861706803ea7bebe64450e5feaa9b8179 Mon Sep 17 00:00:00 2001 From: Manuel Bottini Date: Wed, 14 Jul 2021 12:58:54 +0100 Subject: Port CLIm2ColKernel to ClIm2ColKernel Resolves: COMPMID-4516 Change-Id: I6a6db66797fa801dfe1238fceca413277241d2ec Signed-off-by: Manuel Bottini Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/5946 Comments-Addressed: Arm Jenkins Reviewed-by: Michele Di Giorgio Tested-by: Arm Jenkins --- arm_compute/runtime/CL/functions/CLFullyConnectedLayer.h | 2 +- arm_compute/runtime/CL/functions/CLGEMMConvolutionLayer.h | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) (limited to 'arm_compute/runtime/CL/functions') diff --git a/arm_compute/runtime/CL/functions/CLFullyConnectedLayer.h b/arm_compute/runtime/CL/functions/CLFullyConnectedLayer.h index 075c5d1f45..82d1621341 100644 --- a/arm_compute/runtime/CL/functions/CLFullyConnectedLayer.h +++ b/arm_compute/runtime/CL/functions/CLFullyConnectedLayer.h @@ -96,7 +96,7 @@ private: /** Basic function to compute a Fully Connected layer on OpenCL. This function calls the following OpenCL kernels: * - * -# @ref CLIm2ColKernel (called when the input comes from a convolutional layer) + * -# @ref opencl::kernels::ClIm2ColKernel (called when the input comes from a convolutional layer) * -# @ref CLTranspose (if @p are_weights_reshaped is set to false and transpose_weights is set to true ) (called once) * -# @ref opencl::kernels::ClGemmMatrixMultiplyKernel or @ref CLGEMMLowpMatrixMultiplyCore (if quantized asymmetric) * diff --git a/arm_compute/runtime/CL/functions/CLGEMMConvolutionLayer.h b/arm_compute/runtime/CL/functions/CLGEMMConvolutionLayer.h index 564fb1ecde..e262409ee7 100644 --- a/arm_compute/runtime/CL/functions/CLGEMMConvolutionLayer.h +++ b/arm_compute/runtime/CL/functions/CLGEMMConvolutionLayer.h @@ -41,16 +41,16 @@ namespace arm_compute { +class CLWeightsReshapeKernel; +class ICLTensor; namespace opencl { namespace kernels { +class ClIm2ColKernel; class ClCol2ImKernel; } // namespace kernels } // namespace opencl -class CLIm2ColKernel; -class CLWeightsReshapeKernel; -class ICLTensor; /** Function to reshape and transpose the weights. This function calls the following kernels: * -# @ref CLWeightsReshapeKernel @@ -173,7 +173,7 @@ private: /** Basic function to compute the convolution layer. This function calls the following OpenCL kernels/functions: * - * -# @ref CLIm2ColKernel + * -# @ref opencl::kernels::ClIm2ColKernel * -# @ref CLGEMM (if the data type is FP32 or FP16) * -# @ref CLGEMMLowpMatrixMultiplyCore (if the data type is QASYMM8/QASYMM8_SIGNED) * -# @ref CLGEMMLowpOutputStage with QUANTIZE_DOWN_FIXEDPOINT type of quantization (if the data type is QASYMM8/QASYMM8_SIGNED) @@ -321,13 +321,14 @@ private: IWeightsManager *_weights_manager; CLConvolutionLayerReshapeWeights _reshape_weights; weights_transformations::CLConvolutionLayerReshapeWeightsTransform _reshape_weights_managed; - std::unique_ptr _im2col_kernel; + std::unique_ptr _im2col_kernel; CLGEMM _mm_gemm; CLGEMMLowpMatrixMultiplyCore _mm_gemmlowp; std::unique_ptr _col2im_kernel; CLActivationLayer _activationlayer_function; const ICLTensor *_original_weights; + const ICLTensor *_input; const ICLTensor *_gemm_output_to_use; ICLTensor *_output; -- cgit v1.2.1