From 8d07127f5c8f0e189ee0db4feb88c0c0b47608d5 Mon Sep 17 00:00:00 2001 From: Giorgio Arena Date: Tue, 7 Dec 2021 13:49:10 +0000 Subject: Use #if directive instead of regular condition in CLDirectConv2D Resolve COMPMID-5004 Signed-off-by: Giorgio Arena Change-Id: Ib3e1b5a891234316c411ea9825ec10c68c4ab5a3 Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/6788 Comments-Addressed: Arm Jenkins Tested-by: Arm Jenkins Reviewed-by: Sheri Zhang --- src/gpu/cl/operators/ClConv2d.cpp | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'src/gpu/cl/operators') diff --git a/src/gpu/cl/operators/ClConv2d.cpp b/src/gpu/cl/operators/ClConv2d.cpp index 92b22e758d..2b9a51df22 100644 --- a/src/gpu/cl/operators/ClConv2d.cpp +++ b/src/gpu/cl/operators/ClConv2d.cpp @@ -258,20 +258,15 @@ ConvolutionMethod ClConv2d::get_convolution_method(const ITensorInfo *src, const const bool is_large_kernel_sz = (weights->dimension(idx_w) >= kernel_sz_direct_conv_thr) && (weights->dimension(idx_h) >= kernel_sz_direct_conv_thr); const bool is_ifm_ge_16 = src->dimension(idx_c) >= 16; const bool is_ifm_gt_ofm = weights->dimension(0U) * weights->dimension(1U) * weights->dimension(2U) > weights->dimension(3U); - const bool is_ofm_le_4 = weights->dimension(3U) <= 4; // Run Winograd if valid and IFM >= 16 if(is_wino_valid && is_ifm_ge_16) { return ConvolutionMethod::WINOGRAD; } - // Run Direct for Large kernel size - if(is_large_kernel_sz && is_ifm_gt_ofm && is_direct_valid) - { - return ConvolutionMethod::DIRECT; - } - if(is_ofm_le_4 && is_ifm_gt_ofm && is_direct_valid) + // Run Direct for Large kernel size + if(is_large_kernel_sz && is_ifm_ge_16 && is_direct_valid && is_ifm_gt_ofm) { return ConvolutionMethod::DIRECT; } -- cgit v1.2.1