Merge pull request #17 from hellock/dev

minor fix for fast rcnn

configs/fast_mask_rcnn_r50_fpn_1x.py

@@ -74,7 +74,7 @@ data = dict(
         img_scale=(1333, 800),
         img_norm_cfg=img_norm_cfg,
         size_divisor=32,
-        proposal_file=data_root + 'proposals/train2017_r50_fpn_rpn_1x.pkl',
+        proposal_file=data_root + 'proposals/rpn_r50_fpn_1x_train2017.pkl',
         flip_ratio=0.5,
         with_mask=True,
         with_crowd=True,
@@ -85,7 +85,7 @@ data = dict(
         img_prefix=data_root + 'val2017/',
         img_scale=(1333, 800),
         img_norm_cfg=img_norm_cfg,
-        proposal_file=data_root + 'proposals/val2017_r50_fpn_rpn_1x.pkl',
+        proposal_file=data_root + 'proposals/rpn_r50_fpn_1x_val2017.pkl',
         size_divisor=32,
         flip_ratio=0,
         with_mask=True,
@@ -97,7 +97,7 @@ data = dict(
         img_prefix=data_root + 'val2017/',
         img_scale=(1333, 800),
         img_norm_cfg=img_norm_cfg,
-        proposal_file=data_root + 'proposals/val2017_r50_fpn_rpn_1x.pkl',
+        proposal_file=data_root + 'proposals/rpn_r50_fpn_1x_val2017.pkl',
         size_divisor=32,
         flip_ratio=0,
         with_mask=False,

configs/fast_rcnn_r50_fpn_1x.py

@@ -60,7 +60,7 @@ data = dict(
         img_scale=(1333, 800),
         img_norm_cfg=img_norm_cfg,
         size_divisor=32,
-        proposal_file=data_root + 'proposals/train2017_r50_fpn_rpn_1x.pkl',
+        proposal_file=data_root + 'proposals/rpn_r50_fpn_1x_train2017.pkl',
         flip_ratio=0.5,
         with_mask=False,
         with_crowd=True,
@@ -71,7 +71,7 @@ data = dict(
         img_prefix=data_root + 'val2017/',
         img_scale=(1333, 800),
         img_norm_cfg=img_norm_cfg,
-        proposal_file=data_root + 'proposals/val2017_r50_fpn_rpn_1x.pkl',
+        proposal_file=data_root + 'proposals/rpn_r50_fpn_1x_val2017.pkl',
         size_divisor=32,
         flip_ratio=0,
         with_mask=False,
@@ -83,7 +83,7 @@ data = dict(
         img_prefix=data_root + 'val2017/',
         img_scale=(1333, 800),
         img_norm_cfg=img_norm_cfg,
-        proposal_file=data_root + 'proposals/val2017_r50_fpn_rpn_1x.pkl',
+        proposal_file=data_root + 'proposals/rpn_r50_fpn_1x_val2017.pkl',
         size_divisor=32,
         flip_ratio=0,
         with_mask=False,

mmdet/models/detectors/two_stage.py

@@ -140,7 +140,6 @@ class TwoStageDetector(BaseDetector, RPNTestMixin, BBoxTestMixin,
 
     def simple_test(self, img, img_meta, proposals=None, rescale=False):
         """Test without augmentation."""
-        assert proposals is None, "Fast RCNN hasn't been implemented."
         assert self.with_bbox, "Bbox head must be implemented."
 
         x = self.extract_feat(img)