Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,12 @@ which is heavily depended on by this toolbox.

This project is released under the [GPLv3 license](LICENSE).

## Updates

v0.5.1 (20/10/2018)
- Add BBoxAssigner and BBoxSampler, the `train_cfg` field in config files are restructured.
- `ConvFCRoIHead` / `SharedFCRoIHead` are renamed to `ConvFCBBoxHead` / `SharedFCBBoxHead` for consistency.

## Benchmark and model zoo

We provide our baseline results and the comparision with Detectron, the most
Expand Down
2 changes: 1 addition & 1 deletion configs/fast_mask_rcnn_r50_fpn_1x.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
out_channels=256,
featmap_strides=[4, 8, 16, 32]),
bbox_head=dict(
type='SharedFCRoIHead',
type='SharedFCBBoxHead',
num_fcs=2,
in_channels=256,
fc_out_channels=1024,
Expand Down
2 changes: 1 addition & 1 deletion configs/fast_rcnn_r50_fpn_1x.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
out_channels=256,
featmap_strides=[4, 8, 16, 32]),
bbox_head=dict(
type='SharedFCRoIHead',
type='SharedFCBBoxHead',
num_fcs=2,
in_channels=256,
fc_out_channels=1024,
Expand Down
2 changes: 1 addition & 1 deletion configs/faster_rcnn_r50_fpn_1x.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
out_channels=256,
featmap_strides=[4, 8, 16, 32]),
bbox_head=dict(
type='SharedFCRoIHead',
type='SharedFCBBoxHead',
num_fcs=2,
in_channels=256,
fc_out_channels=1024,
Expand Down
2 changes: 1 addition & 1 deletion configs/mask_rcnn_r50_fpn_1x.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
out_channels=256,
featmap_strides=[4, 8, 16, 32]),
bbox_head=dict(
type='SharedFCRoIHead',
type='SharedFCBBoxHead',
num_fcs=2,
in_channels=256,
fc_out_channels=1024,
Expand Down
4 changes: 2 additions & 2 deletions mmdet/models/bbox_heads/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from .bbox_head import BBoxHead
from .convfc_bbox_head import ConvFCRoIHead, SharedFCRoIHead
from .convfc_bbox_head import ConvFCBBoxHead, SharedFCBBoxHead

__all__ = ['BBoxHead', 'ConvFCRoIHead', 'SharedFCRoIHead']
__all__ = ['BBoxHead', 'ConvFCBBoxHead', 'SharedFCBBoxHead']
10 changes: 5 additions & 5 deletions mmdet/models/bbox_heads/convfc_bbox_head.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from ..utils import ConvModule


class ConvFCRoIHead(BBoxHead):
class ConvFCBBoxHead(BBoxHead):
"""More general bbox head, with shared conv and fc layers and two optional
separated branches.

Expand All @@ -24,7 +24,7 @@ def __init__(self,
fc_out_channels=1024,
*args,
**kwargs):
super(ConvFCRoIHead, self).__init__(*args, **kwargs)
super(ConvFCBBoxHead, self).__init__(*args, **kwargs)
assert (num_shared_convs + num_shared_fcs + num_cls_convs + num_cls_fcs
+ num_reg_convs + num_reg_fcs > 0)
if num_cls_convs > 0 or num_reg_convs > 0:
Expand Down Expand Up @@ -116,7 +116,7 @@ def _add_conv_fc_branch(self,
return branch_convs, branch_fcs, last_layer_dim

def init_weights(self):
super(ConvFCRoIHead, self).init_weights()
super(ConvFCBBoxHead, self).init_weights()
for module_list in [self.shared_fcs, self.cls_fcs, self.reg_fcs]:
for m in module_list.modules():
if isinstance(m, nn.Linear):
Expand Down Expand Up @@ -162,11 +162,11 @@ def forward(self, x):
return cls_score, bbox_pred


class SharedFCRoIHead(ConvFCRoIHead):
class SharedFCBBoxHead(ConvFCBBoxHead):

def __init__(self, num_fcs=2, fc_out_channels=1024, *args, **kwargs):
assert num_fcs >= 1
super(SharedFCRoIHead, self).__init__(
super(SharedFCBBoxHead, self).__init__(
num_shared_convs=0,
num_shared_fcs=num_fcs,
num_cls_convs=0,
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ def readme():

MAJOR = 0
MINOR = 5
PATCH = 0
PATCH = 1
SUFFIX = ''
SHORT_VERSION = '{}.{}.{}{}'.format(MAJOR, MINOR, PATCH, SUFFIX)

Expand Down