From 3a99b8151f6a002353691b1254b395eb52effefa Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Mon, 17 Aug 2015 17:25:43 +0000
Subject: [PATCH] Fair comparison
---
src/imagenet.c | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/src/imagenet.c b/src/imagenet.c
index a564f33..aeb7e69 100644
--- a/src/imagenet.c
+++ b/src/imagenet.c
@@ -2,12 +2,17 @@
#include "utils.h"
#include "parser.h"
+#ifdef OPENCV
+#include "opencv2/highgui/highgui_c.h"
+#endif
+
void train_imagenet(char *cfgfile, char *weightfile)
{
data_seed = time(0);
srand(time(0));
float avg_loss = -1;
char *base = basecfg(cfgfile);
+ char *backup_directory = "/home/pjreddie/backup/";
printf("%s\n", base);
network net = parse_network_cfg(cfgfile);
if(weightfile){
@@ -17,7 +22,7 @@
//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);
@@ -25,7 +30,7 @@
pthread_t load_thread;
data train;
data buffer;
- load_thread = load_data_thread(paths, imgs, plist->size, labels, 1000, 256, 256, &buffer);
+ load_thread = load_data_thread(paths, imgs, plist->size, labels, 1000, net.w, net.h, &buffer);
while(1){
++i;
time=clock();
@@ -38,7 +43,7 @@
cvWaitKey(0);
*/
- load_thread = load_data_thread(paths, imgs, plist->size, labels, 1000, 256, 256, &buffer);
+ load_thread = load_data_thread(paths, imgs, plist->size, labels, 1000, net.w, net.h, &buffer);
printf("Loaded: %lf seconds\n", sec(clock()-time));
time=clock();
float loss = train_network(net, train);
@@ -47,11 +52,10 @@
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 % 15000) == 0) net.learning_rate *= .1;
- //if(i%100 == 0 && net.learning_rate > .00001) net.learning_rate *= .97;
+ 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);
+ sprintf(buff, "%s/%s_%d.weights",backup_directory,base, i);
save_weights(net, buff);
}
}
@@ -66,9 +70,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);
--
Gitblit v1.10.0