Refactor src/operator/subgraph/dnnl/dnnl_conv.cc file

src/operator/subgraph/dnnl/dnnl_conv.cc

@@ -127,13 +127,12 @@ void SgDNNLConvOperator::Forward(const OpContext& ctx,
                                  const std::vector<OpReqType>& req,
                                  const std::vector<NDArray>& outputs) {
   auto& full_conv_param = param_.full_conv_param;
-  auto& dnnl_param      = param_.full_conv_param.dnnl_param;
-  auto& conv_param      = param_.full_conv_param.conv_param;
+  auto& dnnl_param      = full_conv_param.dnnl_param;
+  auto& conv_param      = full_conv_param.conv_param;
   auto bn_param         = param_.bn_param.get();
-  size_t input_size =
-      2 + (conv_param.no_bias ? 0 : 1) + (dnnl_param.with_bn ? 4 : 0) +
-      (dnnl_param.with_sum ? 1 : 0) +
-      (dnnl_param.quantized ? 2 + (full_conv_param.dnnl_param.with_sum ? 2 : 0) : 0);
+  size_t input_size     = 2 + (conv_param.no_bias ? 0 : 1) + (dnnl_param.with_bn ? 4 : 0) +
+                      (dnnl_param.with_sum ? 1 : 0) +
+                      (dnnl_param.quantized ? 2 + (dnnl_param.with_sum ? 2 : 0) : 0);
   // When dedup is on, in_data is used to calculate sum instead of in_sum
   if (dnnl_param.dedup_sum) {
     input_size -= 1;
@@ -346,7 +345,7 @@ void SgDNNLConvOperator::Forward(const OpContext& ctx,
                            has_bias,
                            fwd_->GetPd().weights_desc(),
                            has_bias ? &bias_md : nullptr,
-                           full_conv_param.conv_param.num_group,
+                           conv_param.num_group,
                            data_scale_,
                            weight_scales_);
     args_[DNNL_ARG_SRC]     = *data.GetDNNLData();

src/operator/subgraph/dnnl/dnnl_identity_property.h

@@ -137,7 +137,6 @@ class SgDNNLIdentityProperty : public SubgraphProperty {
     // Create copy of original node
     nnvm::ObjectPtr n = nnvm::Node::Create();
     n->attrs          = org_node->attrs;
-    CHECK(n->op()) << "WRTF";
     if (n->op()->attr_parser) {
       n->op()->attr_parser(&(n->attrs));
     }