Skip to content

Commit 97a2859

Browse files
committed
Fix mask merge
1 parent 622d3e5 commit 97a2859

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

fcis/core/tester.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,11 @@ def pred_eval(predictor, test_data, imdb, cfg, vis=False, thresh=1e-3, logger=No
129129
all_masks[j][idx + delta] = cls_masks[keep, :]
130130
else:
131131
masks = masks[:, 1:, :, :]
132+
im_height = np.round(im_shapes[delta][0] / scales[delta]).astype('int')
133+
im_width = np.round(im_shapes[delta][1] / scales[delta]).astype('int')
134+
boxes = clip_boxes(boxes, (im_height, im_width))
132135
result_mask, result_box = mask_voting(masks, boxes, scores, imdb.num_classes,
133-
max_per_image, im_shapes[delta][1], im_shapes[delta][0],
136+
max_per_image, im_width, im_height,
134137
cfg.TEST.NMS, cfg.TEST.MASK_MERGE_THRESH,
135138
cfg.BINARY_THRESH)
136139
for j in xrange(1, imdb.num_classes):

fcis/demo.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,12 @@ def main():
124124
masks = [all_masks[j] for j in range(1, num_classes)]
125125
else:
126126
masks = masks[0][:, 1:, :, :]
127-
result_masks, result_dets = gpu_mask_voting(masks, boxes[0], scores[0], num_classes,
128-
100, im_shapes[0][1], im_shapes[0][0],
127+
im_height = np.round(im_shapes[0][0] / scales[0]).astype('int')
128+
im_width = np.round(im_shapes[0][1] / scales[0]).astype('int')
129+
print (im_height, im_width)
130+
boxes = clip_boxes(boxes[0], (im_height, im_width))
131+
result_masks, result_dets = gpu_mask_voting(masks, boxes, scores[0], num_classes,
132+
100, im_width, im_height,
129133
config.TEST.NMS, config.TEST.MASK_MERGE_THRESH,
130134
config.BINARY_THRESH, ctx_id[0])
131135

0 commit comments

Comments
 (0)