resolve fp32 ip bwd bug

src/operator/nn/mkldnn/mkldnn_base-inl.h

@@ -229,7 +229,7 @@ static inline mkldnn::memory::data_type get_mkldnn_type(int dtype) {
  case mshadow::kUint8:
  return mkldnn::memory::data_type::u8;
  default:
- LOG(FATAL) << "unknown type for MKLDNN:" << dtype;
+ LOG(FATAL) << "unknown type for MKLDNN";
  return mkldnn::memory::data_type::undef;
  }
 }

src/operator/nn/mkldnn/mkldnn_fully_connected.cc

@@ -273,24 +273,6 @@ void MKLDNNFCBackward(const nnvm::NodeAttrs& attrs, const OpContext &ctx,
  data, weight, param.no_bias ? nullptr : &in_grad[fullc::kBias], GetMemDesc(out_grad));
 
  CHECK_NE(req[fullc::kWeight], kWriteInplace) << "cannot write weight inplace";
- if (req[fullc::kData]) {
- mkldnn::inner_product_backward_data::primitive_desc ipBwdData_pd = GetFCBwdData(
- data, weight, out_grad, fwd_pd);
- auto out_grad_mem = out_grad.GetMKLDNNDataReorder(
- ipBwdData_pd.diff_dst_desc());
- auto weight_mem = weight.GetMKLDNNDataReorder(ipBwdData_pd.weights_desc());
- auto in_grad_mem = CreateMKLDNNMem(in_grad[fullc::kData],
- ipBwdData_pd.diff_src_desc(),
- req[fullc::kData]);
- mkldnn_args_map_t args = {
- {MKLDNN_ARG_DIFF_DST, *out_grad_mem},
- {MKLDNN_ARG_WEIGHTS, *weight_mem},
- {MKLDNN_ARG_DIFF_SRC, *in_grad_mem.second}
- };
-
- MKLDNNStream::Get()->RegisterPrimArgs(mkldnn::inner_product_backward_data(ipBwdData_pd), args);
- CommitOutput(in_grad[fullc::kData], in_grad_mem);
- }
  if (req[fullc::kWeight]) {
  mkldnn::inner_product_backward_weights::primitive_desc ipBwdWeights_pd
  = GetFCBwdWeights(data, weight, param.no_bias ? nullptr : &in_grad[fullc::kBias],
@@ -319,6 +301,24 @@ void MKLDNNFCBackward(const nnvm::NodeAttrs& attrs, const OpContext &ctx,
  CommitOutput(in_grad[fullc::kWeight], in_grad_weight);
  CommitOutput(in_grad[fullc::kBias], in_grad_bias);
  }
+ if (req[fullc::kData]) {
+ mkldnn::inner_product_backward_data::primitive_desc ipBwdData_pd = GetFCBwdData(
+ data, weight, out_grad, fwd_pd);
+ auto out_grad_mem = out_grad.GetMKLDNNDataReorder(
+ ipBwdData_pd.diff_dst_desc());
+ auto weight_mem = weight.GetMKLDNNDataReorder(ipBwdData_pd.weights_desc());
+ auto in_grad_mem = CreateMKLDNNMem(in_grad[fullc::kData],
+ ipBwdData_pd.diff_src_desc(),
+ req[fullc::kData]);
+ mkldnn_args_map_t args = {
+ {MKLDNN_ARG_DIFF_DST, *out_grad_mem},
+ {MKLDNN_ARG_WEIGHTS, *weight_mem},
+ {MKLDNN_ARG_DIFF_SRC, *in_grad_mem.second}
+ };
+
+ MKLDNNStream::Get()->RegisterPrimArgs(mkldnn::inner_product_backward_data(ipBwdData_pd), args);
+ CommitOutput(in_grad[fullc::kData], in_grad_mem);
+ }
  MKLDNNStream::Get()->Submit();
 }
 

src/operator/tensor/elemwise_sum.cc

@@ -123,8 +123,6 @@ void ElementWiseSumComputeExCPU(const nnvm::NodeAttrs& attrs,
  ResourceRequest(ResourceRequest::kTempSpace));
  NDArray out_nd = outputs[0];
  mxnet::ndarray::ElementwiseSum<cpu>(s, rsc, inputs, &out_nd);
- std::cout << "src/operator/tensor/elemwise_sum.cc: not fallback";
- // FallBackCompute(ElementWiseSumCompute<cpu>, attrs, ctx, inputs, req, outputs);
 #if MXNET_USE_MKLDNN == 1
  } else if (IsMKLDNNData(inputs)) {
  MKLDNNRun(MKLDNNSumForward, attrs, ctx, inputs, req, outputs);