Merge pull request #2 from ibmsoe/examples_correction

npanpaliya · web-flow · commit 2fddb92cc918 · 2016-06-10T16:33:08.000+05:30
Examples correction
diff --git a/examples/cifar10/create_cifar10.sh b/examples/cifar10/create_cifar10.sh
@@ -5,15 +5,26 @@ EXAMPLE=examples/cifar10
 DATA=data/cifar10
 DBTYPE=lmdb
 
+# Check if CAFFE_BIN is set
+if [ -z ${CAFFE_BIN+x} ]; 
+# if unset
+then
+  EXAMPLES=./build/$EXAMPLE
+  TOOLS=./build/tools
+else
+  EXAMPLES=$CAFFE_BIN
+  TOOLS=$CAFFE_BIN
+fi  
+
 echo "Creating $DBTYPE..."
 
 rm -rf $EXAMPLE/cifar10_train_$DBTYPE $EXAMPLE/cifar10_test_$DBTYPE
 
-./build/examples/cifar10/convert_cifar_data.bin $DATA $EXAMPLE $DBTYPE
+$EXAMPLES/convert_cifar_data.bin $DATA $EXAMPLE $DBTYPE
 
 echo "Computing image mean..."
 
-./build/tools/compute_image_mean -backend=$DBTYPE \
+$TOOLS/compute_image_mean -backend=$DBTYPE \
   $EXAMPLE/cifar10_train_$DBTYPE $EXAMPLE/mean.binaryproto
 
 echo "Done."
diff --git a/examples/cifar10/train_full.sh b/examples/cifar10/train_full.sh
@@ -1,6 +1,10 @@
 #!/usr/bin/env sh
 
+# Check if TOOLS is unset
+if [ -z ${TOOLS+x} ];
+then
 TOOLS=./build/tools
+fi
 
 $TOOLS/caffe train \
     --solver=examples/cifar10/cifar10_full_solver.prototxt
diff --git a/examples/cifar10/train_full_sigmoid.sh b/examples/cifar10/train_full_sigmoid.sh
@@ -1,6 +1,10 @@
 #!/usr/bin/env sh
 
+# Check if TOOLS is unset
+if [ -z ${TOOLS+x} ];
+then
 TOOLS=./build/tools
+fi
 
 $TOOLS/caffe train \
     --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
@@ -1,6 +1,10 @@
 #!/usr/bin/env sh
 
+# Check if TOOLS is unset
+if [ -z ${TOOLS+x} ];
+then
 TOOLS=./build/tools
+fi
 
 $TOOLS/caffe train \
     --solver=examples/cifar10/cifar10_full_sigmoid_solver_bn.prototxt
diff --git a/examples/cifar10/train_quick.sh b/examples/cifar10/train_quick.sh
@@ -1,6 +1,10 @@
 #!/usr/bin/env sh
 
+# Check if TOOLS is unset
+if [ -z ${TOOLS+x} ];
+then
 TOOLS=./build/tools
+fi
 
 $TOOLS/caffe train \
   --solver=examples/cifar10/cifar10_quick_solver.prototxt
diff --git a/examples/imagenet/create_imagenet.sh b/examples/imagenet/create_imagenet.sh
@@ -4,7 +4,12 @@
 
 EXAMPLE=examples/imagenet
 DATA=data/ilsvrc12
-TOOLS=build/tools
+
+# Check if TOOLS is unset
+if [ -z ${TOOLS+x} ];
+then
+TOOLS=./build/tools
+fi
 
 TRAIN_DATA_ROOT=/path/to/imagenet/train/
 VAL_DATA_ROOT=/path/to/imagenet/val/
@@ -36,6 +41,7 @@ fi
 
 echo "Creating train lmdb..."
 
+rm -rf $EXAMPLE/ilsvrc12_train_lmdb
 GLOG_logtostderr=1 $TOOLS/convert_imageset \
     --resize_height=$RESIZE_HEIGHT \
     --resize_width=$RESIZE_WIDTH \
@@ -46,6 +52,7 @@ GLOG_logtostderr=1 $TOOLS/convert_imageset \
 
 echo "Creating val lmdb..."
 
+rm -rf $EXAMPLE/ilsvrc12_val_lmdb
 GLOG_logtostderr=1 $TOOLS/convert_imageset \
     --resize_height=$RESIZE_HEIGHT \
     --resize_width=$RESIZE_WIDTH \
diff --git a/examples/imagenet/make_imagenet_mean.sh b/examples/imagenet/make_imagenet_mean.sh
@@ -4,7 +4,13 @@
 
 EXAMPLE=examples/imagenet
 DATA=data/ilsvrc12
-TOOLS=build/tools
+
+# Check if TOOLS is unset
+if [ -z ${TOOLS+x} ];
+then
+TOOLS=./build/tools
+fi
+
 
 $TOOLS/compute_image_mean $EXAMPLE/ilsvrc12_train_lmdb \
   $DATA/imagenet_mean.binaryproto
diff --git a/examples/imagenet/resume_training.sh b/examples/imagenet/resume_training.sh
@@ -1,5 +1,11 @@
 #!/usr/bin/env sh
 
-./build/tools/caffe train \
+# Check if TOOLS is unset
+if [ -z ${TOOLS+x} ];
+then
+TOOLS=./build/tools
+fi
+
+$TOOLS/caffe train \
     --solver=models/bvlc_reference_caffenet/solver.prototxt \
     --snapshot=models/bvlc_reference_caffenet/caffenet_train_10000.solverstate.h5
diff --git a/examples/imagenet/train_caffenet.sh b/examples/imagenet/train_caffenet.sh
@@ -1,4 +1,10 @@
 #!/usr/bin/env sh
 
-./build/tools/caffe train \
+# Check if TOOLS is unset
+if [ -z ${TOOLS+x} ];
+then
+TOOLS=./build/tools
+fi
+
+$TOOLS/caffe train \
     --solver=models/bvlc_reference_caffenet/solver.prototxt
diff --git a/examples/mnist/create_mnist.sh b/examples/mnist/create_mnist.sh
@@ -4,7 +4,15 @@
 
 EXAMPLE=examples/mnist
 DATA=data/mnist
-BUILD=build/examples/mnist
+
+# Check if CAFFE_BIN is set
+if [ -z ${CAFFE_BIN+x} ];
+# if unset
+then
+  BUILD=build/examples/mnist
+else
+  BUILD=$CAFFE_BIN
+fi
 
 BACKEND="lmdb"
 
diff --git a/examples/mnist/train_lenet.sh b/examples/mnist/train_lenet.sh
@@ -1,3 +1,10 @@
 #!/usr/bin/env sh
 
-./build/tools/caffe train --solver=examples/mnist/lenet_solver.prototxt
+# Check if TOOLS is set
+if [ -z ${TOOLS+x} ];
+# if unset
+then
+  TOOLS=./build/tools
+fi
+
+$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
@@ -1,3 +1,10 @@
 #!/usr/bin/env sh
 
-./build/tools/caffe train --solver=examples/mnist/lenet_solver_adam.prototxt
+# Check if TOOLS is set
+if [ -z ${TOOLS+x} ];
+# if unset
+then
+  TOOLS=./build/tools
+fi
+
+$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
@@ -1,4 +1,11 @@
 #!/usr/bin/env sh
 
-./build/tools/caffe train \
+# Check if TOOLS is set
+if [ -z ${TOOLS+x} ];
+# if unset
+then
+  TOOLS=./build/tools
+fi
+
+$TOOLS/caffe train \
   --solver=examples/mnist/lenet_consolidated_solver.prototxt
diff --git a/examples/mnist/train_lenet_rmsprop.sh b/examples/mnist/train_lenet_rmsprop.sh
@@ -1,3 +1,10 @@
 #!/usr/bin/env sh
 
-./build/tools/caffe train --solver=examples/mnist/lenet_solver_rmsprop.prototxt
+# Check if TOOLS is set
+if [ -z ${TOOLS+x} ];
+# if unset
+then
+  TOOLS=./build/tools
+fi
+
+$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
@@ -1,4 +1,11 @@
 #!/usr/bin/env sh
 
-./build/tools/caffe train \
+# Check if TOOLS is set
+if [ -z ${TOOLS+x} ];
+# if unset
+then
+  TOOLS=./build/tools
+fi
+
+$TOOLS/caffe train \
   --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
@@ -1,4 +1,11 @@
 #!/bin/bash
 
-./build/tools/caffe train \
+# Check if TOOLS is set
+if [ -z ${TOOLS+x} ];
+# if unset
+then
+  TOOLS=./build/tools
+fi
+
+$TOOLS/caffe train \
   --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
@@ -1,4 +1,11 @@
 #!/bin/bash
 
-./build/tools/caffe train \
+# Check if TOOLS is set
+if [ -z ${TOOLS+x} ];
+# if unset
+then
+  TOOLS=./build/tools
+fi
+
+$TOOLS/caffe train \
   --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
@@ -1,4 +1,11 @@
 #!/bin/bash
 
-./build/tools/caffe train \
+# Check if TOOLS is set
+if [ -z ${TOOLS+x} ];
+# if unset
+then
+  TOOLS=./build/tools
+fi
+
+$TOOLS/caffe train \
   --solver=examples/mnist/mnist_autoencoder_solver_nesterov.prototxt
diff --git a/examples/siamese/create_mnist_siamese.sh b/examples/siamese/create_mnist_siamese.sh
@@ -1,9 +1,17 @@
 #!/usr/bin/env sh
 # This script converts the mnist data into leveldb format.
 
-EXAMPLES=./build/examples/siamese
 DATA=./data/mnist
 
+# Check if CAFFE_BIN is set
+if [ -z ${CAFFE_BIN+x} ];
+# if unset
+then
+  EXAMPLES=./build/examples/siamese
+else
+  EXAMPLES=$CAFFE_BIN
+fi
+
 echo "Creating leveldb..."
 
 rm -rf ./examples/siamese/mnist_siamese_train_leveldb
diff --git a/examples/siamese/train_mnist_siamese.sh b/examples/siamese/train_mnist_siamese.sh
@@ -1,5 +1,10 @@
 #!/usr/bin/env sh
 
-TOOLS=./build/tools
+# Check if TOOLS is set
+if [ -z ${TOOLS+x} ];
+# if unset
+then
+  TOOLS=./build/tools  
+fi
 
 $TOOLS/caffe train --solver=examples/siamese/mnist_siamese_solver.prototxt
