From 37d7c1e79f65a75caf87e29a562d30c51cd654e5 Mon Sep 17 00:00:00 2001
From: Joe Redmon <pjreddie@gmail.com>
Date: Thu, 26 Nov 2015 21:52:56 +0000
Subject: [PATCH] fixed label linking
---
src/yolo.c | 68 ++++++++++------------------------
1 files changed, 20 insertions(+), 48 deletions(-)
diff --git a/src/yolo.c b/src/yolo.c
index 2abfa13..d62c533 100644
--- a/src/yolo.c
+++ b/src/yolo.c
@@ -10,39 +10,7 @@
#endif
char *voc_names[] = {"aeroplane", "bicycle", "bird", "boat", "bottle", "bus", "car", "cat", "chair", "cow", "diningtable", "dog", "horse", "motorbike", "person", "pottedplant", "sheep", "sofa", "train", "tvmonitor"};
-
-void draw_yolo(image im, int num, float thresh, box *boxes, float **probs, char *label)
-{
- int classes = 20;
- int i;
-
- for(i = 0; i < num; ++i){
- int class = max_index(probs[i], classes);
- float prob = probs[i][class];
- if(prob > thresh){
- int width = pow(prob, 1./2.)*10;
- printf("%f %s\n", prob, voc_names[class]);
- float red = get_color(0,class,classes);
- float green = get_color(1,class,classes);
- float blue = get_color(2,class,classes);
- //red = green = blue = 0;
- box b = boxes[i];
-
- int left = (b.x-b.w/2.)*im.w;
- int right = (b.x+b.w/2.)*im.w;
- int top = (b.y-b.h/2.)*im.h;
- int bot = (b.y+b.h/2.)*im.h;
-
- if(left < 0) left = 0;
- if(right > im.w-1) right = im.w-1;
- if(top < 0) top = 0;
- if(bot > im.h-1) bot = im.h-1;
-
- draw_box_width(im, left, top, right, bot, width, red, green, blue);
- }
- }
- show_image(im, label);
-}
+image voc_labels[20];
void train_yolo(char *cfgfile, char *weightfile)
{
@@ -97,21 +65,13 @@
printf("Loaded: %lf seconds\n", sec(clock()-time));
- /*
- image im = float_to_image(net.w, net.h, 3, train.X.vals[113]);
- image copy = copy_image(im);
- draw_yolo(copy, train.y.vals[113], 7, "truth");
- cvWaitKey(0);
- free_image(copy);
- */
-
time=clock();
float loss = train_network(net, train);
if (avg_loss < 0) avg_loss = loss;
avg_loss = avg_loss*.9 + loss*.1;
printf("%d: %f, %f avg, %f rate, %lf seconds, %d images\n", i, loss, avg_loss, get_current_rate(net), sec(clock()-time), i*imgs);
- if(i%1000==0){
+ if(i%1000==0 || i == 600){
char buff[256];
sprintf(buff, "%s/%s_%d.weights", backup_directory, base, i);
save_weights(net, buff);
@@ -183,8 +143,8 @@
srand(time(0));
char *base = "results/comp4_det_test_";
- //list *plist = get_paths("data/voc.2007.test");
- list *plist = get_paths("data/voc.2012.test");
+ list *plist = get_paths("data/voc.2007.test");
+ //list *plist = get_paths("data/voc.2012.test");
char **paths = (char **)list_to_array(plist);
layer l = net.layers[net.n-1];
@@ -384,7 +344,8 @@
printf("%s: Predicted in %f seconds.\n", input, sec(clock()-time));
convert_yolo_detections(predictions, l.classes, l.n, l.sqrt, l.side, 1, 1, thresh, probs, boxes, 0);
if (nms) do_nms_sort(boxes, probs, l.side*l.side*l.n, l.classes, nms);
- draw_yolo(im, l.side*l.side*l.n, thresh, boxes, probs, "predictions");
+ draw_detections(im, l.side*l.side*l.n, thresh, boxes, probs, voc_names, voc_labels, 20);
+ show_image(im, "predictions");
show_image(sized, "resized");
free_image(im);
@@ -433,14 +394,25 @@
#endif
*/
-void demo_yolo(char *cfgfile, char *weightfile, float thresh);
+void demo_yolo(char *cfgfile, char *weightfile, float thresh, int cam_index);
#ifndef GPU
-void demo_yolo(char *cfgfile, char *weightfile, float thresh){}
+void demo_yolo(char *cfgfile, char *weightfile, float thresh, int cam_index)
+{
+ fprintf(stderr, "Darknet must be compiled with CUDA for YOLO demo.\n");
+}
#endif
void run_yolo(int argc, char **argv)
{
+ int i;
+ for(i = 0; i < 20; ++i){
+ char buff[256];
+ sprintf(buff, "data/labels/%s.png", voc_names[i]);
+ voc_labels[i] = load_image_color(buff, 0, 0);
+ }
+
float thresh = find_float_arg(argc, argv, "-thresh", .2);
+ int cam_index = find_int_arg(argc, argv, "-c", 0);
if(argc < 4){
fprintf(stderr, "usage: %s %s [train/test/valid] [cfg] [weights (optional)]\n", argv[0], argv[1]);
return;
@@ -453,5 +425,5 @@
else if(0==strcmp(argv[2], "train")) train_yolo(cfg, weights);
else if(0==strcmp(argv[2], "valid")) validate_yolo(cfg, weights);
else if(0==strcmp(argv[2], "recall")) validate_yolo_recall(cfg, weights);
- else if(0==strcmp(argv[2], "demo")) demo_yolo(cfg, weights, thresh);
+ else if(0==strcmp(argv[2], "demo")) demo_yolo(cfg, weights, thresh, cam_index);
}
--
Gitblit v1.10.0