From f996bd59a61338d8d51e2b19482d684f6dd04d0f Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Wed, 23 Sep 2015 21:16:48 +0000
Subject: [PATCH] more writing fixes
---
src/yolo.c | 24 ++++++------------------
1 files changed, 6 insertions(+), 18 deletions(-)
diff --git a/src/yolo.c b/src/yolo.c
index 61a5344..b2c89d8 100644
--- a/src/yolo.c
+++ b/src/yolo.c
@@ -66,7 +66,6 @@
load_weights(&net, weightfile);
}
detection_layer layer = get_network_detection_layer(net);
- printf("Learning Rate: %g, Momentum: %g, Decay: %g\n", net.learning_rate, net.momentum, net.decay);
int imgs = 128;
int i = *net.seen/imgs;
@@ -75,10 +74,6 @@
int N = plist->size;
paths = (char **)list_to_array(plist);
- if(i*imgs > N*80){
- net.layers[net.n-1].joint = 1;
- net.layers[net.n-1].objectness = 0;
- }
if(i*imgs > N*120){
net.layers[net.n-1].rescore = 1;
}
@@ -102,7 +97,7 @@
pthread_t load_thread = load_data_in_thread(args);
clock_t time;
- while(i*imgs < N*130){
+ while(get_current_batch(net) < net.max_batches){
i += 1;
time=clock();
pthread_join(load_thread, 0);
@@ -115,19 +110,10 @@
if (avg_loss < 0) avg_loss = loss;
avg_loss = avg_loss*.9 + loss*.1;
- printf("%d: %f, %f avg, %lf seconds, %d images, epoch: %f\n", i, loss, avg_loss, sec(clock()-time), i*imgs, ((float)i)*imgs/N);
-
- if((i-1)*imgs <= N && i*imgs > N){
- fprintf(stderr, "First stage done\n");
- net.learning_rate *= 10;
- char buff[256];
- sprintf(buff, "%s/%s_first_stage.weights", backup_directory, base);
- save_weights(net, buff);
- }
+ printf("%d: %f, %f avg, %lf seconds, %f rate, %d images, epoch: %f\n", get_current_batch(net), loss, avg_loss, sec(clock()-time), get_current_rate(net), *net.seen, (float)*net.seen/N);
if((i-1)*imgs <= 80*N && i*imgs > N*80){
fprintf(stderr, "Second stage done.\n");
- net.learning_rate *= .1;
char buff[256];
sprintf(buff, "%s/%s_second_stage.weights", backup_directory, base);
save_weights(net, buff);
@@ -304,14 +290,16 @@
set_batch_network(&net, 1);
srand(2222222);
clock_t time;
- char input[256];
+ char buff[256];
+ char *input = buff;
while(1){
if(filename){
strncpy(input, filename, 256);
} else {
printf("Enter Image Path: ");
fflush(stdout);
- fgets(input, 256, stdin);
+ input = fgets(input, 256, stdin);
+ if(!input) return;
strtok(input, "\n");
}
image im = load_image_color(input,0,0);
--
Gitblit v1.10.0