From 41d55d452b78456138d10ffb59ca6a5fd8b678c9 Mon Sep 17 00:00:00 2001 From: Glenn Jocher Date: Wed, 27 Feb 2019 12:52:02 +0100 Subject: [PATCH] updates --- utils/utils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/utils.py b/utils/utils.py index 69a3541f..7c4c0c81 100755 --- a/utils/utils.py +++ b/utils/utils.py @@ -374,7 +374,7 @@ def non_max_suppression(prediction, conf_thres=0.5, nms_thres=0.4): if prediction.is_cuda: unique_labels = unique_labels.cuda(prediction.device) - nms_style = 'OR' # 'OR' (default), 'AND', 'MERGE' (experimental) + nms_style = 'MERGE' # 'OR' (default), 'AND', 'MERGE' (experimental) for c in unique_labels: # Get the detections with class c dc = detections[detections[:, -1] == c] @@ -384,7 +384,7 @@ def non_max_suppression(prediction, conf_thres=0.5, nms_thres=0.4): # Non-maximum suppression det_max = [] - if nms_style == 'MERGE': # default + if nms_style == 'OR': # default while dc.shape[0]: det_max.append(dc[:1]) # save highest conf detection if len(dc) == 1: # Stop if we're at the last detection