Skip to content
Snippets Groups Projects
Commit cfc3cf0e authored by liushuchun's avatar liushuchun Committed by Kai Chen
Browse files

Fix scale test error (#883)

parent 92595ea6
No related branches found
No related tags found
No related merge requests found
...@@ -152,7 +152,10 @@ class BBoxHead(nn.Module): ...@@ -152,7 +152,10 @@ class BBoxHead(nn.Module):
bboxes[:, [1, 3]].clamp_(min=0, max=img_shape[0] - 1) bboxes[:, [1, 3]].clamp_(min=0, max=img_shape[0] - 1)
if rescale: if rescale:
bboxes /= scale_factor if isinstance(scale_factor, float):
bboxes /= scale_factor
else:
bboxes /= torch.from_numpy(scale_factor).to(bboxes.device)
if cfg is None: if cfg is None:
return bboxes, scores return bboxes, scores
......
...@@ -323,9 +323,16 @@ class CascadeRCNN(BaseDetector, RPNTestMixin): ...@@ -323,9 +323,16 @@ class CascadeRCNN(BaseDetector, RPNTestMixin):
mask_classes = self.mask_head[-1].num_classes - 1 mask_classes = self.mask_head[-1].num_classes - 1
segm_result = [[] for _ in range(mask_classes)] segm_result = [[] for _ in range(mask_classes)]
else: else:
_bboxes = ( if isinstance(scale_factor, float): # aspect ratio fixed
det_bboxes[:, :4] * _bboxes = (
scale_factor if rescale else det_bboxes) det_bboxes[:, :4] *
scale_factor if rescale else det_bboxes)
else:
_bboxes = (
det_bboxes[:, :4] *
torch.from_numpy(scale_factor).to(det_bboxes.device)
if rescale else det_bboxes)
mask_rois = bbox2roi([_bboxes]) mask_rois = bbox2roi([_bboxes])
aug_masks = [] aug_masks = []
for i in range(self.num_stages): for i in range(self.num_stages):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment