summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorYangqing Jia <jiayq84@gmail.com>2013-12-02 23:44:43 (GMT)
committerYangqing Jia <jiayq84@gmail.com>2013-12-02 23:44:43 (GMT)
commitca3e042863e59e9a8a8edd7e78ffe9b2431aea8f (patch)
tree6a4e4bccd3751d8169a006f226e485a57446f35f /data
parent524e0956ef58d0f1fac0bf302de341c9eff882e0 (diff)
downloadcaffeonacl-ca3e042863e59e9a8a8edd7e78ffe9b2431aea8f.zip
caffeonacl-ca3e042863e59e9a8a8edd7e78ffe9b2431aea8f.tar.gz
caffeonacl-ca3e042863e59e9a8a8edd7e78ffe9b2431aea8f.tar.bz2
Several changes:
changed the paths for the mnist demo removed unused fields in SolverParameter added solver_mode to specify CPU/GPU solving accordingly, removed the set mode code in the examples code removed examples/test_read_imagenet since it is trivial removed get_cifar script since no cifar demo exists.
Diffstat (limited to 'data')
-rwxr-xr-xdata/get_cifar.sh12
-rw-r--r--data/lenet.prototxt2
-rw-r--r--data/lenet_solver.prototxt29
-rw-r--r--data/lenet_test.prototxt2
4 files changed, 24 insertions, 21 deletions
diff --git a/data/get_cifar.sh b/data/get_cifar.sh
deleted file mode 100755
index 6f42bb0..0000000
--- a/data/get_cifar.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env sh
-# This scripts downloads the mnist data and unzips it.
-
-echo "Downloading..."
-
-wget -q http://www.cs.toronto.edu/~kriz/cifar-10-binary.tar.gz
-
-echo "Unzipping..."
-
-tar xzf cifar-10-binary.tar.gz
-
-echo "Done."
diff --git a/data/lenet.prototxt b/data/lenet.prototxt
index 085ed43..c8a9994 100644
--- a/data/lenet.prototxt
+++ b/data/lenet.prototxt
@@ -3,7 +3,7 @@ layers {
layer {
name: "mnist"
type: "data"
- source: "data/mnist-train-leveldb"
+ source: "mnist-train-leveldb"
batchsize: 64
scale: 0.00390625
}
diff --git a/data/lenet_solver.prototxt b/data/lenet_solver.prototxt
index d58255b..d0edc0f 100644
--- a/data/lenet_solver.prototxt
+++ b/data/lenet_solver.prototxt
@@ -1,12 +1,27 @@
-train_net: "data/lenet.prototxt"
-test_net: "data/lenet_test.prototxt"
+# The training protocol buffer definition
+train_net: "lenet.prototxt"
+# The testing protocol buffer definition
+test_net: "lenet_test.prototxt"
+# test_iter specifies how many forward passes the test should carry out.
+# In the case of MNIST, we have test batch size 100 and 100 test iterations,
+# covering the full 10,000 testing images.
+test_iter: 100
+# Carry out testing every 500 training iterations.
+test_interval: 500
+# The base learning rate, momentum and the weight decay of the network.
base_lr: 0.01
+momentum: 0.9
+weight_decay: 0.0005
+# The learning rate policy
lr_policy: "inv"
gamma: 0.0001
power: 0.75
+# Display every 100 iterations
display: 100
-max_iter: 5000
-momentum: 0.9
-weight_decay: 0.0005
-test_iter: 100
-test_interval: 500 \ No newline at end of file
+# The maximum number of iterations
+max_iter: 10000
+# snapshot intermediate results
+snapshot: 5000
+snapshot_prefix: "lenet"
+# solver mode: 0 for CPU and 1 for GPU
+solver_mode: 1
diff --git a/data/lenet_test.prototxt b/data/lenet_test.prototxt
index fdda4a6..676a2a6 100644
--- a/data/lenet_test.prototxt
+++ b/data/lenet_test.prototxt
@@ -3,7 +3,7 @@ layers {
layer {
name: "mnist"
type: "data"
- source: "data/mnist-test-leveldb"
+ source: "mnist-test-leveldb"
batchsize: 100
scale: 0.00390625
}