[submodule] Upgrade oneDNN to v2.2.1 (#20080)

bartekkuncer · web-flow · commit c3e0d99e0802 · 2021-04-29T12:30:31.000+02:00
diff --git a/3rdparty/onednn b/3rdparty/onednn
@@ -1 +1 @@
-Subproject commit 83ebc40d86bc54f0f23e947235e53570eeacf254
+Subproject commit f58682cd8bd0615f41d879f8afc8f1511ab42d24
diff --git a/src/operator/nn/mkldnn/mkldnn_convolution.cc b/src/operator/nn/mkldnn/mkldnn_convolution.cc
@@ -418,8 +418,7 @@ void MKLDNNConvolutionForwardFullFeature(const MKLDNNConvFullParam &param, const
       weight.MKLDNNDataReorderAsync(fwd->GetPd().weights_desc());
       weight_mem = GetWeights(weight, fwd->GetPd().weights_desc(), param.conv_param.num_group);
     } else {
-      weight_mem = weight.GetMKLDNNData();
-      CHECK(weight_mem->get_desc() == fwd->GetPd().weights_desc());
+      weight_mem = weight.GetMKLDNNDataReorder(fwd->GetPd().weights_desc());
     }
   }
   mkldnn_output_t out_mem;
diff --git a/tests/cpp/operator/mkldnn_test.cc b/tests/cpp/operator/mkldnn_test.cc
@@ -100,7 +100,7 @@ static void VerifyDefMem(const mkldnn::memory &mem) {
 
 TEST(MKLDNN_UTIL_FUNC, MemFormat) {
   // Check whether the number of format is correct.
-  CHECK_EQ(mkldnn_format_tag_last, 222);
+  CHECK_EQ(mkldnn_format_tag_last, 363);
   CHECK_EQ(mkldnn_nchw, 5);
   CHECK_EQ(mkldnn_oihw, 5);
 }

Original file line number	Diff line number	Diff line change
`@@ -418,8 +418,7 @@ void MKLDNNConvolutionForwardFullFeature(const MKLDNNConvFullParam &param, const`
`418`	`418`	`weight.MKLDNNDataReorderAsync(fwd->GetPd().weights_desc());`
`419`	`419`	`weight_mem = GetWeights(weight, fwd->GetPd().weights_desc(), param.conv_param.num_group);`
`420`	`420`	`} else {`
`421`		`- weight_mem = weight.GetMKLDNNData();`
`422`		`- CHECK(weight_mem->get_desc() == fwd->GetPd().weights_desc());`
	`421`	`+ weight_mem = weight.GetMKLDNNDataReorder(fwd->GetPd().weights_desc());`
`423`	`422`	`}`
`424`	`423`	`}`
`425`	`424`	`mkldnn_output_t out_mem;`
Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ static void VerifyDefMem(const mkldnn::memory &mem) {`
`100`	`100`
`101`	`101`	`TEST(MKLDNN_UTIL_FUNC, MemFormat) {`
`102`	`102`	`// Check whether the number of format is correct.`
`103`		`- CHECK_EQ(mkldnn_format_tag_last, 222);`
	`103`	`+ CHECK_EQ(mkldnn_format_tag_last, 363);`
`104`	`104`	`CHECK_EQ(mkldnn_nchw, 5);`
`105`	`105`	`CHECK_EQ(mkldnn_oihw, 5);`
`106`	`106`	`}`