From ed081736347cd9731834fd44f4bccbcde39ce760 Mon Sep 17 00:00:00 2001 From: Joseph Redmon Date: Thu, 26 Nov 2015 14:34:47 -0800 Subject: [PATCH] idk --- src/classifier.c | 2 +- src/coco_kernels.cu | 7 ++++--- src/yolo_kernels.cu | 7 ++++--- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/classifier.c b/src/classifier.c index 2f9a91f3..e2439659 100644 --- a/src/classifier.c +++ b/src/classifier.c @@ -279,7 +279,7 @@ void test_classifier(char *datacfg, char *cfgfile, char *weightfile, char *filen int i; if (target_layer >= 0){ - layer l = net.layers[target_layer]; + //layer l = net.layers[target_layer]; } for(i = 0; i < val.X.rows; ++i){ diff --git a/src/coco_kernels.cu b/src/coco_kernels.cu index 9ec0cb09..4dc3e88f 100644 --- a/src/coco_kernels.cu +++ b/src/coco_kernels.cu @@ -32,6 +32,7 @@ static image det_s; static image disp ; static cv::VideoCapture cap; static float fps = 0; +static int demo_thresh = 0; void *fetch_in_thread_coco(void *ptr) { @@ -47,24 +48,24 @@ void *fetch_in_thread_coco(void *ptr) void *detect_in_thread_coco(void *ptr) { float nms = .4; - float thresh = .2; detection_layer l = net.layers[net.n-1]; float *X = det_s.data; float *predictions = network_predict(net, X); free_image(det_s); - convert_coco_detections(predictions, l.classes, l.n, l.sqrt, l.side, 1, 1, thresh, probs, boxes, 0); + convert_coco_detections(predictions, l.classes, l.n, l.sqrt, l.side, 1, 1, demo_thresh, probs, boxes, 0); if (nms > 0) do_nms(boxes, probs, l.side*l.side*l.n, l.classes, nms); printf("\033[2J"); printf("\033[1;1H"); printf("\nFPS:%.0f\n",fps); printf("Objects:\n\n"); - draw_detections(det, l.side*l.side*l.n, thresh, boxes, probs, coco_classes, coco_labels, 80); + draw_detections(det, l.side*l.side*l.n, demo_thresh, boxes, probs, coco_classes, coco_labels, 80); return 0; } extern "C" void demo_coco(char *cfgfile, char *weightfile, float thresh, int cam_index) { + demo_thresh = thresh; printf("YOLO demo\n"); net = parse_network_cfg(cfgfile); if(weightfile){ diff --git a/src/yolo_kernels.cu b/src/yolo_kernels.cu index e102f543..e603caf9 100644 --- a/src/yolo_kernels.cu +++ b/src/yolo_kernels.cu @@ -33,6 +33,7 @@ static image det_s; static image disp ; static cv::VideoCapture cap; static float fps = 0; +static int demo_thresh = 0; void *fetch_in_thread(void *ptr) { @@ -48,24 +49,24 @@ void *fetch_in_thread(void *ptr) void *detect_in_thread(void *ptr) { float nms = .4; - float thresh = .2; detection_layer l = net.layers[net.n-1]; float *X = det_s.data; float *predictions = network_predict(net, X); free_image(det_s); - convert_yolo_detections(predictions, l.classes, l.n, l.sqrt, l.side, 1, 1, thresh, probs, boxes, 0); + convert_yolo_detections(predictions, l.classes, l.n, l.sqrt, l.side, 1, 1, demo_thresh, probs, boxes, 0); if (nms > 0) do_nms(boxes, probs, l.side*l.side*l.n, l.classes, nms); printf("\033[2J"); printf("\033[1;1H"); printf("\nFPS:%.0f\n",fps); printf("Objects:\n\n"); - draw_detections(det, l.side*l.side*l.n, thresh, boxes, probs, voc_names, voc_labels, 20); + draw_detections(det, l.side*l.side*l.n, demo_thresh, boxes, probs, voc_names, voc_labels, 20); return 0; } extern "C" void demo_yolo(char *cfgfile, char *weightfile, float thresh, int cam_index) { + demo_thresh = thresh; printf("YOLO demo\n"); net = parse_network_cfg(cfgfile); if(weightfile){