Skip to content

Commit 081ba59

Browse files
dmitrygoazhai219
dmitrygo
authored andcommitted
[FIX] [WA] Removed kernel_outside_src condition on JIT FP32/BF16 Convolutions
1 parent cdd70a8 commit 081ba59

4 files changed

+18
-18
lines changed

src/cpu/x64/jit_avx2_conv_kernel_f32.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -645,11 +645,11 @@ status_t jit_avx2_conv_fwd_kernel_f32::init_conf(jit_conv_conf_t &jcp,
645645
jcp.t_pad, jcp.oh, jcp.ih, jcp.stride_h, ext_kh);
646646
jcp.back_pad = calculate_end_padding(
647647
jcp.f_pad, jcp.od, jcp.id, jcp.stride_d, ext_kd);
648-
bool kernel_outside_src = false || ext_kw <= jcp.l_pad
649-
|| ext_kw <= jcp.r_pad || ext_kh <= jcp.t_pad || ext_kh <= jcp.b_pad
650-
|| ext_kd <= jcp.f_pad || ext_kd <= jcp.back_pad;
651-
VDISPATCH_CONV_IC(!kernel_outside_src, VERBOSE_UNSUPPORTED_PAD_FEATURE,
652-
"weights and src size mismatch");
648+
// bool kernel_outside_src = false || ext_kw <= jcp.l_pad
649+
// || ext_kw <= jcp.r_pad || ext_kh <= jcp.t_pad || ext_kh <= jcp.b_pad
650+
// || ext_kd <= jcp.f_pad || ext_kd <= jcp.back_pad;
651+
// VDISPATCH_CONV_IC(!kernel_outside_src, VERBOSE_UNSUPPORTED_PAD_FEATURE,
652+
// "weights and src size mismatch");
653653

654654
const auto dat_tag_nxc = pick(ndims - 3, nwc, nhwc, ndhwc);
655655
const auto dat_tag_ncx = pick(ndims - 3, ncw, nchw, ncdhw);

src/cpu/x64/jit_avx512_common_conv_kernel.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -843,10 +843,10 @@ status_t jit_avx512_common_conv_fwd_kernel::init_conf(jit_conv_conf_t &jcp,
843843
jcp.t_pad, jcp.oh, jcp.ih, jcp.stride_h, ext_kh);
844844
jcp.back_pad = calculate_end_padding(
845845
jcp.f_pad, jcp.od, jcp.id, jcp.stride_d, ext_kd);
846-
bool kernel_outside_src = false || ext_kw <= jcp.l_pad
847-
|| ext_kw <= jcp.r_pad || ext_kh <= jcp.t_pad || ext_kh <= jcp.b_pad
848-
|| ext_kd <= jcp.f_pad || ext_kd <= jcp.back_pad;
849-
if (kernel_outside_src) return status::unimplemented;
846+
// bool kernel_outside_src = false || ext_kw <= jcp.l_pad
847+
// || ext_kw <= jcp.r_pad || ext_kh <= jcp.t_pad || ext_kh <= jcp.b_pad
848+
// || ext_kd <= jcp.f_pad || ext_kd <= jcp.back_pad;
849+
// if (kernel_outside_src) return status::unimplemented;
850850

851851
const auto dat_tag_nxc = pick(ndims - 3, nwc, nhwc, ndhwc);
852852
const auto dat_tag_ncx = pick(ndims - 3, ncw, nchw, ncdhw);

src/cpu/x64/jit_avx512_core_bf16_conv_kernel.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -892,10 +892,10 @@ status_t jit_avx512_core_bf16_fwd_kernel::init_conf(jit_conv_conf_t &jcp,
892892
jcp.t_pad, jcp.oh, jcp.ih, jcp.stride_h, ext_kh);
893893
jcp.back_pad = calculate_end_padding(
894894
jcp.f_pad, jcp.od, jcp.id, jcp.stride_d, ext_kd);
895-
bool kernel_outside_src = false || ext_kw <= jcp.l_pad
896-
|| ext_kw <= jcp.r_pad || ext_kh <= jcp.t_pad || ext_kh <= jcp.b_pad
897-
|| ext_kd <= jcp.f_pad || ext_kd <= jcp.back_pad;
898-
if (kernel_outside_src) return status::unimplemented;
895+
// bool kernel_outside_src = false || ext_kw <= jcp.l_pad
896+
// || ext_kw <= jcp.r_pad || ext_kh <= jcp.t_pad || ext_kh <= jcp.b_pad
897+
// || ext_kd <= jcp.f_pad || ext_kd <= jcp.back_pad;
898+
// if (kernel_outside_src) return status::unimplemented;
899899

900900
const auto dat_tag_nxc = pick(ndims - 3, nwc, nhwc, ndhwc);
901901
const auto dat_tag_ncx = pick(ndims - 3, ncw, nchw, ncdhw);

src/cpu/x64/jit_sse41_conv_kernel_f32.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -439,11 +439,11 @@ status_t jit_sse41_conv_fwd_kernel_f32::init_conf(jit_conv_conf_t &jcp,
439439
jcp.l_pad, jcp.ow, jcp.iw, jcp.stride_w, ext_kw);
440440
jcp.b_pad = calculate_end_padding(
441441
jcp.t_pad, jcp.oh, jcp.ih, jcp.stride_h, ext_kh);
442-
bool kernel_outside_src = false || ext_kw <= jcp.l_pad
443-
|| ext_kw <= jcp.r_pad || ext_kh <= jcp.t_pad
444-
|| ext_kh <= jcp.b_pad;
445-
VDISPATCH_CONV_IC(!kernel_outside_src, VERBOSE_UNSUPPORTED_PAD_FEATURE,
446-
"weights and src size mismatch");
442+
// bool kernel_outside_src = false || ext_kw <= jcp.l_pad
443+
// || ext_kw <= jcp.r_pad || ext_kh <= jcp.t_pad
444+
// || ext_kh <= jcp.b_pad;
445+
// VDISPATCH_CONV_IC(!kernel_outside_src, VERBOSE_UNSUPPORTED_PAD_FEATURE,
446+
// "weights and src size mismatch");
447447

448448
const auto dat_tag_nxc = (ndims == 3 ? nwc : nhwc);
449449
const auto dat_tag_ncx = (ndims == 3 ? ncw : nchw);

0 commit comments

Comments
 (0)