From 7fe80a2bb56ee3eaa95d3e3e3ee7a4129e58e4b7 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Tue, 09 Jun 2015 20:56:33 +0000
Subject: [PATCH] sync issues
---
src/detection.c | 55 +++++++++++++++++++++++++++++--------------------------
1 files changed, 29 insertions(+), 26 deletions(-)
diff --git a/src/detection.c b/src/detection.c
index 0dbedb1..29b67d9 100644
--- a/src/detection.c
+++ b/src/detection.c
@@ -32,8 +32,8 @@
//float maxheight = distance_from_edge(r, side);
//float maxwidth = distance_from_edge(c, side);
j += classes;
- float y = box[j+0];
- float x = box[j+1];
+ float x = box[j+0];
+ float y = box[j+1];
x = (x+c)/side;
y = (y+r)/side;
float w = box[j+2]; //*maxwidth;
@@ -258,6 +258,8 @@
plist = get_paths("/home/pjreddie/data/imagenet/det.train.list");
}else{
//plist = get_paths("/home/pjreddie/data/voc/no_2012_val.txt");
+ //plist = get_paths("/home/pjreddie/data/voc/no_2007_test.txt");
+ //plist = get_paths("/home/pjreddie/data/voc/val_2012.txt");
plist = get_paths("/home/pjreddie/data/voc/no_2007_test.txt");
//plist = get_paths("/home/pjreddie/data/coco/trainval.txt");
//plist = get_paths("/home/pjreddie/data/voc/all2007-2012.txt");
@@ -272,12 +274,13 @@
train = buffer;
load_thread = load_data_detection_thread(imgs, paths, plist->size, classes, net.w, net.h, side, side, background, &buffer);
- /*
+/*
image im = float_to_image(net.w, net.h, 3, train.X.vals[114]);
image copy = copy_image(im);
- draw_detection(copy, train.y.vals[114], 7);
+ draw_detection(copy, train.y.vals[114], 7, "truth");
+ cvWaitKey(0);
free_image(copy);
- */
+ */
printf("Loaded: %lf seconds\n", sec(clock()-time));
time=clock();
@@ -313,8 +316,8 @@
int ci = k+classes+background+nuisance;
float x = (pred.vals[j][ci + 0] + col)/num_boxes;
float y = (pred.vals[j][ci + 1] + row)/num_boxes;
- float w = pred.vals[j][ci + 2]; //* distance_from_edge(row, num_boxes);
- float h = pred.vals[j][ci + 3]; //* distance_from_edge(col, num_boxes);
+ float w = pred.vals[j][ci + 2]; // distance_from_edge(row, num_boxes);
+ float h = pred.vals[j][ci + 3]; // distance_from_edge(col, num_boxes);
w = pow(w, 2);
h = pow(h, 2);
float prob = scale*pred.vals[j][k+class+background+nuisance];
@@ -336,9 +339,9 @@
fprintf(stderr, "Learning Rate: %g, Momentum: %g, Decay: %g\n", net.learning_rate, net.momentum, net.decay);
srand(time(0));
- list *plist = get_paths("/home/pjreddie/data/voc/test_2007.txt");
+ //list *plist = get_paths("/home/pjreddie/data/voc/test_2007.txt");
//list *plist = get_paths("/home/pjreddie/data/voc/val_2012.txt");
- //list *plist = get_paths("/home/pjreddie/data/voc/test.txt");
+ list *plist = get_paths("/home/pjreddie/data/voc/test.txt");
//list *plist = get_paths("/home/pjreddie/data/voc/val.expanded.txt");
//list *plist = get_paths("/home/pjreddie/data/voc/train.txt");
char **paths = (char **)list_to_array(plist);
@@ -360,15 +363,18 @@
data *val = calloc(nthreads, sizeof(data));
data *buf = calloc(nthreads, sizeof(data));
pthread_t *thr = calloc(nthreads, sizeof(data));
+
+ time_t start = time(0);
+
for(t = 0; t < nthreads; ++t){
int num = (i+1+t)*m/splits - (i+t)*m/splits;
char **part = paths+((i+t)*m/splits);
thr[t] = load_data_thread(part, num, 0, 0, num_output, net.w, net.h, &(buf[t]));
}
- clock_t time;
+ //clock_t time;
for(i = nthreads; i <= splits; i += nthreads){
- time=clock();
+ //time=clock();
for(t = 0; t < nthreads; ++t){
pthread_join(thr[t], 0);
val[t] = buf[t];
@@ -379,30 +385,25 @@
thr[t] = load_data_thread(part, num, 0, 0, num_output, net.w, net.h, &(buf[t]));
}
- fprintf(stderr, "%d: Loaded: %lf seconds\n", i, sec(clock()-time));
+ //fprintf(stderr, "%d: Loaded: %lf seconds\n", i, sec(clock()-time));
+ fprintf(stderr, "%d\n", i);
for(t = 0; t < nthreads; ++t){
- predict_detections(net, val[t], .01, (i-nthreads+t)*m/splits, classes, nuisance, background, num_boxes, per_box);
+ predict_detections(net, val[t], .001, (i-nthreads+t)*m/splits, classes, nuisance, background, num_boxes, per_box);
free_data(val[t]);
}
- time=clock();
}
+ fprintf(stderr, "Total Detection Time: %f Seconds\n", (double)(time(0) - start));
}
void do_mask(network net, data d, int offset, int classes, int nuisance, int background, int num_boxes, int per_box)
{
matrix pred = network_predict_data(net, d);
- int j, k, class;
+ int j, k;
for(j = 0; j < pred.rows; ++j){
printf("%d ", offset + j);
for(k = 0; k < pred.cols; k += per_box){
- float scale = 1.;
- if (nuisance) scale = 1.-pred.vals[j][k];
- float max_prob = 0;
- for (class = 0; class < classes; ++class){
- float prob = scale*pred.vals[j][k+class+background+nuisance];
- if(prob > max_prob) max_prob = prob;
- }
- printf("%f ", max_prob);
+ float scale = 1.-pred.vals[j][k];
+ printf("%f ", scale);
}
printf("\n");
}
@@ -609,14 +610,16 @@
while(1){
fgets(filename, 256, stdin);
strtok(filename, "\n");
- image im = load_image_color(filename, im_size, im_size);
+ image im = load_image_color(filename,0,0);
+ image sized = resize_image(im, im_size, im_size);
printf("%d %d %d\n", im.h, im.w, im.c);
- float *X = im.data;
+ float *X = sized.data;
time=clock();
float *predictions = network_predict(net, X);
printf("%s: Predicted in %f seconds.\n", filename, sec(clock()-time));
- draw_detection(im, predictions, 7, "detections");
+ draw_detection(im, predictions, 7, "YOLO#SWAG#BLAZEIT");
free_image(im);
+ free_image(sized);
cvWaitKey(0);
}
}
--
Gitblit v1.10.0