update cli usage in examples

diff --git a/examples/cifar10/train_full.sh b/examples/cifar10/train_full.sh
index 930b27a..9dd9ad7 100755 (executable)
--- a/examples/cifar10/train_full.sh
+++ b/examples/cifar10/train_full.sh
@@ -2,15 +2,14 @@
 
 TOOLS=../../build/tools
 
-GLOG_logtostderr=1 $TOOLS/caffe.bin train \
-    --solver_proto_file=cifar10_full_solver.prototxt
+$TOOLS/caffe train --solver=cifar10_full_solver.prototxt
 
-#reduce learning rate by factor of 10
-GLOG_logtostderr=1 $TOOLS/caffe.bin train \
-    --solver_proto_file=cifar10_full_solver_lr1.prototxt \
-    --resume_point_file=cifar10_full_iter_60000.solverstate
+# reduce learning rate by factor of 10
+$TOOLS/caffe train \
+    --solver=cifar10_full_solver_lr1.prototxt \
+    --snapshot=cifar10_full_iter_60000.solverstate
 
-#reduce learning rate by factor of 10
-GLOG_logtostderr=1 $TOOLS/caffe.bin train \
-    --solver_proto_file=cifar10_full_solver_lr2.prototxt \
-    --resume_point_file=cifar10_full_iter_65000.solverstate
+# reduce learning rate by factor of 10
+$TOOLS/caffe train \
+    --solver=cifar10_full_solver_lr2.prototxt \
+    --snapshot=cifar10_full_iter_65000.solverstate

diff --git a/examples/cifar10/train_quick.sh b/examples/cifar10/train_quick.sh
index 5e8fffc..e348e12 100755 (executable)
--- a/examples/cifar10/train_quick.sh
+++ b/examples/cifar10/train_quick.sh
@@ -2,10 +2,9 @@
 
 TOOLS=../../build/tools
 
-GLOG_logtostderr=1 $TOOLS/caffe.bin train \
-  --solver_proto_file=cifar10_quick_solver.prototxt
+$TOOLS/caffe.bin train --solver=cifar10_quick_solver.prototxt
 
-#reduce learning rate by fctor of 10 after 8 epochs
-GLOG_logtostderr=1 $TOOLS/caffe.bin train \
-  --solver_proto_file=cifar10_quick_solver_lr1.prototxt \
-  --resume_point_file=cifar10_quick_iter_4000.solverstate
+# reduce learning rate by fctor of 10 after 8 epochs
+$TOOLS/caffe.bin train \
+  --solver=cifar10_quick_solver_lr1.prototxt \
+  --snapshot=cifar10_quick_iter_4000.solverstate

diff --git a/examples/imagenet/resume_training.sh b/examples/imagenet/resume_training.sh
index b43a9b1..9e00d93 100755 (executable)
--- a/examples/imagenet/resume_training.sh
+++ b/examples/imagenet/resume_training.sh
@@ -2,8 +2,8 @@
 
 TOOLS=../../build/tools
 
-GLOG_logtostderr=1 $TOOLS/caffe.bin train\
-    --solver_proto_file=imagenet_solver.prototxt \
-    --resume_point_file=caffe_imagenet_train_10000.solverstate
+$TOOLS/caffe train\
+    --solver=imagenet_solver.prototxt \
+    --snapshot=caffe_imagenet_train_10000.solverstate
 
 echo "Done."

diff --git a/examples/imagenet/speedtest_imagenet.sh b/examples/imagenet/time_imagenet.sh
similarity index 73%
rename from examples/imagenet/speedtest_imagenet.sh
rename to examples/imagenet/time_imagenet.sh
index c790d83..c83b0c0 100755 (executable)
--- a/examples/imagenet/speedtest_imagenet.sh
+++ b/examples/imagenet/time_imagenet.sh
@@ -14,9 +14,9 @@ else
   DEVICE_ID=$1
 fi
 
-GLOG_logtostderr=1 $TOOLS/caffe.bin speedtest \
-  --net_proto_file=imagenet_train_val.prototxt \
-  --speedtest_with_gpu=${WITH_GPU} \
+$TOOLS/caffe time \
+  --model=imagenet_train_val.prototxt \
+  --gpu=${WITH_GPU} \
   --device_id=${DEVICE_ID}
 
 echo "Done."

diff --git a/examples/imagenet/train_alexnet.sh b/examples/imagenet/train_alexnet.sh
index d43a235..6a7c057 100755 (executable)
--- a/examples/imagenet/train_alexnet.sh
+++ b/examples/imagenet/train_alexnet.sh
@@ -2,7 +2,6 @@
 
 TOOLS=../../build/tools
 
-GLOG_logtostderr=1 $TOOLS/caffe.bin train \
-  --solver_proto_file=alexnet_solver.prototxt
+$TOOLS/caffe train --solver=alexnet_solver.prototxt
 
 echo "Done."

diff --git a/examples/imagenet/train_imagenet.sh b/examples/imagenet/train_imagenet.sh
index 90dcdfa..008b96c 100755 (executable)
--- a/examples/imagenet/train_imagenet.sh
+++ b/examples/imagenet/train_imagenet.sh
@@ -2,7 +2,6 @@
 
 TOOLS=../../build/tools
 
-GLOG_logtostderr=1 $TOOLS/caffe.bin train \
-  --solver_proto_file=imagenet_solver.prototxt
+$TOOLS/caffe train --solver=imagenet_solver.prototxt
 
 echo "Done."

diff --git a/examples/mnist/train_lenet.sh b/examples/mnist/train_lenet.sh
index 4d0f1ee..b93e48f 100755 (executable)
--- a/examples/mnist/train_lenet.sh
+++ b/examples/mnist/train_lenet.sh
@@ -2,5 +2,4 @@
 
 TOOLS=../../build/tools
 
-GLOG_logtostderr=1 $TOOLS/caffe.bin train \
-  --solver_proto_file=lenet_solver.prototxt
+$TOOLS/caffe train --solver=lenet_solver.prototxt

diff --git a/examples/mnist/train_lenet_consolidated.sh b/examples/mnist/train_lenet_consolidated.sh
index 802c801..83fe895 100755 (executable)
--- a/examples/mnist/train_lenet_consolidated.sh
+++ b/examples/mnist/train_lenet_consolidated.sh
@@ -2,5 +2,4 @@
 
 TOOLS=../../build/tools
 
-GLOG_logtostderr=1 $TOOLS/caffe.bin train \
-  --solver_proto_file=lenet_consolidated_solver.prototxt
+$TOOLS/caffe train --solver=lenet_consolidated_solver.prototxt

diff --git a/examples/mnist/train_mnist_autoencoder.sh b/examples/mnist/train_mnist_autoencoder.sh
index 3fb4935..628c74b 100755 (executable)
--- a/examples/mnist/train_mnist_autoencoder.sh
+++ b/examples/mnist/train_mnist_autoencoder.sh
@@ -1,5 +1,4 @@
 #!/bin/bash
 TOOLS=../../build/tools
 
-GLOG_logtostderr=1 $TOOLS/caffe.bin train \
-  --solver_proto_file=mnist_autoencoder_solver.prototxt
+$TOOLS/caffe.bin train --solver=mnist_autoencoder_solver.prototxt