fix conflict

tanshen · Jun 16, 2016 · 9bf8971 · 9bf8971
2 parents 9ce408a + f31f05a
commit 9bf8971
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/fast-rcnn/experiments/cfgs/pascal_rpn_cls_vgg16.yml b/fast-rcnn/experiments/cfgs/pascal_rpn_cls_vgg16.yml
@@ -7,15 +7,15 @@ TRAIN:
   NUM_PER_OCTAVE: 19
   ASPECTS: !!python/tuple [3.0, 2.0, 1.5, 1.0, 0.75, 0.5, 0.25, 0.125]
   IMS_PER_BATCH: 1
-  BATCH_SIZE: 128
+  BATCH_SIZE: 64
   FG_FRACTION: 0.5
   FG_THRESH: !!python/tuple [0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7]
   BG_THRESH_HI: !!python/tuple [0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7]
   BG_THRESH_LO: !!python/tuple [0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0]
   BBOX_THRESH: !!python/tuple [0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7]
   SNAPSHOT_INFIX: pascal2007
   BBOX_REG: True
-  SNAPSHOT_ITERS: 10000
+  SNAPSHOT_ITERS: 5000
 TEST:
   SCALES_BASE: !!python/tuple [0.25, 2.0]
   NUM_PER_OCTAVE: 19

diff --git a/fast-rcnn/experiments/scripts/pascal2007_vgg16_rpn_cls.sh b/fast-rcnn/experiments/scripts/pascal2007_vgg16_rpn_cls.sh
@@ -9,16 +9,16 @@ LOG="experiments/logs/pascal2007_vgg16_rpn_cls.txt.`date +'%Y-%m-%d_%H-%M-%S'`"
 exec &> >(tee -a "$LOG")
 echo Logging output to "$LOG"
 
-#time ./tools/train_net.py --gpu $1 \
-#  --solver models/VGG16/pascal2007/solver_rpn_cls.prototxt \
-#  --weights data/imagenet_models/VGG16.v2.caffemodel \
-#  --imdb voc_2007_trainval \
-#  --cfg experiments/cfgs/pascal_rpn_cls_vgg16.yml \
-#  --iters 40000
+time ./tools/train_net.py --gpu $1 \
+  --solver models/VGG16/pascal2007/solver_rpn_cls.prototxt \
+  --weights data/imagenet_models/VGG16.v2.caffemodel \
+  --imdb voc_2007_trainval \
+  --cfg experiments/cfgs/pascal_rpn_cls_vgg16.yml \
+  --iters 40000
 
 time ./tools/test_net.py --gpu $1 \
   --def models/VGG16/pascal2007/test_rpn_cls.prototxt \
-  --net output/pascal2007/voc_2007_trainval/vgg16_fast_rcnn_rpn_cls_pascal2007_iter_5000.caffemodel \
+  --net output/pascal2007/voc_2007_trainval/vgg16_fast_rcnn_rpn_cls_pascal2007_iter_40000.caffemodel \
   --imdb voc_2007_test \
   --cfg experiments/cfgs/pascal_rpn_cls_vgg16.yml
 

diff --git a/fast-rcnn/models/VGG16/pascal2007/train_rpn_cls.prototxt b/fast-rcnn/models/VGG16/pascal2007/train_rpn_cls.prototxt
@@ -412,7 +412,7 @@ layer {
     pad: 2
     weight_filler {
       type: "gaussian"
-      std: 0.0001
+      std: 0.001
     }
     bias_filler {
       type: "constant"
@@ -447,7 +447,7 @@ layer {
   top: 'labels'
   roi_generating_param {
     flag_proposal_only: 0
-    batch_size: 128
+    batch_size: 64
     num_classes: 21
     fg_fraction: 0.5
     spatial_scale: 0.0625 # 1/16
@@ -496,7 +496,7 @@ layer {
     kernel_size: 5
     weight_filler {
       type: "gaussian"
-      std: 0.0001
+      std: 0.001
     }
     bias_filler {
       type: "constant"