From cf0300ea55538d4ca139d68cd24b0ee452cce015 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Sat, 28 Mar 2015 00:32:01 +0000
Subject: [PATCH] dropout probably ok
---
src/data.c | 327 +++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 260 insertions(+), 67 deletions(-)
diff --git a/src/data.c b/src/data.c
index 79cfcec..7069248 100644
--- a/src/data.c
+++ b/src/data.c
@@ -6,6 +6,22 @@
#include <stdlib.h>
#include <string.h>
+struct load_args{
+ char **paths;
+ int n;
+ int m;
+ char **labels;
+ int k;
+ int h;
+ int w;
+ int nh;
+ int nw;
+ int jitter;
+ int classes;
+ int background;
+ data *d;
+};
+
list *get_paths(char *filename)
{
char *path;
@@ -19,42 +35,16 @@
return lines;
}
-void fill_truth_detection(char *path, float *truth, int height, int width, int num_height, int num_width, float scale)
+char **get_random_paths(char **paths, int n, int m)
{
- int box_height = height/num_height;
- int box_width = width/num_width;
- char *labelpath = find_replace(path, "imgs", "det");
- labelpath = find_replace(labelpath, ".JPEG", ".txt");
- FILE *file = fopen(labelpath, "r");
- if(!file) file_error(labelpath);
- int x, y, h, w;
- while(fscanf(file, "%d %d %d %d", &x, &y, &w, &h) == 4){
- int i = x/box_width;
- int j = y/box_height;
- float dw = (float)(x%box_width)/box_height;
- float dh = (float)(y%box_width)/box_width;
- float sh = h/scale;
- float sw = w/scale;
- //printf("%d %d %f %f\n", i, j, dh, dw);
- int index = (i+j*num_width)*5;
- truth[index++] = 1;
- truth[index++] = dh;
- truth[index++] = dw;
- truth[index++] = sh;
- truth[index++] = sw;
- }
- fclose(file);
-}
-
-void fill_truth(char *path, char **labels, int k, float *truth)
-{
+ char **random_paths = calloc(n, sizeof(char*));
int i;
- memset(truth, 0, k*sizeof(float));
- for(i = 0; i < k; ++i){
- if(strstr(path, labels[i])){
- truth[i] = 1;
- }
+ for(i = 0; i < n; ++i){
+ int index = rand()%m;
+ random_paths[i] = paths[index];
+ if(i == 0) printf("%s\n", paths[index]);
}
+ return random_paths;
}
matrix load_image_paths(char **paths, int n, int h, int w)
@@ -73,27 +63,176 @@
return X;
}
+typedef struct box{
+ int id;
+ float x,y,w,h;
+} box;
+
+box *read_boxes(char *filename, int *n)
+{
+ box *boxes = calloc(1, sizeof(box));
+ FILE *file = fopen(filename, "r");
+ if(!file) file_error(filename);
+ float x, y, h, w;
+ int id;
+ int count = 0;
+ while(fscanf(file, "%d %f %f %f %f", &id, &x, &y, &w, &h) == 5){
+ boxes = realloc(boxes, (count+1)*sizeof(box));
+ boxes[count].id = id;
+ boxes[count].x = x;
+ boxes[count].y = y;
+ boxes[count].h = h;
+ boxes[count].w = w;
+ ++count;
+ }
+ fclose(file);
+ *n = count;
+ return boxes;
+}
+
+void randomize_boxes(box *b, int n)
+{
+ int i;
+ for(i = 0; i < n; ++i){
+ box swap = b[i];
+ int index = rand()%n;
+ b[i] = b[index];
+ b[index] = swap;
+ }
+}
+
+void fill_truth_detection(char *path, float *truth, int classes, int height, int width, int num_height, int num_width, int dy, int dx, int jitter, int flip, int background)
+{
+ int box_height = height/num_height;
+ int box_width = width/num_width;
+ char *labelpath = find_replace(path, "VOC2012/JPEGImages", "labels");
+ labelpath = find_replace(labelpath, ".jpg", ".txt");
+ int count = 0;
+ box *boxes = read_boxes(labelpath, &count);
+ randomize_boxes(boxes, count);
+ float x, y, h, w;
+ int id;
+ int i;
+ if(background){
+ for(i = 0; i < num_height*num_width*(4+classes+background); i += 4+classes+background){
+ truth[i] = 1;
+ }
+ }
+ for(i = 0; i < count; ++i){
+ x = boxes[i].x;
+ y = boxes[i].y;
+ w = boxes[i].w;
+ h = boxes[i].h;
+ id = boxes[i].id;
+ if(flip) x = 1-x;
+ x *= width + jitter;
+ y *= height + jitter;
+ x -= dx;
+ y -= dy;
+ int i = x/box_width;
+ int j = y/box_height;
+
+ if(i < 0) i = 0;
+ if(i >= num_width) i = num_width-1;
+ if(j < 0) j = 0;
+ if(j >= num_height) j = num_height-1;
+
+ float dw = constrain(0,1, (x - i*box_width)/box_width );
+ float dh = constrain(0,1, (y - j*box_height)/box_height );
+ float th = constrain(0,1, h*(height+jitter)/height );
+ float tw = constrain(0,1, w*(width+jitter)/width );
+
+ int index = (i+j*num_width)*(4+classes+background);
+ if(truth[index+classes+background+2]) continue;
+ if(background) truth[index++] = 0;
+ truth[index+id] = 1;
+ index += classes;
+ truth[index++] = dh;
+ truth[index++] = dw;
+ truth[index++] = th;
+ truth[index++] = tw;
+ }
+ free(boxes);
+}
+
+#define NUMCHARS 37
+
+void print_letters(float *pred, int n)
+{
+ int i;
+ for(i = 0; i < n; ++i){
+ int index = max_index(pred+i*NUMCHARS, NUMCHARS);
+ printf("%c", int_to_alphanum(index));
+ }
+ printf("\n");
+}
+
+void fill_truth_captcha(char *path, int n, float *truth)
+{
+ char *begin = strrchr(path, '/');
+ ++begin;
+ int i;
+ for(i = 0; i < strlen(begin) && i < n && begin[i] != '.'; ++i){
+ int index = alphanum_to_int(begin[i]);
+ if(index > 35) printf("Bad %c\n", begin[i]);
+ truth[i*NUMCHARS+index] = 1;
+ }
+ for(;i < n; ++i){
+ truth[i*NUMCHARS + NUMCHARS-1] = 1;
+ }
+}
+
+data load_data_captcha(char **paths, int n, int m, int k, int h, int w)
+{
+ if(m) paths = get_random_paths(paths, n, m);
+ data d;
+ d.shallow = 0;
+ d.X = load_image_paths(paths, n, h, w);
+ d.y = make_matrix(n, k*NUMCHARS);
+ int i;
+ for(i = 0; i < n; ++i){
+ fill_truth_captcha(paths[i], k, d.y.vals[i]);
+ }
+ if(m) free(paths);
+ return d;
+}
+
+data load_data_captcha_encode(char **paths, int n, int m, int h, int w)
+{
+ if(m) paths = get_random_paths(paths, n, m);
+ data d;
+ d.shallow = 0;
+ d.X = load_image_paths(paths, n, h, w);
+ d.X.cols = 17100;
+ d.y = d.X;
+ if(m) free(paths);
+ return d;
+}
+
+void fill_truth(char *path, char **labels, int k, float *truth)
+{
+ int i;
+ memset(truth, 0, k*sizeof(float));
+ int count = 0;
+ for(i = 0; i < k; ++i){
+ if(strstr(path, labels[i])){
+ truth[i] = 1;
+ ++count;
+ }
+ }
+ if(count != 1) printf("%d, %s\n", count, path);
+}
+
matrix load_labels_paths(char **paths, int n, char **labels, int k)
{
matrix y = make_matrix(n, k);
int i;
- for(i = 0; i < n; ++i){
+ for(i = 0; i < n && labels; ++i){
fill_truth(paths[i], labels, k, y.vals[i]);
}
return y;
}
-matrix load_labels_detection(char **paths, int n, int height, int width, int num_height, int num_width, float scale)
-{
- int k = num_height*num_width*5;
- matrix y = make_matrix(n, k);
- int i;
- for(i = 0; i < n; ++i){
- fill_truth_detection(paths[i], y.vals[i], height, width, num_height, num_width, scale);
- }
- return y;
-}
-
data load_data_image_pathfile(char *filename, char **labels, int k, int h, int w)
{
list *plist = get_paths(filename);
@@ -128,44 +267,98 @@
}
}
-data load_data_detection_random(int n, char **paths, int m, int h, int w, int nh, int nw, float scale)
+data load_data_detection_jitter_random(int n, char **paths, int m, int classes, int h, int w, int nh, int nw, int jitter, int background)
{
- char **random_paths = calloc(n, sizeof(char*));
+ char **random_paths = get_random_paths(paths, n, m);
int i;
- for(i = 0; i < n; ++i){
- int index = rand()%m;
- random_paths[i] = paths[index];
- if(i == 0) printf("%s\n", paths[index]);
- }
data d;
d.shallow = 0;
d.X = load_image_paths(random_paths, n, h, w);
- d.y = load_labels_detection(random_paths, n, h, w, nh, nw, scale);
+ int k = nh*nw*(4+classes+background);
+ d.y = make_matrix(n, k);
+ for(i = 0; i < n; ++i){
+ int dx = rand()%jitter;
+ int dy = rand()%jitter;
+ int flip = rand()%2;
+ fill_truth_detection(random_paths[i], d.y.vals[i], classes, h-jitter, w-jitter, nh, nw, dy, dx, jitter, flip, background);
+ image a = float_to_image(h, w, 3, d.X.vals[i]);
+ if(flip) flip_image(a);
+ jitter_image(a,h-jitter,w-jitter,dy,dx);
+ }
+ d.X.cols = (h-jitter)*(w-jitter)*3;
free(random_paths);
return d;
}
-data load_data(char **paths, int n, char **labels, int k, int h, int w)
+void *load_detection_thread(void *ptr)
{
+ printf("Loading data: %d\n", rand());
+ struct load_args a = *(struct load_args*)ptr;
+ *a.d = load_data_detection_jitter_random(a.n, a.paths, a.m, a.classes, a.h, a.w, a.nh, a.nw, a.jitter, a.background);
+ translate_data_rows(*a.d, -128);
+ scale_data_rows(*a.d, 1./128);
+ free(ptr);
+ return 0;
+}
+
+pthread_t load_data_detection_thread(int n, char **paths, int m, int classes, int h, int w, int nh, int nw, int jitter, int background, data *d)
+{
+ pthread_t thread;
+ struct load_args *args = calloc(1, sizeof(struct load_args));
+ args->n = n;
+ args->paths = paths;
+ args->m = m;
+ args->h = h;
+ args->w = w;
+ args->nh = nh;
+ args->nw = nw;
+ args->classes = classes;
+ args->jitter = jitter;
+ args->background = background;
+ args->d = d;
+ if(pthread_create(&thread, 0, load_detection_thread, args)) {
+ error("Thread creation failed");
+ }
+ return thread;
+}
+
+data load_data(char **paths, int n, int m, char **labels, int k, int h, int w)
+{
+ if(m) paths = get_random_paths(paths, n, m);
data d;
d.shallow = 0;
d.X = load_image_paths(paths, n, h, w);
d.y = load_labels_paths(paths, n, labels, k);
+ if(m) free(paths);
return d;
}
-data load_data_random(int n, char **paths, int m, char **labels, int k, int h, int w)
+void *load_in_thread(void *ptr)
{
- char **random_paths = calloc(n, sizeof(char*));
- int i;
- for(i = 0; i < n; ++i){
- int index = rand()%m;
- random_paths[i] = paths[index];
- if(i == 0) printf("%s\n", paths[index]);
+ struct load_args a = *(struct load_args*)ptr;
+ *a.d = load_data(a.paths, a.n, a.m, a.labels, a.k, a.h, a.w);
+ translate_data_rows(*a.d, -128);
+ scale_data_rows(*a.d, 1./128);
+ free(ptr);
+ return 0;
+}
+
+pthread_t load_data_thread(char **paths, int n, int m, char **labels, int k, int h, int w, data *d)
+{
+ pthread_t thread;
+ struct load_args *args = calloc(1, sizeof(struct load_args));
+ args->n = n;
+ args->paths = paths;
+ args->m = m;
+ args->labels = labels;
+ args->k = k;
+ args->h = h;
+ args->w = w;
+ args->d = d;
+ if(pthread_create(&thread, 0, load_in_thread, args)) {
+ error("Thread creation failed");
}
- data d = load_data(random_paths, n, labels, k, h, w);
- free(random_paths);
- return d;
+ return thread;
}
data load_categorical_data_csv(char *filename, int target, int k)
@@ -206,9 +399,9 @@
X.vals[i][j] = (double)bytes[j+1];
}
}
- translate_data_rows(d, -144);
- scale_data_rows(d, 1./128);
- //normalize_data_rows(d);
+ translate_data_rows(d, -144);
+ scale_data_rows(d, 1./128);
+ //normalize_data_rows(d);
fclose(fp);
return d;
}
--
Gitblit v1.10.0