add Julia package as a submodule and enable CPU build

[av skip]
apache · Oct 10, 2017 · 0aac633 · 0aac633
1 parent 0941f27
commit 0aac633
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 5 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -16,3 +16,6 @@
 [submodule "cub"]
 	path = cub
 	url = https://github.com/dmlc/cub
+[submodule "julia-package"]
+	path = julia-package
+	url = https://github.com/dmlc/MXNet.jl.git
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -407,6 +407,21 @@ try {
           }
         }
       },
+      'Julia 0.6: CPU': {
+        node('mxnetlinux') {
+          ws('workspace/ut-julia-cpu') {
+            init_git()
+            unpack_lib('cpu')
+            withEnv(['MXNET_HOME=/workspace/ut-julia-cpu']) {
+              timeout(time: max_timem unit: 'MINUTES') {
+                sh "${docker_run} cpu julia -e 'Pkg.clone(\"julia-package\", \"MXNet\")'"
+                sh "${docker_run} cpu julia -e 'Pkg.build(\"MXNet\")'"
+                sh "${docker_run} cpu julia -e 'Pkg.test(\"MXNet\")'"
+              }
+            }
+          }
+        }
+      },
       'Python 2: CPU Win': {
         node('mxnetwindows') {
           ws('workspace/ut-python-cpu') {

diff --git a/julia-package b/julia-package
diff --git a/tests/ci_build/Dockerfile.cpu b/tests/ci_build/Dockerfile.cpu
@@ -10,3 +10,5 @@ COPY install/ubuntu_install_r.sh /install/
 RUN /install/ubuntu_install_r.sh
 COPY install/ubuntu_install_perl.sh /install/
 RUN /install/ubuntu_install_perl.sh
+COPY install/install_julia.sh /install/
+RUN /install/install_julia.sh
diff --git a/tests/ci_build/install/install_julia.sh b/tests/ci_build/install/install_julia.sh
@@ -20,10 +20,10 @@
 
 set -e
 
-wget https://julialang.s3.amazonaws.com/bin/linux/x64/0.5/julia-0.5.0-linux-x86_64.tar.gz
-mv julia-0.5.0-linux-x86_64.tar.gz /tmp/
-tar xfvz /tmp/julia-0.5.0-linux-x86_64.tar.gz
-rm -f /tmp/julia-0.5.0-linux-x86_64.tar.gz
+wget https://julialang-s3.julialang.org/bin/linux/x64/0.6/julia-0.6.0-linux-x86_64.tar.gz
+mv julia-0.6.0-linux-x86_64.tar.gz /tmp/
+tar xfvz /tmp/julia-0.6.0-linux-x86_64.tar.gz
+rm -f /tmp/julia-0.6.0-linux-x86_64.tar.gz
 
 # tar extracted in current directory
-ln -s -f ${PWD}/julia-3c9d75391c/bin/julia /usr/bin/julia
+ln -s -f ${PWD}/julia-903644385b/bin/julia /usr/bin/julia
diff --git a/tools/license_header.py b/tools/license_header.py
@@ -59,6 +59,7 @@
                'cub/',
                'dlpack/',
                'dmlc-core/',
+               'julia-package/',
                'mshadow/',
                'nnvm',
                'ps-lite',