Jinrong Yang
commited on
Commit
·
499b0a0
1
Parent(s):
df02d56
fix multiclass_nms bug (#66)
Browse files
demo/ONNXRuntime/onnx_inference.py
CHANGED
@@ -84,10 +84,11 @@ if __name__ == '__main__':
|
|
84 |
boxes_xyxy[:, 3] = boxes[:, 1] + boxes[:, 3]/2.
|
85 |
boxes_xyxy /= ratio
|
86 |
dets = multiclass_nms(boxes_xyxy, scores, nms_thr=0.65, score_thr=0.1)
|
87 |
-
|
88 |
-
|
89 |
-
|
90 |
-
|
|
|
91 |
|
92 |
mkdir(args.output_dir)
|
93 |
output_path = os.path.join(args.output_dir, args.image_path.split("/")[-1])
|
|
|
84 |
boxes_xyxy[:, 3] = boxes[:, 1] + boxes[:, 3]/2.
|
85 |
boxes_xyxy /= ratio
|
86 |
dets = multiclass_nms(boxes_xyxy, scores, nms_thr=0.65, score_thr=0.1)
|
87 |
+
|
88 |
+
if dets is not None:
|
89 |
+
final_boxes, final_scores, final_cls_inds = dets[:, :4], dets[:, 4], dets[:, 5]
|
90 |
+
origin_img = vis(origin_img, final_boxes, final_scores, final_cls_inds,
|
91 |
+
conf=args.score_thr, class_names=COCO_CLASSES)
|
92 |
|
93 |
mkdir(args.output_dir)
|
94 |
output_path = os.path.join(args.output_dir, args.image_path.split("/")[-1])
|
demo/OpenVINO/python/openvino_inference.py
CHANGED
@@ -142,11 +142,12 @@ def main():
|
|
142 |
boxes_xyxy[:, 3] = boxes[:, 1] + boxes[:, 3]/2.
|
143 |
boxes_xyxy /= ratio
|
144 |
dets = multiclass_nms(boxes_xyxy, scores, nms_thr=0.65, score_thr=0.1)
|
145 |
-
|
146 |
-
|
147 |
-
|
148 |
-
|
149 |
-
|
|
|
150 |
|
151 |
mkdir(args.output_dir)
|
152 |
output_path = os.path.join(args.output_dir, args.image_path.split("/")[-1])
|
|
|
142 |
boxes_xyxy[:, 3] = boxes[:, 1] + boxes[:, 3]/2.
|
143 |
boxes_xyxy /= ratio
|
144 |
dets = multiclass_nms(boxes_xyxy, scores, nms_thr=0.65, score_thr=0.1)
|
145 |
+
|
146 |
+
if dets is not None:
|
147 |
+
final_boxes = dets[:, :4]
|
148 |
+
final_scores, final_cls_inds = dets[:, 4], dets[:, 5]
|
149 |
+
origin_img = vis(origin_img, final_boxes, final_scores, final_cls_inds,
|
150 |
+
conf=args.score_thr, class_names=COCO_CLASSES)
|
151 |
|
152 |
mkdir(args.output_dir)
|
153 |
output_path = os.path.join(args.output_dir, args.image_path.split("/")[-1])
|
yolox/utils/demo_utils.py
CHANGED
@@ -61,6 +61,8 @@ def multiclass_nms(boxes, scores, nms_thr, score_thr):
|
|
61 |
cls_inds = np.ones((len(keep), 1)) * cls_ind
|
62 |
dets = np.concatenate([valid_boxes[keep], valid_scores[keep, None], cls_inds], 1)
|
63 |
final_dets.append(dets)
|
|
|
|
|
64 |
return np.concatenate(final_dets, 0)
|
65 |
|
66 |
|
|
|
61 |
cls_inds = np.ones((len(keep), 1)) * cls_ind
|
62 |
dets = np.concatenate([valid_boxes[keep], valid_scores[keep, None], cls_inds], 1)
|
63 |
final_dets.append(dets)
|
64 |
+
if len(final_dets) == 0:
|
65 |
+
return None
|
66 |
return np.concatenate(final_dets, 0)
|
67 |
|
68 |
|