Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use different configs for proposal train/test #587

Merged
merged 6 commits into from
May 9, 2019
Merged

Use different configs for proposal train/test #587

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c6fa789
use different configs for proposal train/test
hellock May 6, 2019
ca68686
update configs for dcn
hellock May 8, 2019
2081c1d
update inf speed
yhcao6 May 8, 2019
a151508
update inf speed in dcn, gn, htc
yhcao6 May 8, 2019
a010375
update comparision
yhcao6 May 9, 2019
5f2960f
keep backward compatibility
hellock May 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
keep backward compatibility
  • Loading branch information
@hellock
hellock committed May 9, 2019
commit 5f2960fb8203047a6e27b1e4c0865becc070f388
5 changes: 3 additions & 2 deletions mmdet/models/detectors/cascade_rcnn.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,9 @@ def forward_train(self,
*rpn_loss_inputs, gt_bboxes_ignore=gt_bboxes_ignore)
losses.update(rpn_losses)

proposal_inputs = rpn_outs + (img_meta,
self.train_cfg.rpn_proposal)
proposal_cfg = self.train_cfg.get('rpn_proposal',
self.test_cfg.rpn)
proposal_inputs = rpn_outs + (img_meta, proposal_cfg)
proposal_list = self.rpn_head.get_bboxes(*proposal_inputs)
else:
proposal_list = proposals
Expand Down
5 changes: 3 additions & 2 deletions mmdet/models/detectors/htc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,8 +175,9 @@ def forward_train(self,
*rpn_loss_inputs, gt_bboxes_ignore=gt_bboxes_ignore)
losses.update(rpn_losses)

proposal_inputs = rpn_outs + (img_meta,
self.train_cfg.rpn_proposal)
proposal_cfg = self.train_cfg.get('rpn_proposal',
self.test_cfg.rpn)
proposal_inputs = rpn_outs + (img_meta, proposal_cfg)
proposal_list = self.rpn_head.get_bboxes(*proposal_inputs)
else:
proposal_list = proposals
Expand Down
5 changes: 3 additions & 2 deletions mmdet/models/detectors/two_stage.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,9 @@ def forward_train(self,
*rpn_loss_inputs, gt_bboxes_ignore=gt_bboxes_ignore)
losses.update(rpn_losses)

proposal_inputs = rpn_outs + (img_meta,
self.train_cfg.rpn_proposal)
proposal_cfg = self.train_cfg.get('rpn_proposal',
self.test_cfg.rpn)
proposal_inputs = rpn_outs + (img_meta, proposal_cfg)
proposal_list = self.rpn_head.get_bboxes(*proposal_inputs)
else:
proposal_list = proposals
Expand Down