From ccde487525fc89a1d4bc3e1cf11a18971e8451c9 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@users.noreply.github.com>
Date: Sat, 11 Jul 2015 00:33:24 +0000
Subject: [PATCH] Create README.md
---
src/imagenet.c | 48 +++++++++++++++++++++++++++++++-----------------
1 files changed, 31 insertions(+), 17 deletions(-)
diff --git a/src/imagenet.c b/src/imagenet.c
index 9118c08..0e272fc 100644
--- a/src/imagenet.c
+++ b/src/imagenet.c
@@ -4,8 +4,9 @@
void train_imagenet(char *cfgfile, char *weightfile)
{
- float avg_loss = -1;
+ data_seed = time(0);
srand(time(0));
+ float avg_loss = -1;
char *base = basecfg(cfgfile);
printf("%s\n", base);
network net = parse_network_cfg(cfgfile);
@@ -13,9 +14,10 @@
load_weights(&net, weightfile);
}
printf("Learning Rate: %g, Momentum: %g, Decay: %g\n", net.learning_rate, net.momentum, net.decay);
+ //net.seen=0;
int imgs = 1024;
int i = net.seen/imgs;
- char **labels = get_labels("/home/pjreddie/data/imagenet/cls.labels.list");
+ char **labels = get_labels("data/inet.labels.list");
list *plist = get_paths("/data/imagenet/cls.train.list");
char **paths = (char **)list_to_array(plist);
printf("%d\n", plist->size);
@@ -29,6 +31,13 @@
time=clock();
pthread_join(load_thread, 0);
train = buffer;
+
+ /*
+ image im = float_to_image(256, 256, 3, train.X.vals[114]);
+ show_image(im, "training");
+ cvWaitKey(0);
+ */
+
load_thread = load_data_thread(paths, imgs, plist->size, labels, 1000, 256, 256, &buffer);
printf("Loaded: %lf seconds\n", sec(clock()-time));
time=clock();
@@ -38,7 +47,8 @@
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);
free_data(train);
- if(i%100==0){
+ if((i % 30000) == 0) net.learning_rate *= .1;
+ if(i%1000==0){
char buff[256];
sprintf(buff, "/home/pjreddie/imagenet_backup/%s_%d.weights",base, i);
save_weights(net, buff);
@@ -55,9 +65,9 @@
}
srand(time(0));
- char **labels = get_labels("/home/pjreddie/data/imagenet/cls.val.labels.list");
+ char **labels = get_labels("data/inet.labels.list");
+ list *plist = get_paths("data/inet.val.list");
- list *plist = get_paths("/data/imagenet/cls.val.list");
char **paths = (char **)list_to_array(plist);
int m = plist->size;
free_list(plist);
@@ -90,37 +100,40 @@
}
}
-void test_imagenet(char *cfgfile, char *weightfile)
+void test_imagenet(char *cfgfile, char *weightfile, char *filename)
{
network net = parse_network_cfg(cfgfile);
if(weightfile){
load_weights(&net, weightfile);
}
set_batch_network(&net, 1);
- //imgs=1;
srand(2222222);
int i = 0;
- char **names = get_labels("cfg/shortnames.txt");
+ char **names = get_labels("data/shortnames.txt");
clock_t time;
- char filename[256];
+ char input[256];
int indexes[10];
while(1){
- fgets(filename, 256, stdin);
- strtok(filename, "\n");
- image im = load_image_color(filename, 256, 256);
- translate_image(im, -128);
- scale_image(im, 1/128.);
- printf("%d %d %d\n", im.h, im.w, im.c);
+ if(filename){
+ strncpy(input, filename, 256);
+ }else{
+ printf("Enter Image Path: ");
+ fflush(stdout);
+ fgets(input, 256, stdin);
+ strtok(input, "\n");
+ }
+ image im = load_image_color(input, 256, 256);
float *X = im.data;
time=clock();
float *predictions = network_predict(net, X);
top_predictions(net, 10, indexes);
- printf("%s: Predicted in %f seconds.\n", filename, sec(clock()-time));
+ printf("%s: Predicted in %f seconds.\n", input, sec(clock()-time));
for(i = 0; i < 10; ++i){
int index = indexes[i];
printf("%s: %f\n", names[index], predictions[index]);
}
free_image(im);
+ if (filename) break;
}
}
@@ -133,7 +146,8 @@
char *cfg = argv[3];
char *weights = (argc > 4) ? argv[4] : 0;
- if(0==strcmp(argv[2], "test")) test_imagenet(cfg, weights);
+ char *filename = (argc > 5) ? argv[5]: 0;
+ if(0==strcmp(argv[2], "test")) test_imagenet(cfg, weights, filename);
else if(0==strcmp(argv[2], "train")) train_imagenet(cfg, weights);
else if(0==strcmp(argv[2], "valid")) validate_imagenet(cfg, weights);
}
--
Gitblit v1.10.0