From e013460b0109afb2ea64ee465287f299814e4485 Mon Sep 17 00:00:00 2001 From: Qing Date: Tue, 13 Nov 2018 18:51:56 -0800 Subject: [PATCH 1/4] patch fix --- .../mxnetexamples/javaapi/benchmark/JavaBenchmark.java | 7 ------- 1 file changed, 7 deletions(-) diff --git a/scala-package/examples/src/main/java/org/apache/mxnetexamples/javaapi/benchmark/JavaBenchmark.java b/scala-package/examples/src/main/java/org/apache/mxnetexamples/javaapi/benchmark/JavaBenchmark.java index 2fd9fd5f7cbf..c541ce779c3a 100644 --- a/scala-package/examples/src/main/java/org/apache/mxnetexamples/javaapi/benchmark/JavaBenchmark.java +++ b/scala-package/examples/src/main/java/org/apache/mxnetexamples/javaapi/benchmark/JavaBenchmark.java @@ -102,13 +102,6 @@ public static void main(String[] args) { System.exit(1); } List context = getContext(); - if (System.getenv().containsKey("SCALA_TEST_ON_GPU") && - Integer.valueOf(System.getenv("SCALA_TEST_ON_GPU")) == 1) { - context.add(Context.gpu()); - } else { - context.add(Context.cpu()); - } - long[] result = new long[model.numRun]; model.preProcessModel(context); if (runBatch) { From 50acd571d270af475f530d81053e303bd473ca0b Mon Sep 17 00:00:00 2001 From: Qing Date: Tue, 13 Nov 2018 19:03:03 -0800 Subject: [PATCH 2/4] update ignore --- scala-package/.gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scala-package/.gitignore b/scala-package/.gitignore index 0f860e62836a..6aa4da6b1cfc 100644 --- a/scala-package/.gitignore +++ b/scala-package/.gitignore @@ -1,5 +1,8 @@ .flattened-pom.xml core/src/main/scala/org/apache/mxnet/NDArrayAPIBase.scala core/src/main/scala/org/apache/mxnet/NDArrayBase.scala +core/src/main/scala/org/apache/mxnet/javaapi/NDArrayBase.scala core/src/main/scala/org/apache/mxnet/SymbolAPIBase.scala core/src/main/scala/org/apache/mxnet/SymbolBase.scala +examples/scripts/infer/images/ +examples/scripts/infer/models/ From af34815ecb51362a54c97bd1720888595a03747d Mon Sep 17 00:00:00 2001 From: Naveen Swamy Date: Wed, 14 Nov 2018 17:06:33 -0800 Subject: [PATCH 3/4] rename getContext to bindToDevice --- .../apache/mxnetexamples/javaapi/benchmark/JavaBenchmark.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scala-package/examples/src/main/java/org/apache/mxnetexamples/javaapi/benchmark/JavaBenchmark.java b/scala-package/examples/src/main/java/org/apache/mxnetexamples/javaapi/benchmark/JavaBenchmark.java index c541ce779c3a..d764e650994e 100644 --- a/scala-package/examples/src/main/java/org/apache/mxnetexamples/javaapi/benchmark/JavaBenchmark.java +++ b/scala-package/examples/src/main/java/org/apache/mxnetexamples/javaapi/benchmark/JavaBenchmark.java @@ -67,7 +67,7 @@ private static void printStatistics(long[] inferenceTimesRaw, String metricsPref } - private static List getContext() { + private static List bindToDevice() { List context = new ArrayList(); if (System.getenv().containsKey("SCALA_TEST_ON_GPU") && Integer.valueOf(System.getenv("SCALA_TEST_ON_GPU")) == 1) { @@ -101,7 +101,7 @@ public static void main(String[] args) { System.err.println("Model name not found! " + modelName); System.exit(1); } - List context = getContext(); + List context = bindToDeivce(); long[] result = new long[model.numRun]; model.preProcessModel(context); if (runBatch) { From 0924bc55226a12d53c91fac31275536adc3830df Mon Sep 17 00:00:00 2001 From: Naveen Swamy Date: Wed, 14 Nov 2018 17:08:31 -0800 Subject: [PATCH 4/4] Update JavaBenchmark.java --- .../apache/mxnetexamples/javaapi/benchmark/JavaBenchmark.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scala-package/examples/src/main/java/org/apache/mxnetexamples/javaapi/benchmark/JavaBenchmark.java b/scala-package/examples/src/main/java/org/apache/mxnetexamples/javaapi/benchmark/JavaBenchmark.java index d764e650994e..4a6bb2dd38bf 100644 --- a/scala-package/examples/src/main/java/org/apache/mxnetexamples/javaapi/benchmark/JavaBenchmark.java +++ b/scala-package/examples/src/main/java/org/apache/mxnetexamples/javaapi/benchmark/JavaBenchmark.java @@ -101,7 +101,7 @@ public static void main(String[] args) { System.err.println("Model name not found! " + modelName); System.exit(1); } - List context = bindToDeivce(); + List context = bindToDevice(); long[] result = new long[model.numRun]; model.preProcessModel(context); if (runBatch) {