Merge pull request BVLC#1126 from shelhamer/window-data-param-upgrade

[fix] include WindowDataLayer in data param upgrade
egalev · Sep 21, 2014 · e5cc609 · e5cc609
2 parents e7486b8 + 28800ef
commit e5cc609
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 338 deletions.
diff --git a/examples/finetune_pascal_detection/pascal_finetune_solver.prototxt b/examples/finetune_pascal_detection/pascal_finetune_solver.prototxt
@@ -1,5 +1,4 @@
-train_net: "examples/finetune_pascal_detection/pascal_finetune_train.prototxt"
-test_net: "examples/finetune_pascal_detection/pascal_finetune_val.prototxt"
+net: "examples/finetune_pascal_detection/pascal_finetune_trainval_test.prototxt"
 test_iter: 100
 test_interval: 1000
 base_lr: 0.001

diff --git a/examples/finetune_pascal_detection/pascal_finetune_train.prototxt b/examples/finetune_pascal_detection/pascal_finetune_train.prototxt
diff --git a/...al_detection/pascal_finetune_val.prototxt → ...on/pascal_finetune_trainval_test.prototxt b/...al_detection/pascal_finetune_val.prototxt → ...on/pascal_finetune_trainval_test.prototxt
@@ -5,17 +5,41 @@ layers {
   top: "data"
   top: "label"
   window_data_param {
-    source: "examples/finetune_pascal_detection/window_file_2007_test.txt"
-    mean_file: "data/ilsvrc12/imagenet_mean.binaryproto"
+    source: "examples/finetune_pascal_detection/window_file_2007_trainval.txt"
     batch_size: 128
-    crop_size: 227
+    fg_threshold: 0.5
+    bg_threshold: 0.5
+    fg_fraction: 0.25
+    context_pad: 16
+    crop_mode: "warp"
+  }
+  transform_param {
     mirror: true
+    crop_size: 227
+    mean_file: "data/ilsvrc12/imagenet_mean.binaryproto"
+  }
+  include: { phase: TRAIN }
+}
+layers {
+  name: "data"
+  type: WINDOW_DATA
+  top: "data"
+  top: "label"
+  window_data_param {
+    source: "examples/finetune_pascal_detection/window_file_2007_test.txt"
+    batch_size: 128
     fg_threshold: 0.5
     bg_threshold: 0.5
     fg_fraction: 0.25
     context_pad: 16
     crop_mode: "warp"
   }
+  transform_param {
+    mirror: true
+    crop_size: 227
+    mean_file: "data/ilsvrc12/imagenet_mean.binaryproto"
+  }
+  include: { phase: TEST }
 }
 layers {
   name: "conv1"
@@ -314,17 +338,16 @@ layers {
   }
 }
 layers {
-  name: "accuracy"
-  type: ACCURACY
+  name: "loss"
+  type: SOFTMAX_LOSS
   bottom: "fc8_pascal"
   bottom: "label"
-  top: "accuracy"
 }
 layers {
-  name: "prob"
-  type: SOFTMAX_LOSS
+  name: "accuracy"
+  type: ACCURACY
   bottom: "fc8_pascal"
   bottom: "label"
-  top: "loss"
+  top: "accuracy"
+  include { phase: TEST }
 }
-