mirror/darknet
1
0
Fork 0
mirror of https://github.com/pjreddie/darknet.git synced 2023-08-10 21:13:14 +03:00
Code Issues Projects Releases Wiki Activity

idk

Browse Source
This commit is contained in:
Joseph Redmon
2015-11-26 14:34:47 -08:00
parent 37d7c1e79f
commit ed08173634
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/classifier.c
View File

@ -279,7 +279,7 @@ void test_classifier(char *datacfg, char *cfgfile, char *weightfile, char *filen
int i; int i;
if (target_layer >= 0){ if (target_layer >= 0){
layer l = net.layers[target_layer]; //layer l = net.layers[target_layer];
} }
for(i = 0; i < val.X.rows; ++i){ for(i = 0; i < val.X.rows; ++i){

7
src/coco_kernels.cu
View File

@ -32,6 +32,7 @@ static image det_s;
static image disp ; static image disp ;
static cv::VideoCapture cap; static cv::VideoCapture cap;
static float fps = 0; static float fps = 0;
static int demo_thresh = 0;
void *fetch_in_thread_coco(void *ptr) 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) void *detect_in_thread_coco(void *ptr)
{ {
float nms = .4; float nms = .4;
float thresh = .2;
detection_layer l = net.layers[net.n-1]; detection_layer l = net.layers[net.n-1];
float *X = det_s.data; float *X = det_s.data;
float *predictions = network_predict(net, X); float *predictions = network_predict(net, X);
free_image(det_s); 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); if (nms > 0) do_nms(boxes, probs, l.side*l.side*l.n, l.classes, nms);
printf("\033[2J"); printf("\033[2J");
printf("\033[1;1H"); printf("\033[1;1H");
printf("\nFPS:%.0f\n",fps); printf("\nFPS:%.0f\n",fps);
printf("Objects:\n\n"); 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; return 0;
} }
extern "C" void demo_coco(char *cfgfile, char *weightfile, float thresh, int cam_index) extern "C" void demo_coco(char *cfgfile, char *weightfile, float thresh, int cam_index)
{ {
demo_thresh = thresh;
printf("YOLO demo\n"); printf("YOLO demo\n");
net = parse_network_cfg(cfgfile); net = parse_network_cfg(cfgfile);
if(weightfile){ if(weightfile){

7
src/yolo_kernels.cu
View File

@ -33,6 +33,7 @@ static image det_s;
static image disp ; static image disp ;
static cv::VideoCapture cap; static cv::VideoCapture cap;
static float fps = 0; static float fps = 0;
static int demo_thresh = 0;
void *fetch_in_thread(void *ptr) void *fetch_in_thread(void *ptr)
{ {
@ -48,24 +49,24 @@ void *fetch_in_thread(void *ptr)
void *detect_in_thread(void *ptr) void *detect_in_thread(void *ptr)
{ {
float nms = .4; float nms = .4;
float thresh = .2;
detection_layer l = net.layers[net.n-1]; detection_layer l = net.layers[net.n-1];
float *X = det_s.data; float *X = det_s.data;
float *predictions = network_predict(net, X); float *predictions = network_predict(net, X);
free_image(det_s); 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); if (nms > 0) do_nms(boxes, probs, l.side*l.side*l.n, l.classes, nms);
printf("\033[2J"); printf("\033[2J");
printf("\033[1;1H"); printf("\033[1;1H");
printf("\nFPS:%.0f\n",fps); printf("\nFPS:%.0f\n",fps);
printf("Objects:\n\n"); 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; return 0;
} }
extern "C" void demo_yolo(char *cfgfile, char *weightfile, float thresh, int cam_index) extern "C" void demo_yolo(char *cfgfile, char *weightfile, float thresh, int cam_index)
{ {
demo_thresh = thresh;
printf("YOLO demo\n"); printf("YOLO demo\n");
net = parse_network_cfg(cfgfile); net = parse_network_cfg(cfgfile);
if(weightfile){ if(weightfile){