This is an automated email from the ASF dual-hosted git repository.
lanking 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 e9a7aa4 add examples and fix the dependency problem (#13620)
e9a7aa4 is described below
commit e9a7aa42ec380d92b1623025d6434b8856724402
Author: Lanking <[email protected]>
AuthorDate: Fri Jan 4 14:18:40 2019 -0500
add examples and fix the dependency problem (#13620)
* add examples and fix the dependency problem
* add Nightly run and optimized script
* add explanation for the line
---
ci/docker/runtime_functions.sh | 8 ++++++++
scala-package/mxnet-demo/java-demo/Makefile | 2 +-
scala-package/mxnet-demo/java-demo/README.md | 7 +++++++
scala-package/mxnet-demo/java-demo/bin/java_sample.sh | 2 +-
scala-package/mxnet-demo/java-demo/bin/run_od.sh | 2 +-
.../mxnet-demo/java-demo/src/main/java/mxnet/HelloWorld.java | 4 ++++
tests/nightly/Jenkinsfile | 8 ++++++++
7 files changed, 30 insertions(+), 3 deletions(-)
diff --git a/ci/docker/runtime_functions.sh b/ci/docker/runtime_functions.sh
index a84ee2c..039a2ba 100755
--- a/ci/docker/runtime_functions.sh
+++ b/ci/docker/runtime_functions.sh
@@ -1213,6 +1213,14 @@ nightly_tutorial_test_ubuntu_python2_gpu() {
nosetests-3.4 $NOSE_TIMER_ARGUMENTS --with-xunit --xunit-file
nosetests_tutorials.xml test_tutorials.py --nologcapture
}
+nightly_java_demo_test_cpu() {
+ set -ex
+ cd /work/mxnet/scala-package/mxnet-demo/java-demo
+ make javademo
+ ./bin/java_sample.sh
+ ./bin/run_od.sh
+}
+
# Deploy
diff --git a/scala-package/mxnet-demo/java-demo/Makefile
b/scala-package/mxnet-demo/java-demo/Makefile
index bb47db1..e4698bb 100644
--- a/scala-package/mxnet-demo/java-demo/Makefile
+++ b/scala-package/mxnet-demo/java-demo/Makefile
@@ -16,7 +16,7 @@
# under the License.
SCALA_VERSION_PROFILE := 2.11
-MXNET_VERSION := 1.4.0-SNAPSHOT
+MXNET_VERSION := [1.4.0-SNAPSHOT,\)
ifeq ($(OS),Windows_NT)
UNAME_S := Windows
diff --git a/scala-package/mxnet-demo/java-demo/README.md
b/scala-package/mxnet-demo/java-demo/README.md
index dbe1805..54a56ba 100644
--- a/scala-package/mxnet-demo/java-demo/README.md
+++ b/scala-package/mxnet-demo/java-demo/README.md
@@ -37,6 +37,13 @@ However, you have to define the Classpath before you run the
demo code. More inf
The `CLASSPATH` should point to the jar file you have downloaded.
It will load the library automatically and run the example
+
+In order to use the `Param Object`. We requires user to place this line in the
front:
+```
+static NDArray$ NDArray = NDArray$.MODULE$;
+```
+It would help to have the NDArray companion object static and accessable from
the outside.
+
### Object Detection using Inference API
We also provide an example to do object detection, which downloads a ImageNet
trained resnet50 model and runs inference on an image to return the
classification result as
```Bash
diff --git a/scala-package/mxnet-demo/java-demo/bin/java_sample.sh
b/scala-package/mxnet-demo/java-demo/bin/java_sample.sh
old mode 100644
new mode 100755
index 2ec9a78..4fb724a
--- a/scala-package/mxnet-demo/java-demo/bin/java_sample.sh
+++ b/scala-package/mxnet-demo/java-demo/bin/java_sample.sh
@@ -16,5 +16,5 @@
# under the License.
#!/bin/bash
CURR_DIR=$(cd $(dirname $0)/../; pwd)
-CLASSPATH=$CLASSPATH:$CURR_DIR/target/*:$CLASSPATH:$CURR_DIR/target/classes/lib/*
+CLASSPATH=$CLASSPATH:$CURR_DIR/target/*:$CLASSPATH:$CURR_DIR/target/dependency/*
java -Xmx8G -cp $CLASSPATH mxnet.HelloWorld
\ No newline at end of file
diff --git a/scala-package/mxnet-demo/java-demo/bin/run_od.sh
b/scala-package/mxnet-demo/java-demo/bin/run_od.sh
old mode 100644
new mode 100755
index e3c8fd5..abd0bf5
--- a/scala-package/mxnet-demo/java-demo/bin/run_od.sh
+++ b/scala-package/mxnet-demo/java-demo/bin/run_od.sh
@@ -16,5 +16,5 @@
# under the License.
#!/bin/bash
CURR_DIR=$(cd $(dirname $0)/../; pwd)
-CLASSPATH=$CLASSPATH:$CURR_DIR/target/*:$CLASSPATH:$CURR_DIR/target/classes/lib/*
+CLASSPATH=$CLASSPATH:$CURR_DIR/target/*:$CLASSPATH:$CURR_DIR/target/dependency/*
java -Xmx8G -cp $CLASSPATH mxnet.ObjectDetection
\ No newline at end of file
diff --git
a/scala-package/mxnet-demo/java-demo/src/main/java/mxnet/HelloWorld.java
b/scala-package/mxnet-demo/java-demo/src/main/java/mxnet/HelloWorld.java
index 3f209a6..71981e2 100644
--- a/scala-package/mxnet-demo/java-demo/src/main/java/mxnet/HelloWorld.java
+++ b/scala-package/mxnet-demo/java-demo/src/main/java/mxnet/HelloWorld.java
@@ -20,9 +20,13 @@ import org.apache.mxnet.javaapi.*;
import java.util.Arrays;
public class HelloWorld {
+ static NDArray$ NDArray = NDArray$.MODULE$;
+
public static void main(String[] args) {
System.out.println("Hello World!");
NDArray nd = new NDArray(new float[]{2.0f, 3.0f}, new Shape(new
int[]{1, 2}), Context.cpu());
System.out.println(nd.shape());
+ NDArray nd2 = NDArray.dot(NDArray.new dotParam(nd, nd.T()))[0];
+ System.out.println(Arrays.toString(nd2.toArray()));
}
}
diff --git a/tests/nightly/Jenkinsfile b/tests/nightly/Jenkinsfile
index d769f08..b8e2849 100755
--- a/tests/nightly/Jenkinsfile
+++ b/tests/nightly/Jenkinsfile
@@ -113,6 +113,14 @@ core_logic: {
}
}
},
+ 'Java Demo: CPU': {
+ node(NODE_LINUX_CPU) {
+ ws('workspace/java-demo') {
+ utils.init_git()
+ utils.docker_run('ubuntu_nightly_cpu', 'nightly_java_demo_test_cpu',
false)
+ }
+ }
+ },
'MXNetJS: CPU': {
node(NODE_LINUX_CPU) {
ws('workspace/nt-mxnetjs') {
