summaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorLuke Yeager <luke.yeager@gmail.com>2016-07-13 15:58:29 -0700
committerLuke Yeager <luke.yeager@gmail.com>2016-07-13 15:58:29 -0700
commit93d321227f0681165b126d9ca47b211f5d2c1909 (patch)
tree0b202246ab3d36c9e645bd0a3b9266437c512745 /examples
parentc2a1ecd4b2362db5f77fb9bf574d3770f0204a54 (diff)
downloadcaffeonacl-93d321227f0681165b126d9ca47b211f5d2c1909.tar.gz
caffeonacl-93d321227f0681165b126d9ca47b211f5d2c1909.tar.bz2
caffeonacl-93d321227f0681165b126d9ca47b211f5d2c1909.zip
Add "set -e" and $@ to example scripts
Diffstat (limited to 'examples')
-rwxr-xr-xexamples/cifar10/create_cifar10.sh1
-rwxr-xr-xexamples/cifar10/train_full.sh7
-rwxr-xr-xexamples/cifar10/train_full_sigmoid.sh3
-rwxr-xr-xexamples/cifar10/train_full_sigmoid_bn.sh3
-rwxr-xr-xexamples/cifar10/train_quick.sh5
-rwxr-xr-xexamples/imagenet/create_imagenet.sh1
-rwxr-xr-xexamples/imagenet/resume_training.sh4
-rwxr-xr-xexamples/imagenet/train_caffenet.sh3
-rwxr-xr-xexamples/mnist/create_mnist.sh1
-rwxr-xr-xexamples/mnist/train_lenet.sh3
-rwxr-xr-xexamples/mnist/train_lenet_adam.sh3
-rwxr-xr-xexamples/mnist/train_lenet_consolidated.sh3
-rwxr-xr-xexamples/mnist/train_lenet_rmsprop.sh4
-rwxr-xr-xexamples/mnist/train_mnist_autoencoder.sh3
-rwxr-xr-xexamples/mnist/train_mnist_autoencoder_adadelta.sh3
-rwxr-xr-xexamples/mnist/train_mnist_autoencoder_adagrad.sh3
-rwxr-xr-xexamples/mnist/train_mnist_autoencoder_nesterov.sh3
-rwxr-xr-xexamples/siamese/create_mnist_siamese.sh1
-rwxr-xr-xexamples/siamese/train_mnist_siamese.sh3
19 files changed, 39 insertions, 18 deletions
diff --git a/examples/cifar10/create_cifar10.sh b/examples/cifar10/create_cifar10.sh
index a42725cb..7ee1d6ad 100755
--- a/examples/cifar10/create_cifar10.sh
+++ b/examples/cifar10/create_cifar10.sh
@@ -1,5 +1,6 @@
#!/usr/bin/env sh
# This script converts the cifar data into leveldb format.
+set -e
EXAMPLE=examples/cifar10
DATA=data/cifar10
diff --git a/examples/cifar10/train_full.sh b/examples/cifar10/train_full.sh
index ef112e1f..06ecc2dc 100755
--- a/examples/cifar10/train_full.sh
+++ b/examples/cifar10/train_full.sh
@@ -1,16 +1,17 @@
#!/usr/bin/env sh
+set -e
TOOLS=./build/tools
$TOOLS/caffe train \
- --solver=examples/cifar10/cifar10_full_solver.prototxt
+ --solver=examples/cifar10/cifar10_full_solver.prototxt $@
# reduce learning rate by factor of 10
$TOOLS/caffe train \
--solver=examples/cifar10/cifar10_full_solver_lr1.prototxt \
- --snapshot=examples/cifar10/cifar10_full_iter_60000.solverstate.h5
+ --snapshot=examples/cifar10/cifar10_full_iter_60000.solverstate.h5 $@
# reduce learning rate by factor of 10
$TOOLS/caffe train \
--solver=examples/cifar10/cifar10_full_solver_lr2.prototxt \
- --snapshot=examples/cifar10/cifar10_full_iter_65000.solverstate.h5
+ --snapshot=examples/cifar10/cifar10_full_iter_65000.solverstate.h5 $@
diff --git a/examples/cifar10/train_full_sigmoid.sh b/examples/cifar10/train_full_sigmoid.sh
index 9cff06d3..9b5d5213 100755
--- a/examples/cifar10/train_full_sigmoid.sh
+++ b/examples/cifar10/train_full_sigmoid.sh
@@ -1,7 +1,8 @@
#!/usr/bin/env sh
+set -e
TOOLS=./build/tools
$TOOLS/caffe train \
- --solver=examples/cifar10/cifar10_full_sigmoid_solver.prototxt
+ --solver=examples/cifar10/cifar10_full_sigmoid_solver.prototxt $@
diff --git a/examples/cifar10/train_full_sigmoid_bn.sh b/examples/cifar10/train_full_sigmoid_bn.sh
index 011387c9..05547f3a 100755
--- a/examples/cifar10/train_full_sigmoid_bn.sh
+++ b/examples/cifar10/train_full_sigmoid_bn.sh
@@ -1,7 +1,8 @@
#!/usr/bin/env sh
+set -e
TOOLS=./build/tools
$TOOLS/caffe train \
- --solver=examples/cifar10/cifar10_full_sigmoid_solver_bn.prototxt
+ --solver=examples/cifar10/cifar10_full_sigmoid_solver_bn.prototxt $@
diff --git a/examples/cifar10/train_quick.sh b/examples/cifar10/train_quick.sh
index 6b7d2288..d2b87534 100755
--- a/examples/cifar10/train_quick.sh
+++ b/examples/cifar10/train_quick.sh
@@ -1,11 +1,12 @@
#!/usr/bin/env sh
+set -e
TOOLS=./build/tools
$TOOLS/caffe train \
- --solver=examples/cifar10/cifar10_quick_solver.prototxt
+ --solver=examples/cifar10/cifar10_quick_solver.prototxt $@
# reduce learning rate by factor of 10 after 8 epochs
$TOOLS/caffe train \
--solver=examples/cifar10/cifar10_quick_solver_lr1.prototxt \
- --snapshot=examples/cifar10/cifar10_quick_iter_4000.solverstate.h5
+ --snapshot=examples/cifar10/cifar10_quick_iter_4000.solverstate.h5 $@
diff --git a/examples/imagenet/create_imagenet.sh b/examples/imagenet/create_imagenet.sh
index e912ac43..1bf08b1a 100755
--- a/examples/imagenet/create_imagenet.sh
+++ b/examples/imagenet/create_imagenet.sh
@@ -1,6 +1,7 @@
#!/usr/bin/env sh
# Create the imagenet lmdb inputs
# N.B. set the path to the imagenet train + val data dirs
+set -e
EXAMPLE=examples/imagenet
DATA=data/ilsvrc12
diff --git a/examples/imagenet/resume_training.sh b/examples/imagenet/resume_training.sh
index bf7945c0..4aef2043 100755
--- a/examples/imagenet/resume_training.sh
+++ b/examples/imagenet/resume_training.sh
@@ -1,5 +1,7 @@
#!/usr/bin/env sh
+set -e
./build/tools/caffe train \
--solver=models/bvlc_reference_caffenet/solver.prototxt \
- --snapshot=models/bvlc_reference_caffenet/caffenet_train_10000.solverstate.h5
+ --snapshot=models/bvlc_reference_caffenet/caffenet_train_10000.solverstate.h5 \
+ $@
diff --git a/examples/imagenet/train_caffenet.sh b/examples/imagenet/train_caffenet.sh
index 94558ec5..a5094d44 100755
--- a/examples/imagenet/train_caffenet.sh
+++ b/examples/imagenet/train_caffenet.sh
@@ -1,4 +1,5 @@
#!/usr/bin/env sh
+set -e
./build/tools/caffe train \
- --solver=models/bvlc_reference_caffenet/solver.prototxt
+ --solver=models/bvlc_reference_caffenet/solver.prototxt $@
diff --git a/examples/mnist/create_mnist.sh b/examples/mnist/create_mnist.sh
index 06ecc27d..f5e2e796 100755
--- a/examples/mnist/create_mnist.sh
+++ b/examples/mnist/create_mnist.sh
@@ -1,6 +1,7 @@
#!/usr/bin/env sh
# This script converts the mnist data into lmdb/leveldb format,
# depending on the value assigned to $BACKEND.
+set -e
EXAMPLE=examples/mnist
DATA=data/mnist
diff --git a/examples/mnist/train_lenet.sh b/examples/mnist/train_lenet.sh
index 1b6bf7d9..f7f9b861 100755
--- a/examples/mnist/train_lenet.sh
+++ b/examples/mnist/train_lenet.sh
@@ -1,3 +1,4 @@
#!/usr/bin/env sh
+set -e
-./build/tools/caffe train --solver=examples/mnist/lenet_solver.prototxt
+./build/tools/caffe train --solver=examples/mnist/lenet_solver.prototxt $@
diff --git a/examples/mnist/train_lenet_adam.sh b/examples/mnist/train_lenet_adam.sh
index a32ecf2d..7b4e9056 100755
--- a/examples/mnist/train_lenet_adam.sh
+++ b/examples/mnist/train_lenet_adam.sh
@@ -1,3 +1,4 @@
#!/usr/bin/env sh
+set -e
-./build/tools/caffe train --solver=examples/mnist/lenet_solver_adam.prototxt
+./build/tools/caffe train --solver=examples/mnist/lenet_solver_adam.prototxt $@
diff --git a/examples/mnist/train_lenet_consolidated.sh b/examples/mnist/train_lenet_consolidated.sh
index c8554678..c5f02666 100755
--- a/examples/mnist/train_lenet_consolidated.sh
+++ b/examples/mnist/train_lenet_consolidated.sh
@@ -1,4 +1,5 @@
#!/usr/bin/env sh
+set -e
./build/tools/caffe train \
- --solver=examples/mnist/lenet_consolidated_solver.prototxt
+ --solver=examples/mnist/lenet_consolidated_solver.prototxt $@
diff --git a/examples/mnist/train_lenet_rmsprop.sh b/examples/mnist/train_lenet_rmsprop.sh
index 621cab23..adfa7ab0 100755
--- a/examples/mnist/train_lenet_rmsprop.sh
+++ b/examples/mnist/train_lenet_rmsprop.sh
@@ -1,3 +1,5 @@
#!/usr/bin/env sh
+set -e
-./build/tools/caffe train --solver=examples/mnist/lenet_solver_rmsprop.prototxt
+./build/tools/caffe train \
+ --solver=examples/mnist/lenet_solver_rmsprop.prototxt $@
diff --git a/examples/mnist/train_mnist_autoencoder.sh b/examples/mnist/train_mnist_autoencoder.sh
index cfd67e82..724a0f14 100755
--- a/examples/mnist/train_mnist_autoencoder.sh
+++ b/examples/mnist/train_mnist_autoencoder.sh
@@ -1,4 +1,5 @@
#!/usr/bin/env sh
+set -e
./build/tools/caffe train \
- --solver=examples/mnist/mnist_autoencoder_solver.prototxt
+ --solver=examples/mnist/mnist_autoencoder_solver.prototxt $@
diff --git a/examples/mnist/train_mnist_autoencoder_adadelta.sh b/examples/mnist/train_mnist_autoencoder_adadelta.sh
index 4be0ebdd..a660dbb9 100755
--- a/examples/mnist/train_mnist_autoencoder_adadelta.sh
+++ b/examples/mnist/train_mnist_autoencoder_adadelta.sh
@@ -1,4 +1,5 @@
#!/bin/bash
+set -e
./build/tools/caffe train \
- --solver=examples/mnist/mnist_autoencoder_solver_adadelta.prototxt
+ --solver=examples/mnist/mnist_autoencoder_solver_adadelta.prototxt $@
diff --git a/examples/mnist/train_mnist_autoencoder_adagrad.sh b/examples/mnist/train_mnist_autoencoder_adagrad.sh
index 95fe1b17..4c11dfa6 100755
--- a/examples/mnist/train_mnist_autoencoder_adagrad.sh
+++ b/examples/mnist/train_mnist_autoencoder_adagrad.sh
@@ -1,4 +1,5 @@
#!/bin/bash
+set -e
./build/tools/caffe train \
- --solver=examples/mnist/mnist_autoencoder_solver_adagrad.prototxt
+ --solver=examples/mnist/mnist_autoencoder_solver_adagrad.prototxt $@
diff --git a/examples/mnist/train_mnist_autoencoder_nesterov.sh b/examples/mnist/train_mnist_autoencoder_nesterov.sh
index cf19ea74..fd0559d2 100755
--- a/examples/mnist/train_mnist_autoencoder_nesterov.sh
+++ b/examples/mnist/train_mnist_autoencoder_nesterov.sh
@@ -1,4 +1,5 @@
#!/bin/bash
+set -e
./build/tools/caffe train \
- --solver=examples/mnist/mnist_autoencoder_solver_nesterov.prototxt
+ --solver=examples/mnist/mnist_autoencoder_solver_nesterov.prototxt $@
diff --git a/examples/siamese/create_mnist_siamese.sh b/examples/siamese/create_mnist_siamese.sh
index 43ad6b18..03adce54 100755
--- a/examples/siamese/create_mnist_siamese.sh
+++ b/examples/siamese/create_mnist_siamese.sh
@@ -1,5 +1,6 @@
#!/usr/bin/env sh
# This script converts the mnist data into leveldb format.
+set -e
EXAMPLES=./build/examples/siamese
DATA=./data/mnist
diff --git a/examples/siamese/train_mnist_siamese.sh b/examples/siamese/train_mnist_siamese.sh
index 84a30a8a..e01ac2ce 100755
--- a/examples/siamese/train_mnist_siamese.sh
+++ b/examples/siamese/train_mnist_siamese.sh
@@ -1,5 +1,6 @@
#!/usr/bin/env sh
+set -e
TOOLS=./build/tools
-$TOOLS/caffe train --solver=examples/siamese/mnist_siamese_solver.prototxt
+$TOOLS/caffe train --solver=examples/siamese/mnist_siamese_solver.prototxt $@