You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mxnet.apache.org by GitBox <gi...@apache.org> on 2018/04/18 00:43:33 UTC
[GitHub] xinyu-intel closed pull request #10365: [MXNET-261]Update MKLDNN &
Add CPP Test
xinyu-intel closed pull request #10365: [MXNET-261]Update MKLDNN & Add CPP Test
URL: https://github.com/apache/incubator-mxnet/pull/10365
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/3rdparty/mkldnn b/3rdparty/mkldnn
index f5218ff4fd2..b4137dfc88e 160000
--- a/3rdparty/mkldnn
+++ b/3rdparty/mkldnn
@@ -1 +1 @@
-Subproject commit f5218ff4fd2d16d13aada2e632afd18f2514fee3
+Subproject commit b4137dfc88e3bf5c6b62e833121802eb8c6696da
diff --git a/src/operator/nn/mkldnn/mkldnn_base.cc b/src/operator/nn/mkldnn/mkldnn_base.cc
index 820cca1402c..fca9f157f68 100644
--- a/src/operator/nn/mkldnn/mkldnn_base.cc
+++ b/src/operator/nn/mkldnn/mkldnn_base.cc
@@ -239,6 +239,7 @@ mkldnn_memory_format_t GetDefaultFormat(mkldnn::memory::desc desc) {
case mkldnn_gOihw8o:
case mkldnn_Goihw8g:
case mkldnn_gOihw16o:
+ case mkldnn_Goihw16g:
case mkldnn_gOhwi8o:
case mkldnn_gOhwi16o:
case mkldnn_gOhIw16o4i:
diff --git a/tests/cpp/operator/mkldnn.cc b/tests/cpp/operator/mkldnn.cc
index c3e03df195e..9d4b9823037 100644
--- a/tests/cpp/operator/mkldnn.cc
+++ b/tests/cpp/operator/mkldnn.cc
@@ -77,4 +77,11 @@ TEST(MKLDNN_UTIL_FUNC, AlignMem) {
LOG(INFO) << "Skipped for GCC " << __GNUC__ << "." << __GNUC_MINOR__;
#endif
}
+
+TEST(MKLDNN_UTIL_FUNC, MemFormat) {
+ // Check whether the number of format is correct.
+ CHECK_EQ(mkldnn_format_last, 56);
+ CHECK_EQ(mkldnn_nchw, 5);
+ CHECK_EQ(mkldnn_oihw, 12);
+}
#endif
diff --git a/tests/python/unittest/test_operator.py b/tests/python/unittest/test_operator.py
index 16fcbbace94..47a4422d69c 100644
--- a/tests/python/unittest/test_operator.py
+++ b/tests/python/unittest/test_operator.py
@@ -1259,7 +1259,6 @@ def test_convolution_grouping():
np.testing.assert_allclose(arr1.asnumpy(), arr2.asnumpy(), rtol=1e-3, atol=1e-4)
-@unittest.skip("test fails intermittently. temporarily disabled till it gets fixed. tracked at https://github.com/apache/incubator-mxnet/issues/8712")
@with_seed()
def test_depthwise_convolution():
for dim in [1,2]:
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services