From 6f16e4391a961cb5b56e7c4215cbff79707c3184 Mon Sep 17 00:00:00 2001 From: taolv Date: Mon, 1 Jul 2019 22:26:18 +0800 Subject: [PATCH 1/3] update mkldnn to v0.20 release --- 3rdparty/mkldnn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/3rdparty/mkldnn b/3rdparty/mkldnn index 41bee20d7eb4..d89bf4babd7c 160000 --- a/3rdparty/mkldnn +++ b/3rdparty/mkldnn @@ -1 +1 @@ -Subproject commit 41bee20d7eb4a67feeeeb8d597b3598994eb1959 +Subproject commit d89bf4babd7cce7efa6613387dca79c123164084 From 9642952c31dcc3dde0905ebe30b78a9ded69ee73 Mon Sep 17 00:00:00 2001 From: taolv Date: Tue, 2 Jul 2019 11:05:05 +0800 Subject: [PATCH 2/3] update mkldnn format numbers --- tests/cpp/operator/mkldnn_test.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/cpp/operator/mkldnn_test.cc b/tests/cpp/operator/mkldnn_test.cc index 3e7b62d8b33f..ab624e3a3c44 100644 --- a/tests/cpp/operator/mkldnn_test.cc +++ b/tests/cpp/operator/mkldnn_test.cc @@ -100,9 +100,9 @@ static void VerifyDefMem(const mkldnn::memory &mem) { TEST(MKLDNN_UTIL_FUNC, MemFormat) { // Check whether the number of format is correct. - CHECK_EQ(mkldnn_format_last, 145); + CHECK_EQ(mkldnn_format_last, 158); CHECK_EQ(mkldnn_nchw, 7); - CHECK_EQ(mkldnn_oihw, 16); + CHECK_EQ(mkldnn_oihw, 17); } static void VerifyMem(const mkldnn::memory &mem) { From dc4fc3f6c7577e6221b1f660f1e323aad3e8e307 Mon Sep 17 00:00:00 2001 From: taolv Date: Mon, 8 Jul 2019 12:16:51 +0800 Subject: [PATCH 3/3] retrigger ci