Merge branch 'master' into stable

dmlc · Jan 28, 2017 · 0619b55 · 0619b55
2 parents 94e84d1 + d59b214
commit 0619b55
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 61 deletions.
diff --git a/REQUIRE b/REQUIRE
@@ -1,5 +1,5 @@
 julia 0.5
-Compat 0.9.1
+Compat 0.9.5
 Formatting
 BinDeps
 JSON
diff --git a/test/runtests.jl b/test/runtests.jl
@@ -1,10 +1,5 @@
 using MXNet
-if VERSION ≥ v"0.5.0-dev+7720"
-    using Base.Test
-else
-    using BaseTestNext
-    const Test = BaseTestNext
-end
+using Base.Test
 
 # run test in the whole directory, latest modified files
 # are run first, this makes waiting time shorter when writing

diff --git a/test/unittest/bind.jl b/test/unittest/bind.jl
@@ -1,11 +1,6 @@
 module TestBind
 using MXNet
-if VERSION ≥ v"0.5.0-dev+7720"
-    using Base.Test
-else
-    using BaseTestNext
-    const Test = BaseTestNext
-end
+using Base.Test
 
 using ..Main: rand_dims, reldiff
 

diff --git a/test/unittest/io.jl b/test/unittest/io.jl
@@ -1,11 +1,6 @@
 module TestIO
 using MXNet
-if VERSION ≥ v"0.5.0-dev+7720"
-    using Base.Test
-else
-    using BaseTestNext
-    const Test = BaseTestNext
-end
+using Base.Test
 
 using ..Main: rand_dims, reldiff
 

diff --git a/test/unittest/kvstore.jl b/test/unittest/kvstore.jl
@@ -1,11 +1,6 @@
 module TestKVStore
 using MXNet
-if VERSION ≥ v"0.5.0-dev+7720"
-    using Base.Test
-else
-    using BaseTestNext
-    const Test = BaseTestNext
-end
+using Base.Test
 
 using ..Main: rand_dims
 

diff --git a/test/unittest/name.jl b/test/unittest/name.jl
@@ -1,11 +1,6 @@
 module TestNameManager
 using MXNet
-if VERSION ≥ v"0.5.0-dev+7720"
-    using Base.Test
-else
-    using BaseTestNext
-    const Test = BaseTestNext
-end
+using Base.Test
 
 function test_default()
   info("NameManager::default")

diff --git a/test/unittest/ndarray.jl b/test/unittest/ndarray.jl
@@ -1,11 +1,6 @@
 module TestNDArray
 using MXNet
-if VERSION ≥ v"0.5.0-dev+7720"
-    using Base.Test
-else
-    using BaseTestNext
-    const Test = BaseTestNext
-end
+using Base.Test
 
 using ..Main: rand_dims, reldiff
 

diff --git a/test/unittest/operator.jl b/test/unittest/operator.jl
@@ -1,11 +1,6 @@
 module TestOperator
 using MXNet
-if VERSION ≥ v"0.5.0-dev+7720"
-    using Base.Test
-else
-    using BaseTestNext
-    const Test = BaseTestNext
-end
+using Base.Test
 
 using ..Main: rand_dims, reldiff
 

diff --git a/test/unittest/random.jl b/test/unittest/random.jl
@@ -1,11 +1,6 @@
 module TestRandom
 using MXNet
-if VERSION ≥ v"0.5.0-dev+7720"
-    using Base.Test
-else
-    using BaseTestNext
-    const Test = BaseTestNext
-end
+using Base.Test
 
 function test_uniform()
   dims = (100, 100, 2)

diff --git a/test/unittest/symbolic-node.jl b/test/unittest/symbolic-node.jl
@@ -1,11 +1,6 @@
 module TestSymbolicNode
 using MXNet
-if VERSION ≥ v"0.5.0-dev+7720"
-    using Base.Test
-else
-    using BaseTestNext
-    const Test = BaseTestNext
-end
+using Base.Test
 
 using ..Main: mlp2, reldiff
 

diff --git a/test/unittest/visualize.jl b/test/unittest/visualize.jl
@@ -1,11 +1,6 @@
 module TestVisualize
 using MXNet
-if VERSION ≥ v"0.5.0-dev+7720"
-    using Base.Test
-else
-    using BaseTestNext
-    const Test = BaseTestNext
-end
+using Base.Test
 
 using ..Main: mlp2