[incubator-mxnet] branch master updated: Remove all usages of makefile for scala (#14013)

[zh...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

zhasheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git


The following commit(s) were added to refs/heads/master by this push:
     new 7ad4aca  Remove all usages of makefile for scala (#14013)
7ad4aca is described below

commit 7ad4acad97e331ddd544566ad009c5fa52cecdea
Author: Zach Kimberg <za...@kimberg.com>
AuthorDate: Mon Feb 4 11:15:25 2019 -0800

    Remove all usages of makefile for scala (#14013)
    
    * Remove all usages of makefile for scala
    
    * Unify making folders for scala/java setup
    
    * Fix mxdoc path
    
    * Add batch mode to calls
---
 ci/docker/runtime_functions.sh         | 9 +++++----
 docker/Dockerfiles/Dockerfile.in.scala | 2 +-
 docs/install/java_setup.md             | 1 -
 docs/install/scala_setup.md            | 5 ++---
 docs/mxdoc.py                          | 3 +--
 5 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/ci/docker/runtime_functions.sh b/ci/docker/runtime_functions.sh
index 7820d3d..63a2a1b 100755
--- 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,7 +1272,7 @@ 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
 }
@@ -1279,7 +1280,7 @@ nightly_java_demo_test_cpu() {
 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
index 6898126..92e0983 100644
--- 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
index ea4bb50..bd20c95 100644
--- 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
index 98e752b..9ee9cea 100644
--- 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
index 156d1e8..f7b226a 100644
--- 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"""