From ef9993c254ff08a9e9370ed8928a548745bcb685 Mon Sep 17 00:00:00 2001 From: Denis Samoilov <denis.samoylov@intel.com> Date: Wed, 31 Oct 2018 01:48:18 -0700 Subject: [PATCH] cpu: conv: fix f32 1x1 gemm-based convolution with padding --- src/cpu/gemm_convolution_utils.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/cpu/gemm_convolution_utils.cpp b/src/cpu/gemm_convolution_utils.cpp index 5189cf71fb0..80dfe9f19fe 100644 --- a/src/cpu/gemm_convolution_utils.cpp +++ b/src/cpu/gemm_convolution_utils.cpp @@ -377,9 +377,10 @@ void init_conf( jcp.wei_adj_scale = (!jcp.signed_input || mayiuse(avx512_core_vnni)) ? 1.0f : (1.0f / 2.0f); - jcp.im2col_sz = !(jcp.oh == jcp.ih && jcp.ow == jcp.iw - && jcp.od == jcp.id && jcp.ks == 1 - && !jcp.signed_input) + jcp.im2col_sz = !everyone_is(true, + jcp.ow == jcp.iw, jcp.oh == jcp.ih, jcp.od == jcp.id, + jcp.stride_w == 1, jcp.stride_h == 1, jcp.stride_d == 1, + jcp.ks == 1, !jcp.signed_input) ? (ptrdiff_t)jcp.ic * jcp.ks * jcp.os : 0;