Skip to content
This repository has been archived by the owner on Nov 17, 2023. It is now read-only.

Remove all usages of makefile for scala #14013

Merged
merged 4 commits into from
Feb 4, 2019
Merged

Remove all usages of makefile for scala #14013

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7192d3d
Remove all usages of makefile for scala
zachgk Jan 28, 2019
a88a147
Unify making folders for scala/java setup
zachgk Jan 29, 2019
ff96dab
Fix mxdoc path
zachgk Jan 29, 2019
04a9a4a
Add batch mode to calls
zachgk Jan 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions ci/docker/runtime_functions.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down Expand Up @@ -1241,15 +1242,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
}
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfiles/Dockerfile.in.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 0 additions & 1 deletion docs/install/java_setup.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
5 changes: 2 additions & 3 deletions docs/install/scala_setup.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
3 changes: 1 addition & 2 deletions docs/mxdoc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,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"""
Expand Down