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

fixed demo thing

Browse Source
This commit is contained in:
Joseph Redmon 2018-03-25 05:48:43 -07:00
parent d3828827e7
commit f444f25e91
1 changed files with 156 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
src/demo.c
View File

@ -30,13 +30,59 @@ static int running = 0;
static int demo_frame = 3; static int demo_frame = 3;
static int demo_index = 0; static int demo_index = 0;
//static float **predictions; static float **predictions;
//static float *avg; static float *avg;
static int demo_done = 0; static int demo_done = 0;
static int demo_total = 0;
double demo_time; double demo_time;
detection *get_network_boxes(network *net, int w, int h, float thresh, float hier, int *map, int relative, int *num); detection *get_network_boxes(network *net, int w, int h, float thresh, float hier, int *map, int relative, int *num);
int size_network(network *net)
{
int i;
int count = 0;
for(i = 0; i < net->n; ++i){
layer l = net->layers[i];
if(l.type == YOLO || l.type == REGION || l.type == DETECTION){
count += l.outputs;
}
}
return count;
}
void remember_network(network *net)
{
int i;
int count = 0;
for(i = 0; i < net->n; ++i){
layer l = net->layers[i];
if(l.type == YOLO || l.type == REGION || l.type == DETECTION){
memcpy(predictions[demo_index] + count, net->layers[i].output, sizeof(float) * l.outputs);
count += l.outputs;
}
}
}
detection *avg_predictions(network *net, int *nboxes)
{
int i, j;
int count = 0;
fill_cpu(demo_total, 0, avg, 1);
for(j = 0; j < demo_frame; ++j){
axpy_cpu(demo_total, 1./demo_frame, predictions[j], 1, avg, 1);
}
for(i = 0; i < net->n; ++i){
layer l = net->layers[i];
if(l.type == YOLO || l.type == REGION || l.type == DETECTION){
memcpy(l.output, avg + count, sizeof(float) * l.outputs);
count += l.outputs;
}
}
detection *dets = get_network_boxes(net, buff[0].w, buff[0].h, demo_thresh, demo_hier, 0, 1, nboxes);
return dets;
}
void *detect_in_thread(void *ptr) void *detect_in_thread(void *ptr)
{ {
running = 1; running = 1;
@ -50,15 +96,13 @@ void *detect_in_thread(void *ptr)
if(l.type == DETECTION){ if(l.type == DETECTION){
get_detection_boxes(l, 1, 1, demo_thresh, probs, boxes, 0); get_detection_boxes(l, 1, 1, demo_thresh, probs, boxes, 0);
} else */ } else */
remember_network(net);
detection *dets = 0; detection *dets = 0;
int nboxes = 0; int nboxes = 0;
if (l.type == REGION){ dets = avg_predictions(net, &nboxes);
dets = get_network_boxes(net, buff[0].w, buff[0].h, demo_thresh, demo_hier, 0, 1, &nboxes);
} else {
error("Last layer must produce detections\n");
}
/*
/*
int i,j; int i,j;
box zero = {0}; box zero = {0};
int classes = l.classes; int classes = l.classes;
@ -155,6 +199,14 @@ void demo(char *cfgfile, char *weightfile, float thresh, int cam_index, const ch
srand(2222222); srand(2222222);
int i;
demo_total = size_network(net);
predictions = calloc(demo_frame, sizeof(float*));
for (i = 0; i < demo_frame; ++i){
predictions[i] = calloc(demo_total, sizeof(float));
}
avg = calloc(demo_total, sizeof(float));
if(filename){ if(filename){
printf("video file: %s\n", filename); printf("video file: %s\n", filename);
cap = cvCaptureFromFile(filename); cap = cvCaptureFromFile(filename);
@ -215,8 +267,8 @@ void demo(char *cfgfile, char *weightfile, float thresh, int cam_index, const ch
} }
/* /*
void demo_compare(char *cfg1, char *weight1, char *cfg2, char *weight2, float thresh, int cam_index, const char *filename, char **names, int classes, int delay, char *prefix, int avg_frames, float hier, int w, int h, int frames, int fullscreen) void demo_compare(char *cfg1, char *weight1, char *cfg2, char *weight2, float thresh, int cam_index, const char *filename, char **names, int classes, int delay, char *prefix, int avg_frames, float hier, int w, int h, int frames, int fullscreen)
{ {
demo_frame = avg_frames; demo_frame = avg_frames;
predictions = calloc(demo_frame, sizeof(float*)); predictions = calloc(demo_frame, sizeof(float*));
image **alphabet = load_alphabet(); image **alphabet = load_alphabet();
@ -285,22 +337,22 @@ void demo_compare(char *cfg1, char *weight1, char *cfg2, char *weight2, float th
demo_time = what_time_is_it_now(); demo_time = what_time_is_it_now();
while(!demo_done){ while(!demo_done){
buff_index = (buff_index + 1) %3; buff_index = (buff_index + 1) %3;
if(pthread_create(&fetch_thread, 0, fetch_in_thread, 0)) error("Thread creation failed"); if(pthread_create(&fetch_thread, 0, fetch_in_thread, 0)) error("Thread creation failed");
if(pthread_create(&detect_thread, 0, detect_in_thread, 0)) error("Thread creation failed"); if(pthread_create(&detect_thread, 0, detect_in_thread, 0)) error("Thread creation failed");
if(!prefix){ if(!prefix){
fps = 1./(what_time_is_it_now() - demo_time); fps = 1./(what_time_is_it_now() - demo_time);
demo_time = what_time_is_it_now(); demo_time = what_time_is_it_now();
display_in_thread(0); display_in_thread(0);
}else{ }else{
char name[256]; char name[256];
sprintf(name, "%s_%08d", prefix, count); sprintf(name, "%s_%08d", prefix, count);
save_image(buff[(buff_index + 1)%3], name); save_image(buff[(buff_index + 1)%3], name);
} }
pthread_join(fetch_thread, 0); pthread_join(fetch_thread, 0);
pthread_join(detect_thread, 0); pthread_join(detect_thread, 0);
++count; ++count;
} }
} }
*/ */
#else #else