[example] revise hdf5 classification

shelhamer · shelhamer · commit 124f6ef1a518 · 2015-03-08T00:24:26.000-08:00
- add a little explanation
- solve from Python and the command line
- time scikit-learn and caffe
- fix test iterations (number of instances / batch size)
diff --git a/examples/hdf5_classification.ipynb b/examples/hdf5_classification.ipynb
diff --git a/examples/hdf5_classification/solver.prototxt b/examples/hdf5_classification/solver.prototxt
@@ -1,5 +1,5 @@
-net: "examples/hdf5_classification/train_val.prototxt"
-test_iter: 1000
+net: "hdf5_classification/train_val.prototxt"
+test_iter: 250
 test_interval: 1000
 base_lr: 0.01
 lr_policy: "step"
@@ -10,5 +10,5 @@ max_iter: 10000
 momentum: 0.9
 weight_decay: 0.0005
 snapshot: 10000
-snapshot_prefix: "examples/hdf5_classification/data/train"
+snapshot_prefix: "hdf5_classification/data/train"
 solver_mode: CPU
diff --git a/examples/hdf5_classification/solver2.prototxt b/examples/hdf5_classification/solver2.prototxt
@@ -1,5 +1,5 @@
-net: "examples/hdf5_classification/train_val2.prototxt"
-test_iter: 1000
+net: "hdf5_classification/train_val2.prototxt"
+test_iter: 250
 test_interval: 1000
 base_lr: 0.01
 lr_policy: "step"
@@ -10,5 +10,5 @@ max_iter: 10000
 momentum: 0.9
 weight_decay: 0.0005
 snapshot: 10000
-snapshot_prefix: "examples/hdf5_classification/data/train"
+snapshot_prefix: "hdf5_classification/data/train"
 solver_mode: CPU
diff --git a/examples/hdf5_classification/train_val.prototxt b/examples/hdf5_classification/train_val.prototxt
@@ -8,7 +8,7 @@ layer {
     phase: TRAIN
   }
   hdf5_data_param {
-    source: "examples/hdf5_classification/data/train.txt"
+    source: "hdf5_classification/data/train.txt"
     batch_size: 10
   }
 }
@@ -21,7 +21,7 @@ layer {
     phase: TEST
   }
   hdf5_data_param {
-    source: "examples/hdf5_classification/data/test.txt"
+    source: "hdf5_classification/data/test.txt"
     batch_size: 10
   }
 }
diff --git a/examples/hdf5_classification/train_val2.prototxt b/examples/hdf5_classification/train_val2.prototxt
@@ -8,7 +8,7 @@ layer {
     phase: TRAIN
   }
   hdf5_data_param {
-    source: "examples/hdf5_classification/data/train.txt"
+    source: "hdf5_classification/data/train.txt"
     batch_size: 10
   }
 }
@@ -21,7 +21,7 @@ layer {
     phase: TEST
   }
   hdf5_data_param {
-    source: "examples/hdf5_classification/data/test.txt"
+    source: "hdf5_classification/data/test.txt"
     batch_size: 10
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ layer {`
`8`	`8`	`phase: TRAIN`
`9`	`9`	`}`
`10`	`10`	`hdf5_data_param {`
`11`		`- source: "examples/hdf5_classification/data/train.txt"`
	`11`	`+ source: "hdf5_classification/data/train.txt"`
`12`	`12`	`batch_size: 10`
`13`	`13`	`}`
`14`	`14`	`}`
`@@ -21,7 +21,7 @@ layer {`
`21`	`21`	`phase: TEST`
`22`	`22`	`}`
`23`	`23`	`hdf5_data_param {`
`24`		`- source: "examples/hdf5_classification/data/test.txt"`
	`24`	`+ source: "hdf5_classification/data/test.txt"`
`25`	`25`	`batch_size: 10`
`26`	`26`	`}`
`27`	`27`	`}`