From 9d42f49a240136a8cd643cdc1f98230d4f22b05e Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Tue, 25 Aug 2015 01:27:42 +0000
Subject: [PATCH] changing data loading
---
src/imagenet.c | 45 ++++++++++++++++++++++++++++++++++++++-------
1 files changed, 38 insertions(+), 7 deletions(-)
diff --git a/src/imagenet.c b/src/imagenet.c
index 196854d..fb57307 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){
@@ -25,7 +30,19 @@
pthread_t load_thread;
data train;
data buffer;
- load_thread = load_data_thread(paths, imgs, plist->size, labels, 1000, 256, 256, &buffer);
+
+ load_args args = {0};
+ args.w = net.w;
+ args.h = net.h;
+ args.paths = paths;
+ args.classes = 1000;
+ args.n = imgs;
+ args.m = plist->size;
+ args.labels = labels;
+ args.d = &buffer;
+ args.type = CLASSIFICATION_DATA;
+
+ load_thread = load_data_in_thread(args);
while(1){
++i;
time=clock();
@@ -38,7 +55,7 @@
cvWaitKey(0);
*/
- load_thread = load_data_thread(paths, imgs, plist->size, labels, 1000, 256, 256, &buffer);
+ load_thread = load_data_in_thread(args);
printf("Loaded: %lf seconds\n", sec(clock()-time));
time=clock();
float loss = train_network(net, train);
@@ -47,11 +64,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 % 20000) == 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);
}
}
@@ -80,7 +96,19 @@
int num = (i+1)*m/splits - i*m/splits;
data val, buffer;
- pthread_t load_thread = load_data_thread(paths, num, 0, labels, 1000, 256, 256, &buffer);
+
+ load_args args = {0};
+ args.w = net.w;
+ args.h = net.h;
+ args.paths = paths;
+ args.classes = 1000;
+ args.n = num;
+ args.m = 0;
+ args.labels = labels;
+ args.d = &buffer;
+ args.type = CLASSIFICATION_DATA;
+
+ pthread_t load_thread = load_data_in_thread(args);
for(i = 1; i <= splits; ++i){
time=clock();
@@ -89,7 +117,10 @@
num = (i+1)*m/splits - i*m/splits;
char **part = paths+(i*m/splits);
- if(i != splits) load_thread = load_data_thread(part, num, 0, labels, 1000, 256, 256, &buffer);
+ if(i != splits){
+ args.paths = part;
+ load_thread = load_data_in_thread(args);
+ }
printf("Loaded: %d images in %lf seconds\n", val.X.rows, sec(clock()-time));
time=clock();
--
Gitblit v1.10.0