From 62235e9aa3d0c15d87d49bf340625d075cba3e65 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Sat, 19 Nov 2016 05:51:36 +0000
Subject: [PATCH] cpu batch norm works
---
src/detector.c | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/src/detector.c b/src/detector.c
index 3853ebb..695b068 100644
--- a/src/detector.c
+++ b/src/detector.c
@@ -136,15 +136,19 @@
i = get_current_batch(net);
printf("%d: %f, %f avg, %f rate, %lf seconds, %d images\n", get_current_batch(net), loss, avg_loss, get_current_rate(net), sec(clock()-time), i*imgs);
- if(i%100==0 || (i < 1000 && i%100 == 0)){
+ if(i%1000==0 || (i < 1000 && i%100 == 0)){
+#ifdef GPU
if(ngpus != 1) sync_nets(nets, ngpus, 0);
+#endif
char buff[256];
sprintf(buff, "%s/%s_%d.weights", backup_directory, base, i);
save_weights(net, buff);
}
free_data(train);
}
+#ifdef GPU
if(ngpus != 1) sync_nets(nets, ngpus, 0);
+#endif
char buff[256];
sprintf(buff, "%s/%s_final.weights", backup_directory, base);
save_weights(net, buff);
@@ -440,7 +444,6 @@
if(weightfile){
load_weights(&net, weightfile);
}
- layer l = net.layers[net.n-1];
set_batch_network(&net, 1);
srand(2222222);
clock_t time;
@@ -448,9 +451,6 @@
char *input = buff;
int j;
float nms=.4;
- box *boxes = calloc(l.w*l.h*l.n, sizeof(box));
- float **probs = calloc(l.w*l.h*l.n, sizeof(float *));
- for(j = 0; j < l.w*l.h*l.n; ++j) probs[j] = calloc(l.classes, sizeof(float *));
while(1){
if(filename){
strncpy(input, filename, 256);
@@ -463,6 +463,12 @@
}
image im = load_image_color(input,0,0);
image sized = resize_image(im, net.w, net.h);
+ layer l = net.layers[net.n-1];
+
+ box *boxes = calloc(l.w*l.h*l.n, sizeof(box));
+ float **probs = calloc(l.w*l.h*l.n, sizeof(float *));
+ for(j = 0; j < l.w*l.h*l.n; ++j) probs[j] = calloc(l.classes, sizeof(float *));
+
float *X = sized.data;
time=clock();
network_predict(net, X);
@@ -475,6 +481,8 @@
free_image(im);
free_image(sized);
+ free(boxes);
+ free_ptrs((void **)probs, l.w*l.h*l.n);
#ifdef OPENCV
cvWaitKey(0);
cvDestroyAllWindows();
@@ -486,7 +494,7 @@
void run_detector(int argc, char **argv)
{
char *prefix = find_char_arg(argc, argv, "-prefix", 0);
- float thresh = find_float_arg(argc, argv, "-thresh", .2);
+ float thresh = find_float_arg(argc, argv, "-thresh", .25);
int cam_index = find_int_arg(argc, argv, "-c", 0);
int frame_skip = find_int_arg(argc, argv, "-s", 0);
if(argc < 4){
--
Gitblit v1.10.0