From ae43c2bc32fbb838bfebeeaf2c2b058ccab5c83c Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@burninator.cs.washington.edu>
Date: Thu, 23 Jun 2016 05:31:14 +0000
Subject: [PATCH] hi
---
src/writing.c | 105 +++++++++++++++++++++++++++++++++++-----------------
1 files changed, 70 insertions(+), 35 deletions(-)
diff --git a/src/writing.c b/src/writing.c
index e0c1d1a..32e4f6d 100644
--- a/src/writing.c
+++ b/src/writing.c
@@ -19,24 +19,43 @@
load_weights(&net, weightfile);
}
printf("Learning Rate: %g, Momentum: %g, Decay: %g\n", net.learning_rate, net.momentum, net.decay);
- int imgs = 1024;
- int i = *net.seen/imgs;
+ int imgs = net.batch*net.subdivisions;
list *plist = get_paths("figures.list");
char **paths = (char **)list_to_array(plist);
- printf("%d\n", plist->size);
clock_t time;
- while(1){
- ++i;
+ int N = plist->size;
+ printf("N: %d\n", N);
+ image out = get_network_image(net);
+
+ data train, buffer;
+
+ load_args args = {0};
+ args.w = net.w;
+ args.h = net.h;
+ args.out_w = out.w;
+ args.out_h = out.h;
+ args.paths = paths;
+ args.n = imgs;
+ args.m = N;
+ args.d = &buffer;
+ args.type = WRITING_DATA;
+
+ pthread_t load_thread = load_data_in_thread(args);
+ int epoch = (*net.seen)/N;
+ while(get_current_batch(net) < net.max_batches || net.max_batches == 0){
time=clock();
- data train = load_data_writing(paths, imgs, plist->size, 256, 256, 1);
+ pthread_join(load_thread, 0);
+ train = buffer;
+ load_thread = load_data_in_thread(args);
printf("Loaded %lf seconds\n",sec(clock()-time));
+
time=clock();
float loss = train_network(net, train);
/*
- image pred = float_to_image(64, 64, 1, out);
- print_image(pred);
- */
+ image pred = float_to_image(64, 64, 1, out);
+ print_image(pred);
+ */
/*
image im = float_to_image(256, 256, 3, train.X.vals[0]);
@@ -51,18 +70,23 @@
if(avg_loss == -1) avg_loss = loss;
avg_loss = avg_loss*.9 + loss*.1;
- printf("%d: %f, %f avg, %lf seconds, %d images\n", i, loss, avg_loss, sec(clock()-time), *net.seen);
+ printf("%d, %.3f: %f, %f avg, %f rate, %lf seconds, %d images\n", get_current_batch(net), (float)(*net.seen)/N, loss, avg_loss, get_current_rate(net), sec(clock()-time), *net.seen);
free_data(train);
- //if(i%100 == 0 && net.learning_rate > .00001) net.learning_rate *= .97;
- if(i%1000==0){
+ if(get_current_batch(net)%100 == 0){
char buff[256];
- sprintf(buff, "%s/%s_%d.weights", backup_directory, base, i);
+ sprintf(buff, "%s/%s_batch_%d.weights", backup_directory, base, get_current_batch(net));
+ save_weights(net, buff);
+ }
+ if(*net.seen/N > epoch){
+ epoch = *net.seen/N;
+ char buff[256];
+ sprintf(buff, "%s/%s_%d.weights",backup_directory,base, epoch);
save_weights(net, buff);
}
}
}
-void test_writing(char *cfgfile, char *weightfile, char *outfile)
+void test_writing(char *cfgfile, char *weightfile, char *filename)
{
network net = parse_network_cfg(cfgfile);
if(weightfile){
@@ -71,33 +95,44 @@
set_batch_network(&net, 1);
srand(2222222);
clock_t time;
- char filename[256];
+ char buff[256];
+ char *input = buff;
+ while(1){
+ if(filename){
+ strncpy(input, filename, 256);
+ }else{
+ printf("Enter Image Path: ");
+ fflush(stdout);
+ input = fgets(input, 256, stdin);
+ if(!input) return;
+ strtok(input, "\n");
+ }
- fgets(filename, 256, stdin);
- strtok(filename, "\n");
- image im = load_image_color(filename, 0, 0);
- //image im = load_image_color("/home/pjreddie/darknet/data/figs/C02-1001-Figure-1.png", 0, 0);
- image sized = resize_image(im, net.w, net.h);
- printf("%d %d %d\n", im.h, im.w, im.c);
- float *X = sized.data;
- time=clock();
- network_predict(net, X);
- printf("%s: Predicted in %f seconds.\n", filename, sec(clock()-time));
- image pred = get_network_image(net);
+ image im = load_image_color(input, 0, 0);
+ resize_network(&net, im.w, im.h);
+ printf("%d %d %d\n", im.h, im.w, im.c);
+ float *X = im.data;
+ time=clock();
+ network_predict(net, X);
+ printf("%s: Predicted in %f seconds.\n", input, sec(clock()-time));
+ image pred = get_network_image(net);
- if (outfile) {
- printf("Save image as %s.png (shape: %d %d)\n", outfile, pred.w, pred.h);
- save_image(pred, outfile);
- } else {
+ image upsampled = resize_image(pred, im.w, im.h);
+ image thresh = threshold_image(upsampled, .5);
+ pred = thresh;
+
show_image(pred, "prediction");
+ show_image(im, "orig");
#ifdef OPENCV
cvWaitKey(0);
cvDestroyAllWindows();
#endif
- }
- free_image(im);
- free_image(sized);
+ free_image(upsampled);
+ free_image(thresh);
+ free_image(im);
+ if (filename) break;
+ }
}
void run_writing(int argc, char **argv)
@@ -109,8 +144,8 @@
char *cfg = argv[3];
char *weights = (argc > 4) ? argv[4] : 0;
- char *outfile = (argc > 5) ? argv[5] : 0;
+ char *filename = (argc > 5) ? argv[5] : 0;
if(0==strcmp(argv[2], "train")) train_writing(cfg, weights);
- else if(0==strcmp(argv[2], "test")) test_writing(cfg, weights, outfile);
+ else if(0==strcmp(argv[2], "test")) test_writing(cfg, weights, filename);
}
--
Gitblit v1.10.0