From 036e3b3253808f7112ced8969a4703155f6328c1 Mon Sep 17 00:00:00 2001 From: Glenn Jocher Date: Wed, 27 Feb 2019 12:51:24 +0100 Subject: [PATCH] updates --- utils/gcp.sh | 2 +- utils/utils.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/gcp.sh b/utils/gcp.sh index 3707f86d..93308d61 100755 --- a/utils/gcp.sh +++ b/utils/gcp.sh @@ -18,7 +18,7 @@ python3 detect.py # Test sudo rm -rf yolov3 && git clone https://github.com/ultralytics/yolov3 sudo rm -rf cocoapi && git clone https://github.com/cocodataset/cocoapi && cd cocoapi/PythonAPI && make && cd ../.. && cp -r cocoapi/PythonAPI/pycocotools yolov3 -cd yolov3 && python3 test.py --save-json +cd yolov3 && python3 test.py --save-json --conf-thres 0.005 # Test Darknet python3 test.py --img_size 416 --weights ../darknet/backup/yolov3.backup diff --git a/utils/utils.py b/utils/utils.py index e4982602..69a3541f 100755 --- a/utils/utils.py +++ b/utils/utils.py @@ -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 == 'OR': # default + if nms_style == 'MERGE': # 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