From 36c83c3ea46041191b928d275962f7f53aececaf Mon Sep 17 00:00:00 2001 From: bkuncer Date: Wed, 18 Nov 2020 21:27:28 +0800 Subject: [PATCH 1/3] [1.8.x][submodule] Upgrade to oneDNN v1.7 --- 3rdparty/mkldnn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/3rdparty/mkldnn b/3rdparty/mkldnn index a84360ed7e6d..7aed236906b1 160000 --- a/3rdparty/mkldnn +++ b/3rdparty/mkldnn @@ -1 +1 @@ -Subproject commit a84360ed7e6db37b0147b874b1cdd9ec765e4682 +Subproject commit 7aed236906b1f7a05c0917e5257a1af05e9ff683 From 17ee767694d0d73b4b0d40abeafb43991c48771c Mon Sep 17 00:00:00 2001 From: bkuncer Date: Thu, 19 Nov 2020 00:35:53 +0800 Subject: [PATCH 2/3] Adjust MemFormat test --- tests/cpp/operator/mkldnn_test.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/cpp/operator/mkldnn_test.cc b/tests/cpp/operator/mkldnn_test.cc index b3bd508b2009..816979b99428 100644 --- 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, 219); + CHECK_EQ(mkldnn_format_tag_last, 222); CHECK_EQ(mkldnn_nchw, 5); CHECK_EQ(mkldnn_oihw, 5); } From 339d513cff52b3a6d3132a71330565ce34cbbf98 Mon Sep 17 00:00:00 2001 From: bkuncer Date: Thu, 19 Nov 2020 17:06:29 +0800 Subject: [PATCH 3/3] Changed mkldnn commit to v1.7 tag --- 3rdparty/mkldnn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/3rdparty/mkldnn b/3rdparty/mkldnn index 7aed236906b1..2e4732679f02 160000 --- a/3rdparty/mkldnn +++ b/3rdparty/mkldnn @@ -1 +1 @@ -Subproject commit 7aed236906b1f7a05c0917e5257a1af05e9ff683 +Subproject commit 2e4732679f0211bb311780d0f383cf2dce9baca7