You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mxnet.apache.org by an...@apache.org on 2018/08/16 21:17:25 UTC

[incubator-mxnet] branch master updated: Drop dmlc-core commits that break MXNet build (#12189)

This is an automated email from the ASF dual-hosted git repository.

anirudh2290 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git


The following commit(s) were added to refs/heads/master by this push:
     new a2b0164  Drop dmlc-core commits that break MXNet build (#12189)
a2b0164 is described below

commit a2b01646e1b3eff0c2950a82e74f4334f205e9cf
Author: Philip Hyunsu Cho <ch...@cs.washington.edu>
AuthorDate: Thu Aug 16 14:17:15 2018 -0700

    Drop dmlc-core commits that break MXNet build (#12189)
    
    * Drop dmlc-core commits that break MXNet build
    
    * Revert "Disable test_io.test_CSVIter (#12146)"
    
    This reverts commit a6ecb5919d867e8c01acbaaadad2a3cc24638530.
---
 3rdparty/dmlc-core               | 2 +-
 tests/python/unittest/test_io.py | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/3rdparty/dmlc-core b/3rdparty/dmlc-core
index 958c22b..0a0e8ad 160000
--- a/3rdparty/dmlc-core
+++ b/3rdparty/dmlc-core
@@ -1 +1 @@
-Subproject commit 958c22b32c116ec967a9247d09eddb9c21ea6d4f
+Subproject commit 0a0e8addf92e1287fd7a25c6314016b8c0138dee
diff --git a/tests/python/unittest/test_io.py b/tests/python/unittest/test_io.py
index ddb06f9..4dfa69c 100644
--- 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()