Drop dmlc-core commits that break MXNet build (apache#12189)

* Drop dmlc-core commits that break MXNet build * Revert "Disable test_io.test_CSVIter (apache#12146)" This reverts commit a6ecb59.
XinYao1994 · Aug 16, 2018 · 6f024b7 · 6f024b7
1 parent 53ccc66
commit 6f024b7
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/3rdparty/dmlc-core b/3rdparty/dmlc-core
diff --git a/tests/python/unittest/test_io.py b/tests/python/unittest/test_io.py
@@ -309,7 +309,6 @@ def test_DataBatch():
         'DataBatch: data shapes: \[\(2L?, 3L?\), \(7L?, 8L?\)\] label shapes: \[\(4L?, 5L?\)\]', str(batch)))
 
 
-@unittest.skip("Broken test: https://github.com/apache/incubator-mxnet/issues/12139")
 def test_CSVIter():
     def check_CSVIter_synthetic(dtype='float32'):
         cwd = os.getcwd()
+36 −0		include/dmlc/common.h
+1 −25		src/data/csv_parser.h
+19 −30		src/data/text_parser.h
+0 −54		test/unittest/unittest_parser.cc