Remove all usages of makefile for scala (apache#14013)

* Remove all usages of makefile for scala * Unify making folders for scala/java setup * Fix mxdoc path * Add batch mode to calls
vdantu · Mar 31, 2019 · 71e6b3f · 71e6b3f
1 parent 89a538a
commit 71e6b3f
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 11 deletions.
diff --git a/ci/docker/runtime_functions.sh b/ci/docker/runtime_functions.sh
@@ -870,8 +870,9 @@ unittest_ubuntu_cpu_clojure() {
 
 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
+    cd scala-package
+    mvn -B install
+    cd ..
     ./contrib/clojure-package/integration-tests.sh
 }
 
@@ -1271,15 +1272,15 @@ nightly_tutorial_test_ubuntu_python2_gpu() {
 nightly_java_demo_test_cpu() {
     set -ex
     cd /work/mxnet/scala-package/mxnet-demo/java-demo
-    mvn -Pci-nightly install
+    mvn -B -Pci-nightly install
     bash bin/java_sample.sh
     bash bin/run_od.sh
 }
 
 nightly_scala_demo_test_cpu() {
     set -ex
     cd /work/mxnet/scala-package/mxnet-demo/scala-demo
-    mvn -Pci-nightly install
+    mvn -B -Pci-nightly install
     bash bin/demo.sh
     bash bin/run_im.sh
 }

diff --git a/docker/Dockerfiles/Dockerfile.in.scala b/docker/Dockerfiles/Dockerfile.in.scala
@@ -4,4 +4,4 @@
 COPY install/scala.sh install/
 RUN install/scala.sh
 
-RUN cd mxnet && make scalapkg $BUILD_OPTS
+RUN cd mxnet/scala-package && mvn package
diff --git a/docs/install/java_setup.md b/docs/install/java_setup.md
@@ -109,7 +109,6 @@ The previously mentioned setup with Maven is recommended. Otherwise, the followi
 If you have already built MXNet **from source** and are looking to setup Java from that point, you may simply run the following from the MXNet `scala-package` folder:
 
 ```
-mvn package
 mvn install
 ```
 This will install both the Java Inference API and the required MXNet-Scala package. 

diff --git a/docs/install/scala_setup.md b/docs/install/scala_setup.md
@@ -89,11 +89,10 @@ The previously mentioned setup with Maven is recommended. Otherwise, the followi
 
 
 #### Build Scala from an Existing MXNet Installation
-If you have already built MXNet **from source** and are looking to setup Scala from that point, you may simply run the following from the MXNet source root:
+If you have already built MXNet **from source** and are looking to setup Scala from that point, you may simply run the following from the MXNet `scala-package` folder:
 
 ```
-make scalapkg
-make scalainstall
+mvn install
 ```
 
 <hr>

diff --git a/docs/mxdoc.py b/docs/mxdoc.py
@@ -106,8 +106,7 @@ def build_r_docs(app):
 
 def build_scala(app):
     """build scala for scala docs, java docs, and clojure docs to use"""
-    _run_cmd("cd %s/.. && make scalapkg" % app.builder.srcdir)
-    _run_cmd("cd %s/.. && make scalainstall" % app.builder.srcdir)
+    _run_cmd("cd %s/../scala-package && mvn -B install -DskipTests" % app.builder.srcdir)
 
 def build_scala_docs(app):
     """build scala doc and then move the outdir"""