From 68213b835b9f15cb449ad2037a8b51c17a3de07b Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Mon, 14 Mar 2016 22:10:14 +0000
Subject: [PATCH] Makefile
---
src/yolo_kernels.cu | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/yolo_kernels.cu b/src/yolo_kernels.cu
index 78fedaf..d7f1b26 100644
--- a/src/yolo_kernels.cu
+++ b/src/yolo_kernels.cu
@@ -21,6 +21,7 @@
extern "C" void draw_yolo(image im, int num, float thresh, box *boxes, float **probs);
extern "C" char *voc_names[];
+extern "C" image voc_labels[];
static float **probs;
static box *boxes;
@@ -32,6 +33,7 @@
static image disp ;
static cv::VideoCapture cap;
static float fps = 0;
+static float demo_thresh = 0;
void *fetch_in_thread(void *ptr)
{
@@ -47,24 +49,24 @@
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, 0, 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){
--
Gitblit v1.10.0