From 8eb950a18150226b435d2eca1be7078b2faffc68 Mon Sep 17 00:00:00 2001 From: Frank Liu Date: Wed, 26 Dec 2018 17:27:27 -0800 Subject: [PATCH] Update example scripts classpath. --- .../benchmark/run_image_inference_bm.sh | 17 +---------------- .../scripts/benchmark/run_java_inference_bm.sh | 15 +-------------- .../scripts/benchmark/run_text_charrnn_bm.sh | 18 +----------------- .../examples/scripts/customop/run_customop.sh | 2 +- .../scripts/customop/run_customopwithrtc.sh | 2 +- .../imageclassifier/run_classifier_example.sh | 2 +- .../infer/objectdetector/run_ssd_example.sh | 15 ++------------- .../objectdetector/run_ssd_java_example.sh | 15 +-------------- .../predictor/run_predictor_java_example.sh | 15 +-------------- .../examples/scripts/module/mnist_mlp.sh | 2 +- .../scripts/module/run_sequential_module.sh | 2 +- .../neuralstyle_end2end/run_test_end2end.sh | 2 +- .../neuralstyle_end2end/run_train_end2end.sh | 2 +- .../scripts/profiler/run_profiler_matmul.sh | 2 +- .../scripts/profiler/run_profiler_ndarray.sh | 2 +- .../examples/scripts/rnn/run_lstm_bucketing.sh | 7 +------ .../examples/scripts/rnn/run_test_charrnn.sh | 7 +------ .../examples/scripts/rnn/run_train_charrnn.sh | 8 ++------ .../scripts/run_cnntextclassification.sh | 2 +- .../examples/scripts/run_gan_mnist.sh | 2 +- .../examples/scripts/run_multitask.sh | 2 +- .../examples/scripts/run_neuralstyle.sh | 2 +- .../examples/scripts/run_train_mnist.sh | 16 +--------------- 23 files changed, 25 insertions(+), 134 deletions(-) diff --git a/scala-package/examples/scripts/benchmark/run_image_inference_bm.sh b/scala-package/examples/scripts/benchmark/run_image_inference_bm.sh index b647bdf8c6bf..7bbf86ea15fc 100755 --- a/scala-package/examples/scripts/benchmark/run_image_inference_bm.sh +++ b/scala-package/examples/scripts/benchmark/run_image_inference_bm.sh @@ -19,23 +19,8 @@ set -e -echo $OSTYPE - -hw_type=cpu -if [[ $1 = gpu ]] -then - hw_type=gpu -fi - -platform=linux-x86_64 - -if [[ $OSTYPE = [darwin]* ]] -then - platform=osx-x86_64 -fi - MXNET_ROOT=$(cd "$(dirname $0)/../../../.."; pwd) -CLASS_PATH=$MXNET_ROOT/scala-package/assembly/$platform-$hw_type/target/*:$MXNET_ROOT/scala-package/examples/target/*:$MXNET_ROOT/scala-package/examples/target/classes/lib/*:$MXNET_ROOT/scala-package/infer/target/* +CLASS_PATH=$MXNET_ROOT/scala-package/assembly/target/*:$MXNET_ROOT/scala-package/examples/target/*:$MXNET_ROOT/scala-package/examples/target/classes/lib/*:$MXNET_ROOT/scala-package/infer/target/* MODEL_NAME=$2 diff --git a/scala-package/examples/scripts/benchmark/run_java_inference_bm.sh b/scala-package/examples/scripts/benchmark/run_java_inference_bm.sh index 5a468e344829..f426ddaaa65a 100644 --- a/scala-package/examples/scripts/benchmark/run_java_inference_bm.sh +++ b/scala-package/examples/scripts/benchmark/run_java_inference_bm.sh @@ -19,21 +19,8 @@ set -e -hw_type=cpu -if [ "$USE_GPU" = "1" ] -then - hw_type=gpu -fi - -platform=linux-x86_64 - -if [[ $OSTYPE = [darwin]* ]] -then - platform=osx-x86_64 -fi - MXNET_ROOT=$(cd "$(dirname $0)/../../../.."; pwd) -CLASS_PATH=$MXNET_ROOT/scala-package/assembly/$platform-$hw_type/target/*:$MXNET_ROOT/scala-package/examples/target/* +CLASS_PATH=$MXNET_ROOT/scala-package/assembly/target/*:$MXNET_ROOT/scala-package/examples/target/* java -Xmx8G -Dmxnet.traceLeakedObjects=true -cp $CLASS_PATH \ org.apache.mxnetexamples.javaapi.benchmark.JavaBenchmark $@ diff --git a/scala-package/examples/scripts/benchmark/run_text_charrnn_bm.sh b/scala-package/examples/scripts/benchmark/run_text_charrnn_bm.sh index bf6b7b314e71..6b7c10758db9 100755 --- a/scala-package/examples/scripts/benchmark/run_text_charrnn_bm.sh +++ b/scala-package/examples/scripts/benchmark/run_text_charrnn_bm.sh @@ -19,24 +19,8 @@ set -e -echo $OSTYPE - -hw_type=cpu -if [[ $1 = gpu ]] -then - hw_type=gpu -fi - -platform=linux-x86_64 - -if [[ $OSTYPE = [darwin]* ]] -then - platform=osx-x86_64 -fi - - MXNET_ROOT=$(cd "$(dirname $0)/../../../.."; pwd) -CLASS_PATH=$MXNET_ROOT/scala-package/assembly/$platform-$hw_type/target/*:$MXNET_ROOT/scala-package/examples/target/*:$MXNET_ROOT/scala-package/examples/target/classes/lib/*:$MXNET_ROOT/scala-package/infer/target/* +CLASS_PATH=$MXNET_ROOT/scala-package/assembly/target/*:$MXNET_ROOT/scala-package/examples/target/*:$MXNET_ROOT/scala-package/examples/target/classes/lib/*:$MXNET_ROOT/scala-package/infer/target/* MODEL_NAME=$2 diff --git a/scala-package/examples/scripts/customop/run_customop.sh b/scala-package/examples/scripts/customop/run_customop.sh index 049df587477c..1b5caf5e2aba 100644 --- a/scala-package/examples/scripts/customop/run_customop.sh +++ b/scala-package/examples/scripts/customop/run_customop.sh @@ -19,7 +19,7 @@ MXNET_ROOT=$(cd "$(dirname $0)/../../../.."; pwd) -CLASS_PATH=$MXNET_ROOT/scala-package/assembly/linux-x86_64-gpu/target/*:$MXNET_ROOT/scala-package/examples/target/*:$MXNET_ROOT/scala-package/examples/target/classes/lib/* +CLASS_PATH=$MXNET_ROOT/scala-package/assembly/target/*:$MXNET_ROOT/scala-package/examples/target/*:$MXNET_ROOT/scala-package/examples/target/classes/lib/* # which gpu card to use, -1 means cpu GPU=$1 diff --git a/scala-package/examples/scripts/customop/run_customopwithrtc.sh b/scala-package/examples/scripts/customop/run_customopwithrtc.sh index d44949d61b46..432eff5622d2 100644 --- a/scala-package/examples/scripts/customop/run_customopwithrtc.sh +++ b/scala-package/examples/scripts/customop/run_customopwithrtc.sh @@ -19,7 +19,7 @@ MXNET_ROOT=$(cd "$(dirname $0)/../../../.."; pwd) -CLASS_PATH=$MXNET_ROOT/scala-package/assembly/linux-x86_64-gpu/target/*:$MXNET_ROOT/scala-package/examples/target/*:$MXNET_ROOT/scala-package/examples/target/classes/lib/* +CLASS_PATH=$MXNET_ROOT/scala-package/assembly/target/*:$MXNET_ROOT/scala-package/examples/target/*:$MXNET_ROOT/scala-package/examples/target/classes/lib/* # which gpu card to use GPU=0 diff --git a/scala-package/examples/scripts/infer/imageclassifier/run_classifier_example.sh b/scala-package/examples/scripts/infer/imageclassifier/run_classifier_example.sh index bd6509a8225a..aa021478b27e 100755 --- a/scala-package/examples/scripts/infer/imageclassifier/run_classifier_example.sh +++ b/scala-package/examples/scripts/infer/imageclassifier/run_classifier_example.sh @@ -20,7 +20,7 @@ set -e MXNET_ROOT=$(cd "$(dirname $0)/../../../../.."; pwd) -CLASS_PATH=$MXNET_ROOT/scala-package/assembly/osx-x86_64-cpu/target/*:$MXNET_ROOT/scala-package/examples/target/*:$MXNET_ROOT/scala-package/examples/target/classes/lib/*:$MXNET_ROOT/scala-package/infer/target/* +CLASS_PATH=$MXNET_ROOT/scala-package/assembly/target/*:$MXNET_ROOT/scala-package/examples/target/*:$MXNET_ROOT/scala-package/examples/target/classes/lib/*:$MXNET_ROOT/scala-package/infer/target/* # model dir MODEL_PATH_PREFIX=$1 diff --git a/scala-package/examples/scripts/infer/objectdetector/run_ssd_example.sh b/scala-package/examples/scripts/infer/objectdetector/run_ssd_example.sh index 6b4edb7c4c94..9f290416bb32 100755 --- a/scala-package/examples/scripts/infer/objectdetector/run_ssd_example.sh +++ b/scala-package/examples/scripts/infer/objectdetector/run_ssd_example.sh @@ -17,21 +17,10 @@ # specific language governing permissions and limitations # under the License. -hw_type=cpu -if [[ $4 = gpu ]] -then - hw_type=gpu -fi - -platform=linux-x86_64 - -if [[ $OSTYPE = [darwin]* ]] -then - platform=osx-x86_64 -fi +set -x MXNET_ROOT=$(cd "$(dirname $0)/../../../../../"; pwd) -CLASS_PATH=$MXNET_ROOT/scala-package/assembly/$platform-$hw_type/target/*:$MXNET_ROOT/scala-package/examples/target/*:$MXNET_ROOT/scala-package/examples/target/classes/lib/*:$MXNET_ROOT/scala-package/infer/target/* +CLASS_PATH=$MXNET_ROOT/scala-package/assembly/target/*:$MXNET_ROOT/scala-package/examples/target/*:$MXNET_ROOT/scala-package/examples/target/classes/lib/* # model dir and prefix MODEL_DIR=$1 diff --git a/scala-package/examples/scripts/infer/objectdetector/run_ssd_java_example.sh b/scala-package/examples/scripts/infer/objectdetector/run_ssd_java_example.sh index 00ed793a7bb5..07328b50dce6 100755 --- a/scala-package/examples/scripts/infer/objectdetector/run_ssd_java_example.sh +++ b/scala-package/examples/scripts/infer/objectdetector/run_ssd_java_example.sh @@ -17,21 +17,8 @@ # specific language governing permissions and limitations # under the License. -hw_type=cpu -if [[ $4 = gpu ]] -then - hw_type=gpu -fi - -platform=linux-x86_64 - -if [[ $OSTYPE = [darwin]* ]] -then - platform=osx-x86_64 -fi - MXNET_ROOT=$(cd "$(dirname $0)/../../../../../"; pwd) -CLASS_PATH=$MXNET_ROOT/scala-package/assembly/$platform-$hw_type/target/*:$MXNET_ROOT/scala-package/examples/target/*:$MXNET_ROOT/scala-package/examples/target/classes/lib/*:$MXNET_ROOT/scala-package/infer/target/*:$MXNET_ROOT/scala-package/examples/src/main/scala/org/apache/mxnetexamples/api/java/infer/imageclassifier/* +CLASS_PATH=$MXNET_ROOT/scala-package/assembly/target/*:$MXNET_ROOT/scala-package/examples/target/*:$MXNET_ROOT/scala-package/examples/target/classes/lib/*:$MXNET_ROOT/scala-package/infer/target/*:$MXNET_ROOT/scala-package/examples/src/main/scala/org/apache/mxnetexamples/api/java/infer/imageclassifier/* # model dir and prefix MODEL_DIR=$1 diff --git a/scala-package/examples/scripts/infer/predictor/run_predictor_java_example.sh b/scala-package/examples/scripts/infer/predictor/run_predictor_java_example.sh index 4ebcc3076a78..8e8752ee87f4 100755 --- a/scala-package/examples/scripts/infer/predictor/run_predictor_java_example.sh +++ b/scala-package/examples/scripts/infer/predictor/run_predictor_java_example.sh @@ -17,21 +17,8 @@ # specific language governing permissions and limitations # under the License. -hw_type=cpu -if [[ $3 = gpu ]] -then - hw_type=gpu -fi - -platform=linux-x86_64 - -if [[ $OSTYPE = [darwin]* ]] -then - platform=osx-x86_64 -fi - MXNET_ROOT=$(cd "$(dirname $0)/../../../../../"; pwd) -CLASS_PATH=$MXNET_ROOT/scala-package/assembly/$platform-$hw_type/target/*:$MXNET_ROOT/scala-package/examples/target/*:$MXNET_ROOT/scala-package/examples/target/classes/lib/*:$MXNET_ROOT/scala-package/infer/target/* +CLASS_PATH=$MXNET_ROOT/scala-package/assembly/target/*:$MXNET_ROOT/scala-package/examples/target/*:$MXNET_ROOT/scala-package/examples/target/classes/lib/*:$MXNET_ROOT/scala-package/infer/target/* # model dir and prefix MODEL_DIR=$1 diff --git a/scala-package/examples/scripts/module/mnist_mlp.sh b/scala-package/examples/scripts/module/mnist_mlp.sh index e16e16e246b2..907552a45b46 100755 --- a/scala-package/examples/scripts/module/mnist_mlp.sh +++ b/scala-package/examples/scripts/module/mnist_mlp.sh @@ -18,7 +18,7 @@ # under the License. ROOT_DIR=$(cd `dirname $0`/../../..; pwd) -CLASSPATH=$ROOT_DIR/assembly/osx-x86_64/target/*:$ROOT_DIR/examples/target/*:$ROOT_DIR/examples/target/classes/lib/* +CLASSPATH=$ROOT_DIR/assembly/target/*:$ROOT_DIR/examples/target/*:$ROOT_DIR/examples/target/classes/lib/* mkdir -p model java -Xmx4G -cp $CLASSPATH \ diff --git a/scala-package/examples/scripts/module/run_sequential_module.sh b/scala-package/examples/scripts/module/run_sequential_module.sh index 1e40d2dd83f7..c7507850d40b 100644 --- a/scala-package/examples/scripts/module/run_sequential_module.sh +++ b/scala-package/examples/scripts/module/run_sequential_module.sh @@ -18,7 +18,7 @@ # under the License. ROOT_DIR=$(cd `dirname $0`/../../..; pwd) -CLASSPATH=$ROOT_DIR/assembly/linux-x86_64/target/*:$ROOT_DIR/examples/target/*:$ROOT_DIR/examples/target/classes/lib/* +CLASSPATH=$ROOT_DIR/assembly/target/*:$ROOT_DIR/examples/target/*:$ROOT_DIR/examples/target/classes/lib/* DATA_DIR=$ROOT_DIR/core/data diff --git a/scala-package/examples/scripts/neuralstyle_end2end/run_test_end2end.sh b/scala-package/examples/scripts/neuralstyle_end2end/run_test_end2end.sh index 0305ba47acd7..a040ba7ca99b 100644 --- a/scala-package/examples/scripts/neuralstyle_end2end/run_test_end2end.sh +++ b/scala-package/examples/scripts/neuralstyle_end2end/run_test_end2end.sh @@ -19,7 +19,7 @@ MXNET_ROOT=$(cd "$(dirname $0)/../../../.."; pwd) -CLASS_PATH=$MXNET_ROOT/scala-package/assembly/linux-x86_64-gpu/target/*:$MXNET_ROOT/scala-package/examples/target/*:$MXNET_ROOT/scala-package/examples/target/classes/lib/* +CLASS_PATH=$MXNET_ROOT/scala-package/assembly/target/*:$MXNET_ROOT/scala-package/examples/target/*:$MXNET_ROOT/scala-package/examples/target/classes/lib/* INPUT_IMG=$1 MODEL_DIR=$2 diff --git a/scala-package/examples/scripts/neuralstyle_end2end/run_train_end2end.sh b/scala-package/examples/scripts/neuralstyle_end2end/run_train_end2end.sh index cde290f7e460..d63be1d406ab 100644 --- a/scala-package/examples/scripts/neuralstyle_end2end/run_train_end2end.sh +++ b/scala-package/examples/scripts/neuralstyle_end2end/run_train_end2end.sh @@ -19,7 +19,7 @@ MXNET_ROOT=$(cd "$(dirname $0)/../../../.."; pwd) -CLASS_PATH=$MXNET_ROOT/scala-package/assembly/linux-x86_64-gpu/target/*:$MXNET_ROOT/scala-package/examples/target/*:$MXNET_ROOT/scala-package/examples/target/classes/lib/* +CLASS_PATH=$MXNET_ROOT/scala-package/assembly/target/*:$MXNET_ROOT/scala-package/examples/target/*:$MXNET_ROOT/scala-package/examples/target/classes/lib/* # more details please refer to # https://github.com/Ldpe2G/mxnet/blob/develop/example/neural-style/end_to_end/README.md diff --git a/scala-package/examples/scripts/profiler/run_profiler_matmul.sh b/scala-package/examples/scripts/profiler/run_profiler_matmul.sh index 824578b96ead..2f7828573aa5 100644 --- a/scala-package/examples/scripts/profiler/run_profiler_matmul.sh +++ b/scala-package/examples/scripts/profiler/run_profiler_matmul.sh @@ -19,7 +19,7 @@ MXNET_ROOT=$(cd "$(dirname $0)/../../../.."; pwd) -CLASS_PATH=$MXNET_ROOT/scala-package/assembly/linux-x86_64-gpu/target/*:$MXNET_ROOT/scala-package/examples/target/*:$MXNET_ROOT/scala-package/examples/target/classes/lib/* +CLASS_PATH=$MXNET_ROOT/scala-package/assembly/target/*:$MXNET_ROOT/scala-package/examples/target/*:$MXNET_ROOT/scala-package/examples/target/classes/lib/* # which gpu card to use, -1 means cpu GPU=0 diff --git a/scala-package/examples/scripts/profiler/run_profiler_ndarray.sh b/scala-package/examples/scripts/profiler/run_profiler_ndarray.sh index 18f290e52c44..3b8cf22a5abd 100644 --- a/scala-package/examples/scripts/profiler/run_profiler_ndarray.sh +++ b/scala-package/examples/scripts/profiler/run_profiler_ndarray.sh @@ -19,7 +19,7 @@ MXNET_ROOT=$(cd "$(dirname $0)/../../../.."; pwd) -CLASS_PATH=$MXNET_ROOT/scala-package/assembly/linux-x86_64-gpu/target/*:$MXNET_ROOT/scala-package/examples/target/*:$MXNET_ROOT/scala-package/examples/target/classes/lib/* +CLASS_PATH=$MXNET_ROOT/scala-package/assembly/target/*:$MXNET_ROOT/scala-package/examples/target/*:$MXNET_ROOT/scala-package/examples/target/classes/lib/* MODE="all" diff --git a/scala-package/examples/scripts/rnn/run_lstm_bucketing.sh b/scala-package/examples/scripts/rnn/run_lstm_bucketing.sh index 33dfce4cc13a..508dcac80cff 100644 --- a/scala-package/examples/scripts/rnn/run_lstm_bucketing.sh +++ b/scala-package/examples/scripts/rnn/run_lstm_bucketing.sh @@ -19,12 +19,7 @@ MXNET_ROOT=$(cd "$(dirname $0)/../../../.."; pwd) -OS=$(uname) -if [ "$OS" = "Darwin" ]; then - CLASS_PATH=$MXNET_ROOT/scala-package/assembly/osx-x86_64-gpu/target/*:$MXNET_ROOT/scala-package/examples/target/*:$MXNET_ROOT/scala-package/examples/target/classes/lib/* -else - CLASS_PATH=$MXNET_ROOT/scala-package/assembly/linux-x86_64-gpu/target/*:$MXNET_ROOT/scala-package/examples/target/*:$MXNET_ROOT/scala-package/examples/target/classes/lib/* -fi +CLASS_PATH=$MXNET_ROOT/scala-package/assembly/target/*:$MXNET_ROOT/scala-package/examples/target/*:$MXNET_ROOT/scala-package/examples/target/classes/lib/* DATA_TRAIN=$1 DATA_VAL=$2 diff --git a/scala-package/examples/scripts/rnn/run_test_charrnn.sh b/scala-package/examples/scripts/rnn/run_test_charrnn.sh index a854764fa416..df1fac3667db 100644 --- a/scala-package/examples/scripts/rnn/run_test_charrnn.sh +++ b/scala-package/examples/scripts/rnn/run_test_charrnn.sh @@ -19,12 +19,7 @@ MXNET_ROOT=$(cd "$(dirname $0)/../../../.."; pwd) -OS=$(uname) -if [ "$OS" = "Darwin" ]; then - CLASS_PATH=$MXNET_ROOT/scala-package/assembly/osx-x86_64-gpu/target/*:$MXNET_ROOT/scala-package/examples/target/*:$MXNET_ROOT/scala-package/examples/target/classes/lib/* -else - CLASS_PATH=$MXNET_ROOT/scala-package/assembly/linux-x86_64-gpu/target/*:$MXNET_ROOT/scala-package/examples/target/*:$MXNET_ROOT/scala-package/examples/target/classes/lib/* -fi +CLASS_PATH=$MXNET_ROOT/scala-package/assembly/target/*:$MXNET_ROOT/scala-package/examples/target/*:$MXNET_ROOT/scala-package/examples/target/classes/lib/* # you can get the training data file using the following command # curl -O http://data.mxnet.io/data/char_lstm.zip diff --git a/scala-package/examples/scripts/rnn/run_train_charrnn.sh b/scala-package/examples/scripts/rnn/run_train_charrnn.sh index f49eed64b109..f8c9a3534923 100755 --- a/scala-package/examples/scripts/rnn/run_train_charrnn.sh +++ b/scala-package/examples/scripts/rnn/run_train_charrnn.sh @@ -19,12 +19,8 @@ MXNET_ROOT=$(cd "$(dirname $0)/../../../.."; pwd) -OS=$(uname) -if [ "$OS" = "Darwin" ]; then - CLASS_PATH=$MXNET_ROOT/scala-package/assembly/osx-x86_64-gpu/target/*:$MXNET_ROOT/scala-package/examples/target/*:$MXNET_ROOT/scala-package/examples/target/classes/lib/* -else - CLASS_PATH=$MXNET_ROOT/scala-package/assembly/linux-x86_64-gpu/target/*:$MXNET_ROOT/scala-package/examples/target/*:$MXNET_ROOT/scala-package/examples/target/classes/lib/* -fi +CLASS_PATH=$MXNET_ROOT/scala-package/assembly/target/*:$MXNET_ROOT/scala-package/examples/target/*:$MXNET_ROOT/scala-package/examples/target/classes/lib/* + # which gpu card to use, -1 means cpu GPU=$1 # you can get the training data file using the following command diff --git a/scala-package/examples/scripts/run_cnntextclassification.sh b/scala-package/examples/scripts/run_cnntextclassification.sh index 88fae7cf529b..1e9b46540932 100644 --- a/scala-package/examples/scripts/run_cnntextclassification.sh +++ b/scala-package/examples/scripts/run_cnntextclassification.sh @@ -19,7 +19,7 @@ MXNET_ROOT=$(cd "$(dirname $0)/../../.."; pwd) -CLASS_PATH=$MXNET_ROOT/scala-package/assembly/linux-x86_64-gpu/target/*:$MXNET_ROOT/scala-package/examples/target/*:$MXNET_ROOT/scala-package/examples/target/classes/lib/* +CLASS_PATH=$MXNET_ROOT/scala-package/assembly/target/*:$MXNET_ROOT/scala-package/examples/target/*:$MXNET_ROOT/scala-package/examples/target/classes/lib/* # which gpu card to use, -1 means cpu GPU=$1 diff --git a/scala-package/examples/scripts/run_gan_mnist.sh b/scala-package/examples/scripts/run_gan_mnist.sh index f7c26a79ac4e..539adfdc9ef2 100644 --- a/scala-package/examples/scripts/run_gan_mnist.sh +++ b/scala-package/examples/scripts/run_gan_mnist.sh @@ -19,7 +19,7 @@ MXNET_ROOT=$(cd "$(dirname $0)/../../.."; pwd) -CLASS_PATH=$MXNET_ROOT/scala-package/assembly/linux-x86_64-gpu/target/*:$MXNET_ROOT/scala-package/examples/target/*:$MXNET_ROOT/scala-package/examples/target/classes/lib/* +CLASS_PATH=$MXNET_ROOT/scala-package/assembly/target/*:$MXNET_ROOT/scala-package/examples/target/*:$MXNET_ROOT/scala-package/examples/target/classes/lib/* # which gpu card to use, -1 means cpu GPU=$1 diff --git a/scala-package/examples/scripts/run_multitask.sh b/scala-package/examples/scripts/run_multitask.sh index 62047528bc8c..abf272fbe4a1 100644 --- a/scala-package/examples/scripts/run_multitask.sh +++ b/scala-package/examples/scripts/run_multitask.sh @@ -19,7 +19,7 @@ MXNET_ROOT=$(cd "$(dirname $0)/../../.."; pwd) -CLASS_PATH=$MXNET_ROOT/scala-package/assembly/linux-x86_64-gpu/target/*:$MXNET_ROOT/scala-package/examples/target/*:$MXNET_ROOT/scala-package/examples/target/classes/lib/* +CLASS_PATH=$MXNET_ROOT/scala-package/assembly/target/*:$MXNET_ROOT/scala-package/examples/target/*:$MXNET_ROOT/scala-package/examples/target/classes/lib/* # which gpu card to use, -1 means cpu GPU=$1 diff --git a/scala-package/examples/scripts/run_neuralstyle.sh b/scala-package/examples/scripts/run_neuralstyle.sh index 238c37127ad2..fb482437654f 100644 --- a/scala-package/examples/scripts/run_neuralstyle.sh +++ b/scala-package/examples/scripts/run_neuralstyle.sh @@ -19,7 +19,7 @@ MXNET_ROOT=$(cd "$(dirname $0)/../../.."; pwd) -CLASS_PATH=$MXNET_ROOT/scala-package/assembly/linux-x86_64-gpu/target/*:$MXNET_ROOT/scala-package/examples/target/*:$MXNET_ROOT/scala-package/examples/target/classes/lib/* +CLASS_PATH=$MXNET_ROOT/scala-package/assembly/target/*:$MXNET_ROOT/scala-package/examples/target/*:$MXNET_ROOT/scala-package/examples/target/classes/lib/* INPUT_IMG=$1 STYLE_IMG=$2 MODEL_PATH=$MXNET_ROOT/example/neural-style/model/vgg19.params diff --git a/scala-package/examples/scripts/run_train_mnist.sh b/scala-package/examples/scripts/run_train_mnist.sh index d27b7cbb3657..418065e77577 100755 --- a/scala-package/examples/scripts/run_train_mnist.sh +++ b/scala-package/examples/scripts/run_train_mnist.sh @@ -19,23 +19,9 @@ set -e -hw_type=cpu -if [[ $1 = gpu ]] -then - hw_type=gpu -fi - -platform=linux-x86_64 - -if [[ $OSTYPE = [darwin]* ]] -then - platform=osx-x86_64 - hw_type=cpu -fi - MXNET_ROOT=$(cd "$(dirname $0)/../../.."; pwd) echo $MXNET_ROOT -CLASS_PATH=$MXNET_ROOT/scala-package/assembly/$platform-$hw_type/target/*:$MXNET_ROOT/scala-package/examples/target/*:$MXNET_ROOT/scala-package/examples/target/classes/lib/* +CLASS_PATH=$MXNET_ROOT/scala-package/assembly/target/*:$MXNET_ROOT/scala-package/examples/target/*:$MXNET_ROOT/scala-package/examples/target/classes/lib/* # model dir DATA_PATH=$2