TaoLv commented on a change in pull request #13530: Integrate MKLDNN Conv1d and
support 3d layout
URL: https://github.com/apache/incubator-mxnet/pull/13530#discussion_r239698726
##########
File path: src/operator/nn/mkldnn/mkldnn_convolution.cc
##########
@@ -51,15 +54,23 @@ mkldnn::convolution_forward::primitive_desc GetConvFwdImpl(
auto weight_md = GetWeightDesc(weights, param.conv_param.num_group);
auto out_md = GetMemDesc(output);
auto engine = CpuEngine::Get()->get_engine();
- CHECK_GE(param.conv_param.stride.ndim(), 2U);
- CHECK_GE(param.conv_param.pad.ndim(), 2U);
- CHECK_GE(param.conv_param.dilate.ndim(), 2U);
- mkldnn::memory::dims strides{0, 0};
- strides[0] = param.conv_param.stride[0];
- strides[1] = param.conv_param.stride[1];
- mkldnn::memory::dims padding{0, 0};
- padding[0] = param.conv_param.pad[0];
- padding[1] = param.conv_param.pad[1];
+ mkldnn::memory::dims strides(param.conv_param.kernel.ndim());
+ mkldnn::memory::dims padding(param.conv_param.kernel.ndim());
+ if (param.conv_param.kernel.ndim() == 1) {
+ CHECK_GE(param.conv_param.stride.ndim(), 1U);
+ CHECK_GE(param.conv_param.pad.ndim(), 1U);
+ CHECK_GE(param.conv_param.dilate.ndim(), 1U);
+ strides[0] = param.conv_param.stride[0];
+ padding[0] = param.conv_param.pad[0];
+ } else if (param.conv_param.kernel.ndim() == 2) {
+ CHECK_GE(param.conv_param.stride.ndim(), 2U);
+ CHECK_GE(param.conv_param.pad.ndim(), 2U);
+ CHECK_GE(param.conv_param.dilate.ndim(), 2U);
+ strides[0] = param.conv_param.stride[0];
+ strides[1] = param.conv_param.stride[1];
+ padding[0] = param.conv_param.pad[0];
+ padding[1] = param.conv_param.pad[1];
+ }
Review comment:
else?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
