Port CLCol2ImKernel to ClCol2ImKernel

Resolves: COMPMID-4517

Change-Id: I50cb02116a1ab86fc29200371944c4774e830746
Signed-off-by: Manuel Bottini <manuel.bottini@arm.com>
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/5949
Reviewed-by: Michele Di Giorgio <michele.digiorgio@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>

1 files changed, 11 insertions, 3 deletions

diff --git a/arm_compute/runtime/CL/functions/CLGEMMConvolutionLayer.h b/arm_compute/runtime/CL/functions/CLGEMMConvolutionLayer.h
index 082b481047..564fb1ecde 100644
--- a/arm_compute/runtime/CL/functions/CLGEMMConvolutionLayer.h
+++ b/arm_compute/runtime/CL/functions/CLGEMMConvolutionLayer.h
@@ -41,7 +41,13 @@
 
 namespace arm_compute
 {
-class CLCol2ImKernel;
+namespace opencl
+{
+namespace kernels
+{
+class ClCol2ImKernel;
+} // namespace kernels
+} // namespace opencl
 class CLIm2ColKernel;
 class CLWeightsReshapeKernel;
 class ICLTensor;
@@ -171,7 +177,7 @@ private:
  * -# @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)
- * -# @ref CLCol2ImKernel (if NCHW data layout)
+ * -# @ref opencl::kernels::ClCol2ImKernel (if NCHW data layout)
  */
 class CLGEMMConvolutionLayer : public IFunction
 {
@@ -318,10 +324,12 @@ private:
     std::unique_ptr<CLIm2ColKernel>                                    _im2col_kernel;
     CLGEMM                                                             _mm_gemm;
     CLGEMMLowpMatrixMultiplyCore                                       _mm_gemmlowp;
-    std::unique_ptr<CLCol2ImKernel>                                    _col2im_kernel;
+    std::unique_ptr<opencl::kernels::ClCol2ImKernel>                   _col2im_kernel;
     CLActivationLayer                                                  _activationlayer_function;
 
     const ICLTensor *_original_weights;
+    const ICLTensor *_gemm_output_to_use;
+    ICLTensor       *_output;
 
     CLTensor _im2col_output;
     CLTensor _weights_reshaped;