Commit 839c74b7 authored by pangjm's avatar pangjm
Browse files

fix fast rcnn bugs

parent 630687f4
...@@ -53,8 +53,14 @@ class CocoDataset(Dataset): ...@@ -53,8 +53,14 @@ class CocoDataset(Dataset):
# color channel order and normalize configs # color channel order and normalize configs
self.img_norm_cfg = img_norm_cfg self.img_norm_cfg = img_norm_cfg
# proposals # proposals
self.proposals = mmcv.load( # TODO: revise _filter_imgs to be more flexible
proposal_file) if proposal_file is not None else None if proposal_file is not None:
self.proposals = mmcv.load(proposal_file)
ori_ids = self.coco.getImgIds()
sorted_idx = [ori_ids.index(id) for id in self.img_ids]
self.proposals = [self.proposals[idx] for idx in sorted_idx]
else:
self.proposals = None
self.num_max_proposals = num_max_proposals self.num_max_proposals = num_max_proposals
# flip ratio # flip ratio
self.flip_ratio = flip_ratio self.flip_ratio = flip_ratio
...@@ -271,7 +277,8 @@ class CocoDataset(Dataset): ...@@ -271,7 +277,8 @@ class CocoDataset(Dataset):
scale_factor=scale_factor, scale_factor=scale_factor,
flip=flip) flip=flip)
if proposal is not None: if proposal is not None:
_proposal = self.bbox_transform(proposal, scale_factor, flip) _proposal = self.bbox_transform(proposal, img_shape,
scale_factor, flip)
_proposal = to_tensor(_proposal) _proposal = to_tensor(_proposal)
else: else:
_proposal = None _proposal = None
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment