cpu: conv: fix f32 1x1 gemm-based convolution with padding

saininav · Oct 31, 2018 · ef9993c · ef9993c
1 parent 24c1aa9
commit ef9993c
Showing 1 changed file with 4 additions and 3 deletions.
diff --git 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;