From dff601dad65d95ad85fee349a44b6417b7de7f2c Mon Sep 17 00:00:00 2001 From: Gian Marco Iodice Date: Thu, 9 Aug 2018 13:28:41 +0100 Subject: COMPMID-1488 - Add support for NHWC when running CLGEMMConvolutionLayer with QASYMM8 Fixed also a bug in the graph API related to the bias shape in DepthWiseConvolution for NHWC Change-Id: I275141a42e51f6747b77db1c31d1bc69e8685af5 Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/143454 Tested-by: Jenkins Reviewed-by: Anthony Barbier --- arm_compute/runtime/CL/functions/CLGEMMConvolutionLayer.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'arm_compute/runtime/CL/functions') diff --git a/arm_compute/runtime/CL/functions/CLGEMMConvolutionLayer.h b/arm_compute/runtime/CL/functions/CLGEMMConvolutionLayer.h index 7c272a348b..8538d83c2b 100644 --- a/arm_compute/runtime/CL/functions/CLGEMMConvolutionLayer.h +++ b/arm_compute/runtime/CL/functions/CLGEMMConvolutionLayer.h @@ -40,6 +40,7 @@ #include "arm_compute/runtime/CL/functions/CLGEMM.h" #include "arm_compute/runtime/CL/functions/CLGEMMLowpMatrixMultiplyCore.h" #include "arm_compute/runtime/CL/functions/CLGEMMLowpOutputStage.h" +#include "arm_compute/runtime/CL/functions/CLReshapeLayer.h" #include "arm_compute/runtime/IMemoryManager.h" #include @@ -88,7 +89,7 @@ private: * -# @ref CLGEMMLowpMatrixMultiplyCore (if the data type is QASYMM8) * -# @ref CLGEMMLowpQuantizeDownInt32ToUint8ScaleByFixedPoint (if the data type is QASYMM8) * -# @ref CLArithmeticAdditionKernel (if biases != nullptr and we have a 1x1 convolution with the NHWC data layout) - * -# @ref CLCol2ImKernel (if NCHW data layout) + * -# @ref CLCol2ImKernel (if NCHW data layout) or @ref CLReshapeLayer (if NHWC with QASYMM8) */ class CLGEMMConvolutionLayer : public IFunction { @@ -182,6 +183,7 @@ private: CLCol2ImKernel _col2im_kernel; CLActivationLayer _activationlayer_function; CLArithmeticAdditionKernel _add_bias_kernel; + CLReshapeLayer _reshape_layer; const ICLTensor *_original_weights; -- cgit v1.2.1