From adea337545ef54b36e1f78d22fd5dd1673b74a57 Mon Sep 17 00:00:00 2001 From: Glenn Jocher Date: Mon, 18 Feb 2019 19:17:48 +0100 Subject: [PATCH] updates --- utils/gcp.sh | 3 ++- utils/utils.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/utils/gcp.sh b/utils/gcp.sh index 7b55efe9..b0f5c6a9 100755 --- a/utils/gcp.sh +++ b/utils/gcp.sh @@ -11,7 +11,8 @@ gsutil cp gs://ultralytics/yolov3.pt yolov3/weights python3 detect.py # Test -python3 test.py --img_size 416 --weights weights/latest.pt +sudo rm -rf yolov3 && git clone https://github.com/ultralytics/yolov3 && cd yolov3 +python3 test.py --weights weights/yolov3.weights # Test Darknet python3 test.py --img_size 416 --weights ../darknet/backup/yolov3.backup diff --git a/utils/utils.py b/utils/utils.py index 6c21bfea..59447312 100755 --- a/utils/utils.py +++ b/utils/utils.py @@ -392,6 +392,7 @@ def non_max_suppression(prediction, conf_thres=0.5, nms_thres=0.4): # 64 5000 0.619 0.579 0.568 # 96 5000 0.652 0.622 0.613 # 128 5000 0.651 0.625 0.617 + # 5000 5000 0.627 0.593 0.584 elif nms_style == 'AND': # requires overlap, single boxes erased while len(dc) > 1: @@ -405,7 +406,7 @@ def non_max_suppression(prediction, conf_thres=0.5, nms_thres=0.4): iou = bbox_iou(dc[:1], dc[0:]) # iou with other boxes i = iou > nms_thres - weights = dc[i, 4:5] * dc[i, 5:6] + weights = (dc[i, 4:5] * dc[i, 5:6]) ** 0.5 dc[0, :4] = (weights * dc[i, :4]).sum(0) / weights.sum() det_max.append(dc[:1]) dc = dc[iou < nms_thres]