From c63b722591ff23c8c6fe5fb8ef8c8516d40f03aa Mon Sep 17 00:00:00 2001 From: Gian Marco Iodice Date: Wed, 30 Jun 2021 08:39:44 +0000 Subject: Revert "Rework OpenCL Depthwise Convolution" This reverts commit 561c176598cd14245e2e7918fdf136d1c888d1da. Reason for revert: Change-Id: I6f2d61c27520439bb538e9265736532104b24cf8 Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/5127 Tested-by: Arm Jenkins Reviewed-by: Georgios Pinitas Comments-Addressed: Arm Jenkins --- arm_compute/core/KernelDescriptors.h | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'arm_compute/core/KernelDescriptors.h') diff --git a/arm_compute/core/KernelDescriptors.h b/arm_compute/core/KernelDescriptors.h index a6e5c3372e..6c1fc74b1e 100644 --- a/arm_compute/core/KernelDescriptors.h +++ b/arm_compute/core/KernelDescriptors.h @@ -96,12 +96,16 @@ struct GEMMKernelInfo GEMMLowpOutputStageInfo output_stage{}; /**< GEMMLowp output stage information */ }; -/** Compute descriptor used by the depthwise convolution native kernel */ -struct DWCComputeKernelInfo +/** Descriptor used by the depthwise convolution kernels */ +struct DWCKernelInfo { - unsigned int n0{ 0 }; /**< Number of columns processed by each thread */ - unsigned int m0{ 0 }; /**< Number of rows processed by each thread */ - bool export_weights_to_cl_image{ false }; /**< Export the weights to cl_image */ + ActivationLayerInfo activation_info{}; /**< Activation function to perform after the depthwise convolution */ +}; + +/** Descriptor used by the depthwise convolution kernels to retrieve the number of output elements processed by each thread */ +struct DWCWeightsKernelInfo +{ + unsigned int n0{ 0 }; /**< Number of columns processed by each thread */ }; /** Descriptor used by the softmax kernels */ -- cgit v1.2.1