Merge remote-tracking branch 'upstream/master' into sparse

anirudh2290 · Aug 7, 2017 · 0396c9a · 0396c9a
2 parents cf8ddcf + 2f257e8
commit 0396c9a
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 106 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -287,7 +287,7 @@ try {
                     init_git()
                     unpack_lib('cpu')
                     timeout(time: max_time, unit: 'MINUTES') {
-                        sh "${docker_run} cpu ./perl-package/test.sh /workspace/ut-perl-cpu /workspace/ut-perl-cpu"
+                        sh "${docker_run} cpu ./perl-package/test.sh"
                     }
                 }
             }
@@ -298,7 +298,7 @@ try {
                     init_git()
                     unpack_lib('gpu')
                     timeout(time: max_time, unit: 'MINUTES') {
-                        sh "${docker_run} gpu ./perl-package/test.sh /workspace/ut-perl-gpu /workspace/ut-perl-gpu"
+                        sh "${docker_run} gpu ./perl-package/test.sh"
                     }
                 }
             }

diff --git a/perl-package/AI-MXNet/t/test_autograd.t b/perl-package/AI-MXNet/t/test_autograd.t
diff --git a/perl-package/test.sh b/perl-package/test.sh
@@ -1,16 +1,15 @@
-MXNET_HOME=$1
-HOME=$2
+MXNET_HOME=${PWD}
 export LD_LIBRARY_PATH=${MXNET_HOME}/lib
-export PERL5LIB=${HOME}/perl5/lib/perl5
+export PERL5LIB=${MXNET_HOME}/perl5/lib/perl5
 
 cd ${MXNET_HOME}/perl-package/AI-MXNetCAPI/
-perl Makefile.PL INSTALL_BASE=${HOME}/perl5
+perl Makefile.PL INSTALL_BASE=${MXNET_HOME}/perl5
 make install || exit -1
 
 cd ${MXNET_HOME}/perl-package/AI-NNVMCAPI/
-perl Makefile.PL INSTALL_BASE=${HOME}/perl5
+perl Makefile.PL INSTALL_BASE=${MXNET_HOME}/perl5
 make install || exit -1
 
 cd ${MXNET_HOME}/perl-package/AI-MXNet/
-perl Makefile.PL INSTALL_BASE=${HOME}/perl5
+perl Makefile.PL INSTALL_BASE=${MXNET_HOME}/perl5
 make test || exit -1
diff --git a/scala-package/core/src/test/scala/ml/dmlc/mxnet/OperatorSuite.scala b/scala-package/core/src/test/scala/ml/dmlc/mxnet/OperatorSuite.scala
@@ -37,7 +37,7 @@ class OperatorSuite extends FunSuite with BeforeAndAfterAll
     exec.forward()
     val forwardOutput = exec.outputs(0)
     val forwardOutputExpected = arr.reduce(_ + _)
-    assert(reldiff(forwardOutput, forwardOutputExpected) < 1e-6)
+    assert(reldiff(forwardOutput, forwardOutputExpected) < 2e-6)
 
     // backward
     val outGrad = Random.uniform(-10, 10, shape)

diff --git a/tests/python/gpu/test_operator_gpu.py b/tests/python/gpu/test_operator_gpu.py
@@ -11,7 +11,7 @@
 from test_operator import *
 from test_optimizer import *
 from test_random import *
-from test_nn import *
+from test_gluon import *
 #from test_rnn import *
 from test_gluon_rnn import *
 from test_sparse_operator import test_cast_storage_ex, test_sparse_dot