Merge pull request #734 from jeffdonahue/all-in-one-net

All-in-one nets

examples/cifar10/cifar10_full_solver.prototxt

@@ -1,10 +1,8 @@
 # reduce learning rate after 120 epochs (60000 iters) by factor 0f 10
 # then another factor of 10 after 10 more epochs (5000 iters)
 
-# The training protocol buffer definition
-train_net: "cifar10_full_train.prototxt"
-# The testing protocol buffer definition
-test_net: "cifar10_full_test.prototxt"
+# The train/test net protocol buffer definition
+net: "cifar10_full_train_test.prototxt"
 # test_iter specifies how many forward passes the test should carry out.
 # In the case of CIFAR10, we have test batch size 100 and 100 test iterations,
 # covering the full 10,000 testing images.

examples/cifar10/cifar10_full_solver_lr1.prototxt

@@ -1,10 +1,8 @@
 # reduce learning rate after 120 epochs (60000 iters) by factor 0f 10
 # then another factor of 10 after 10 more epochs (5000 iters)
 
-# The training protocol buffer definition
-train_net: "cifar10_full_train.prototxt"
-# The testing protocol buffer definition
-test_net: "cifar10_full_test.prototxt"
+# The train/test net protocol buffer definition
+net: "cifar10_full_train_test.prototxt"
 # test_iter specifies how many forward passes the test should carry out.
 # In the case of CIFAR10, we have test batch size 100 and 100 test iterations,
 # covering the full 10,000 testing images.

examples/cifar10/cifar10_full_solver_lr2.prototxt

@@ -1,10 +1,8 @@
 # reduce learning rate after 120 epochs (60000 iters) by factor 0f 10
 # then another factor of 10 after 10 more epochs (5000 iters)
 
-# The training protocol buffer definition
-train_net: "cifar10_full_train.prototxt"
-# The testing protocol buffer definition
-test_net: "cifar10_full_test.prototxt"
+# The train/test net protocol buffer definition
+net: "cifar10_full_train_test.prototxt"
 # test_iter specifies how many forward passes the test should carry out.
 # In the case of CIFAR10, we have test batch size 100 and 100 test iterations,
 # covering the full 10,000 testing images.

examples/cifar10/cifar10_full_test.prototxt → examples/cifar10/cifar10_full_train_test.prototxt

@@ -1,4 +1,16 @@
-name: "CIFAR10_full_test"
+name: "CIFAR10_full"
+layers {
+  name: "cifar"
+  type: DATA
+  top: "data"
+  top: "label"
+  data_param {
+    source: "cifar10-leveldb/cifar-train-leveldb"
+    mean_file: "mean.binaryproto"
+    batch_size: 100
+  }
+  include: { phase: TRAIN }
+}
 layers {
   name: "cifar"
   type: DATA
@@ -9,6 +21,7 @@ layers {
     mean_file: "mean.binaryproto"
     batch_size: 100
   }
+  include: { phase: TEST }
 }
 layers {
   name: "conv1"
@@ -172,6 +185,7 @@ layers {
   bottom: "ip1"
   bottom: "label"
   top: "accuracy"
+  include: { phase: TEST }
 }
 layers {
   name: "loss"

examples/cifar10/cifar10_quick_solver.prototxt

@@ -1,9 +1,7 @@
 # reduce the learning rate after 8 epochs (4000 iters) by a factor of 10
 
-# The training protocol buffer definition
-train_net: "cifar10_quick_train.prototxt"
-# The testing protocol buffer definition
-test_net: "cifar10_quick_test.prototxt"
+# The train/test net protocol buffer definition
+net: "cifar10_quick_train_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.

examples/cifar10/cifar10_quick_solver_lr1.prototxt

@@ -1,9 +1,7 @@
 # reduce the learning rate after 8 epochs (4000 iters) by a factor of 10
 
-# The training protocol buffer definition
-train_net: "cifar10_quick_train.prototxt"
-# The testing protocol buffer definition
-test_net: "cifar10_quick_test.prototxt"
+# The train/test net protocol buffer definition
+net: "cifar10_quick_train_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.