From 0ee5654fe188d656b55d90c2a8f128e287e54142 Mon Sep 17 00:00:00 2001
From: Kai Chen <chenkaidev@gmail.com>
Date: Thu, 11 Oct 2018 23:49:04 +0800
Subject: [PATCH] minor fix for fast rcnn
---
configs/fast_mask_rcnn_r50_fpn_1x.py | 6 +++---
configs/fast_rcnn_r50_fpn_1x.py | 6 +++---
mmdet/models/detectors/two_stage.py | 1 -
3 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/configs/fast_mask_rcnn_r50_fpn_1x.py b/configs/fast_mask_rcnn_r50_fpn_1x.py
index 4281c16..af2070f 100644
--- a/configs/fast_mask_rcnn_r50_fpn_1x.py
+++ b/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,
diff --git a/configs/fast_rcnn_r50_fpn_1x.py b/configs/fast_rcnn_r50_fpn_1x.py
index 47ec415..397ab43 100644
--- a/configs/fast_rcnn_r50_fpn_1x.py
+++ b/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,
diff --git a/mmdet/models/detectors/two_stage.py b/mmdet/models/detectors/two_stage.py
index b2f2839..48a818d 100644
--- a/mmdet/models/detectors/two_stage.py
+++ b/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)
--
GitLab