From 3f146ca68f30f466962e5cc92af31dae0f95b738 Mon Sep 17 00:00:00 2001 From: gigasquid Date: Thu, 13 Dec 2018 19:02:49 -0500 Subject: [PATCH 1/4] testing theory 1: The integration tests can run on linux cpu --- ci/docker/runtime_functions.sh | 8 ++++++++ ci/jenkins/Jenkins_steps.groovy | 13 +++++++++++++ ci/jenkins/Jenkinsfile_unix_cpu | 1 + 3 files changed, 22 insertions(+) diff --git a/ci/docker/runtime_functions.sh b/ci/docker/runtime_functions.sh index 82e6feb2a728..a239d167d854 100755 --- a/ci/docker/runtime_functions.sh +++ b/ci/docker/runtime_functions.sh @@ -801,6 +801,14 @@ unittest_ubuntu_cpu_clojure() { ./contrib/clojure-package/ci-test.sh } +unittest_ubuntu_cpu_clojure_integration() { + set -ex + make scalapkg USE_OPENCV=1 USE_BLAS=openblas USE_DIST_KVSTORE=1 ENABLE_TESTCOVERAGE=1 + make scalainstall USE_OPENCV=1 USE_BLAS=openblas USE_DIST_KVSTORE=1 ENABLE_TESTCOVERAGE=1 + ./contrib/clojure-package/integration-tests.sh +} + + unittest_ubuntu_cpugpu_perl() { set -ex ./perl-package/test.sh diff --git a/ci/jenkins/Jenkins_steps.groovy b/ci/jenkins/Jenkins_steps.groovy index d5cbd97683ed..e666dd9bcb38 100644 --- a/ci/jenkins/Jenkins_steps.groovy +++ b/ci/jenkins/Jenkins_steps.groovy @@ -862,6 +862,19 @@ def test_unix_clojure_cpu() { }] } +def test_unix_clojure_integration_cpu() { + return ['Clojure: CPU Integration': { + node(NODE_LINUX_CPU) { + ws('workspace/ut-clojure-integration-cpu') { + timeout(time: max_time, unit: 'MINUTES') { + utils.unpack_and_init('cpu', mx_dist_lib, true) + utils.docker_run('ubuntu_cpu', 'unittest_ubuntu_cpu_clojure_integration', false) + } + } + } + }] +} + def test_unix_r_cpu() { return ['Perl: CPU': { node(NODE_LINUX_CPU) { diff --git a/ci/jenkins/Jenkinsfile_unix_cpu b/ci/jenkins/Jenkinsfile_unix_cpu index e581bcf65dc5..ffc068a3c82e 100644 --- a/ci/jenkins/Jenkinsfile_unix_cpu +++ b/ci/jenkins/Jenkinsfile_unix_cpu @@ -51,6 +51,7 @@ core_logic: { custom_steps.test_unix_python3_mkldnn_mkl_cpu(), custom_steps.test_unix_scala_cpu(), custom_steps.test_unix_clojure_cpu(), + custom_steps.test_unix_clojure_integration_cpu(), custom_steps.test_unix_r_cpu(), custom_steps.test_unix_julia_cpu(), custom_steps.test_unix_onnx_cpu(), From 056757c274a64c5a13f2a80f2b4df7b0aa9b9606 Mon Sep 17 00:00:00 2001 From: gigasquid Date: Thu, 13 Dec 2018 19:48:39 -0500 Subject: [PATCH 2/4] adjust the integration script so that it does a lein install to install the clojure jar first before running the examples --- contrib/clojure-package/integration-tests.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/contrib/clojure-package/integration-tests.sh b/contrib/clojure-package/integration-tests.sh index 3297fdc2c329..7611ce7a6be2 100755 --- a/contrib/clojure-package/integration-tests.sh +++ b/contrib/clojure-package/integration-tests.sh @@ -19,10 +19,11 @@ set -evx MXNET_HOME=${PWD} -EXAMPLES_HOME=${MXNET_HOME}/contrib/clojure-package/examples -#cd ${MXNET_HOME}/contrib/clojure-package -#lein test -#lein cloverage --codecov +cd ${MXNET_HOME}/contrib/clojure-package +# first build the package and install it +lein install + +cd ${MXNET_HOME}/contrib/clojure-package/examples for i in `find ${EXAMPLES_HOME} -name test` ; do cd ${i} && lein test done From 6efbaacce8f55d75ebdd08f219647c940c34b96d Mon Sep 17 00:00:00 2001 From: gigasquid Date: Thu, 13 Dec 2018 19:51:14 -0500 Subject: [PATCH 3/4] add more of a comment --- contrib/clojure-package/integration-tests.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/contrib/clojure-package/integration-tests.sh b/contrib/clojure-package/integration-tests.sh index 7611ce7a6be2..216ffacb74fb 100755 --- a/contrib/clojure-package/integration-tests.sh +++ b/contrib/clojure-package/integration-tests.sh @@ -23,6 +23,7 @@ cd ${MXNET_HOME}/contrib/clojure-package # first build the package and install it lein install +# then run through all the examples cd ${MXNET_HOME}/contrib/clojure-package/examples for i in `find ${EXAMPLES_HOME} -name test` ; do cd ${i} && lein test From b17b64730ce5ba08fde863f5c67ecce10b4fb112 Mon Sep 17 00:00:00 2001 From: gigasquid Date: Thu, 13 Dec 2018 20:10:39 -0500 Subject: [PATCH 4/4] put back examples-home --- contrib/clojure-package/integration-tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/clojure-package/integration-tests.sh b/contrib/clojure-package/integration-tests.sh index 216ffacb74fb..ece2163b4b19 100755 --- a/contrib/clojure-package/integration-tests.sh +++ b/contrib/clojure-package/integration-tests.sh @@ -24,7 +24,7 @@ cd ${MXNET_HOME}/contrib/clojure-package lein install # then run through all the examples -cd ${MXNET_HOME}/contrib/clojure-package/examples +EXAMPLES_HOME=${MXNET_HOME}/contrib/clojure-package/examples for i in `find ${EXAMPLES_HOME} -name test` ; do cd ${i} && lein test done