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/data.c | 285 +++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 258 insertions(+), 27 deletions(-)
diff --git a/src/data.c b/src/data.c
index 1ef2c40..dafcc98 100644
--- a/src/data.c
+++ b/src/data.c
@@ -6,7 +6,9 @@
#include <stdlib.h>
#include <string.h>
-struct load_args{
+unsigned int data_seed;
+
+typedef struct load_args{
char **paths;
int n;
int m;
@@ -20,7 +22,10 @@
int classes;
int background;
data *d;
-};
+ char *path;
+ image *im;
+ image *resized;
+} load_args;
list *get_paths(char *filename)
{
@@ -40,13 +45,40 @@
char **random_paths = calloc(n, sizeof(char*));
int i;
for(i = 0; i < n; ++i){
- int index = rand()%m;
+ int index = rand_r(&data_seed)%m;
random_paths[i] = paths[index];
if(i == 0) printf("%s\n", paths[index]);
}
return random_paths;
}
+char **find_replace_paths(char **paths, int n, char *find, char *replace)
+{
+ char **replace_paths = calloc(n, sizeof(char*));
+ int i;
+ for(i = 0; i < n; ++i){
+ char *replaced = find_replace(paths[i], find, replace);
+ replace_paths[i] = copy_string(replaced);
+ }
+ return replace_paths;
+}
+
+matrix load_image_paths_gray(char **paths, int n, int w, int h)
+{
+ int i;
+ matrix X;
+ X.rows = n;
+ X.vals = calloc(X.rows, sizeof(float*));
+ X.cols = 0;
+
+ for(i = 0; i < n; ++i){
+ image im = load_image(paths[i], w, h, 1);
+ X.vals[i] = im.data;
+ X.cols = im.h*im.w*im.c;
+ }
+ return X;
+}
+
matrix load_image_paths(char **paths, int n, int w, int h)
{
int i;
@@ -57,30 +89,28 @@
for(i = 0; i < n; ++i){
image im = load_image_color(paths[i], w, h);
- translate_image(im, -128);
- scale_image(im, 1./128);
X.vals[i] = im.data;
X.cols = im.h*im.w*im.c;
}
return X;
}
-typedef struct box{
+typedef struct{
int id;
float x,y,w,h;
float left, right, top, bottom;
-} box;
+} box_label;
-box *read_boxes(char *filename, int *n)
+box_label *read_boxes(char *filename, int *n)
{
- box *boxes = calloc(1, sizeof(box));
+ box_label *boxes = calloc(1, sizeof(box_label));
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 = realloc(boxes, (count+1)*sizeof(box_label));
boxes[count].id = id;
boxes[count].x = x;
boxes[count].y = y;
@@ -97,12 +127,12 @@
return boxes;
}
-void randomize_boxes(box *b, int n)
+void randomize_boxes(box_label *b, int n)
{
int i;
for(i = 0; i < n; ++i){
- box swap = b[i];
- int index = rand()%n;
+ box_label swap = b[i];
+ int index = rand_r(&data_seed)%n;
b[i] = b[index];
b[index] = swap;
}
@@ -114,7 +144,7 @@
labelpath = find_replace(labelpath, ".jpg", ".txt");
labelpath = find_replace(labelpath, ".JPEG", ".txt");
int count = 0;
- box *boxes = read_boxes(labelpath, &count);
+ box_label *boxes = read_boxes(labelpath, &count);
randomize_boxes(boxes, count);
float x,y,w,h;
float left, top, right, bot;
@@ -165,23 +195,78 @@
w = constrain(0, 1, w);
h = constrain(0, 1, h);
- if (w == 0 || h == 0) continue;
- w = sqrt(w);
- h = sqrt(h);
+ if (w < .01 || h < .01) continue;
+ if(1){
+ //w = sqrt(w);
+ //h = sqrt(h);
+ w = pow(w, 1./2.);
+ h = pow(h, 1./2.);
+ }
int index = (i+j*num_boxes)*(4+classes+background);
if(truth[index+classes+background+2]) continue;
if(background) truth[index++] = 0;
truth[index+id] = 1;
index += classes;
- truth[index++] = y;
truth[index++] = x;
- truth[index++] = h;
+ truth[index++] = y;
truth[index++] = w;
+ truth[index++] = h;
}
free(boxes);
}
+void fill_truth_localization(char *path, float *truth, int classes, int flip, float dx, float dy, float sx, float sy)
+{
+ char *labelpath = find_replace(path, "objects", "object_labels");
+ labelpath = find_replace(labelpath, ".jpg", ".txt");
+ labelpath = find_replace(labelpath, ".JPEG", ".txt");
+ int count;
+ box_label *boxes = read_boxes(labelpath, &count);
+ box_label box = boxes[0];
+ free(boxes);
+ float x,y,w,h;
+ float left, top, right, bot;
+ int id;
+ int i;
+ for(i = 0; i < count; ++i){
+ left = box.left * sx - dx;
+ right = box.right * sx - dx;
+ top = box.top * sy - dy;
+ bot = box.bottom* sy - dy;
+ id = box.id;
+
+ if(flip){
+ float swap = left;
+ left = 1. - right;
+ right = 1. - swap;
+ }
+
+ left = constrain(0, 1, left);
+ right = constrain(0, 1, right);
+ top = constrain(0, 1, top);
+ bot = constrain(0, 1, bot);
+
+ x = (left+right)/2;
+ y = (top+bot)/2;
+ w = (right - left);
+ h = (bot - top);
+
+ if (x <= 0 || x >= 1 || y <= 0 || y >= 1) continue;
+
+ w = constrain(0, 1, w);
+ h = constrain(0, 1, h);
+ if (w == 0 || h == 0) continue;
+
+ int index = id*4;
+ truth[index++] = x;
+ truth[index++] = y;
+ truth[index++] = w;
+ truth[index++] = h;
+ }
+}
+
+
#define NUMCHARS 37
void print_letters(float *pred, int n)
@@ -279,6 +364,56 @@
}
}
+data load_data_localization(int n, char **paths, int m, int classes, int w, int h)
+{
+ char **random_paths = get_random_paths(paths, n, m);
+ int i;
+ data d;
+ d.shallow = 0;
+
+ d.X.rows = n;
+ d.X.vals = calloc(d.X.rows, sizeof(float*));
+ d.X.cols = h*w*3;
+
+ int k = (4*classes);
+ d.y = make_matrix(n, k);
+ for(i = 0; i < n; ++i){
+ image orig = load_image_color(random_paths[i], 0, 0);
+
+ int oh = orig.h;
+ int ow = orig.w;
+
+ int dw = 32;
+ int dh = 32;
+
+ int pleft = (rand_uniform() * dw);
+ int pright = (rand_uniform() * dw);
+ int ptop = (rand_uniform() * dh);
+ int pbot = (rand_uniform() * dh);
+
+ int swidth = ow - pleft - pright;
+ int sheight = oh - ptop - pbot;
+
+ float sx = (float)swidth / ow;
+ float sy = (float)sheight / oh;
+
+ int flip = rand_r(&data_seed)%2;
+ image cropped = crop_image(orig, pleft, ptop, swidth, sheight);
+ float dx = ((float)pleft/ow)/sx;
+ float dy = ((float)ptop /oh)/sy;
+
+ free_image(orig);
+ image sized = resize_image(cropped, w, h);
+ free_image(cropped);
+ if(flip) flip_image(sized);
+ d.X.vals[i] = sized.data;
+
+ fill_truth_localization(random_paths[i], d.y.vals[i], classes, flip, dx, dy, 1./sx, 1./sy);
+ }
+ free(random_paths);
+ return d;
+}
+
data load_data_detection_jitter_random(int n, char **paths, int m, int classes, int w, int h, int num_boxes, int background)
{
char **random_paths = get_random_paths(paths, n, m);
@@ -294,6 +429,7 @@
d.y = make_matrix(n, k);
for(i = 0; i < n; ++i){
image orig = load_image_color(random_paths[i], 0, 0);
+
int oh = orig.h;
int ow = orig.w;
@@ -311,7 +447,14 @@
float sx = (float)swidth / ow;
float sy = (float)sheight / oh;
- int flip = rand()%2;
+ /*
+ float angle = rand_uniform()*.1 - .05;
+ image rot = rotate_image(orig, angle);
+ free_image(orig);
+ orig = rot;
+ */
+
+ int flip = rand_r(&data_seed)%2;
image cropped = crop_image(orig, pleft, ptop, swidth, sheight);
float dx = ((float)pleft/ow)/sx;
float dy = ((float)ptop /oh)/sy;
@@ -328,13 +471,61 @@
return d;
}
+void *load_image_in_thread(void *ptr)
+{
+ load_args a = *(load_args*)ptr;
+ free(ptr);
+ *(a.im) = load_image_color(a.path, 0, 0);
+ *(a.resized) = resize_image(*(a.im), a.w, a.h);
+ return 0;
+}
+
+pthread_t load_image_thread(char *path, image *im, image *resized, int w, int h)
+{
+ pthread_t thread;
+ struct load_args *args = calloc(1, sizeof(struct load_args));
+ args->path = path;
+ args->w = w;
+ args->h = h;
+ args->im = im;
+ args->resized = resized;
+ if(pthread_create(&thread, 0, load_image_in_thread, args)) {
+ error("Thread creation failed");
+ }
+ return thread;
+}
+
+void *load_localization_thread(void *ptr)
+{
+ printf("Loading data: %d\n", rand_r(&data_seed));
+ struct load_args a = *(struct load_args*)ptr;
+ *a.d = load_data_localization(a.n, a.paths, a.m, a.classes, a.w, a.h);
+ free(ptr);
+ return 0;
+}
+
+pthread_t load_data_localization_thread(int n, char **paths, int m, int classes, int w, int h, 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->w = w;
+ args->h = h;
+ args->classes = classes;
+ args->d = d;
+ if(pthread_create(&thread, 0, load_localization_thread, args)) {
+ error("Thread creation failed");
+ }
+ return thread;
+}
+
void *load_detection_thread(void *ptr)
{
- printf("Loading data: %d\n", rand());
+ printf("Loading data: %d\n", rand_r(&data_seed));
struct load_args a = *(struct load_args*)ptr;
*a.d = load_data_detection_jitter_random(a.n, a.paths, a.m, a.classes, a.w, a.h, a.num_boxes, a.background);
- translate_data_rows(*a.d, -128);
- scale_data_rows(*a.d, 1./128);
free(ptr);
return 0;
}
@@ -360,6 +551,21 @@
return thread;
}
+data load_data_writing(char **paths, int n, int m, int w, int h)
+{
+ if(m) paths = get_random_paths(paths, n, m);
+ char **replace_paths = find_replace_paths(paths, n, ".png", "-label.png");
+ data d;
+ d.shallow = 0;
+ d.X = load_image_paths(paths, n, w, h);
+ d.y = load_image_paths_gray(replace_paths, n, w/8, h/8);
+ if(m) free(paths);
+ int i;
+ for(i = 0; i < n; ++i) free(replace_paths[i]);
+ free(replace_paths);
+ return d;
+}
+
data load_data(char **paths, int n, int m, char **labels, int k, int w, int h)
{
if(m) paths = get_random_paths(paths, n, m);
@@ -397,6 +603,31 @@
return thread;
}
+matrix concat_matrix(matrix m1, matrix m2)
+{
+ int i, count = 0;
+ matrix m;
+ m.cols = m1.cols;
+ m.rows = m1.rows+m2.rows;
+ m.vals = calloc(m1.rows + m2.rows, sizeof(float*));
+ for(i = 0; i < m1.rows; ++i){
+ m.vals[count++] = m1.vals[i];
+ }
+ for(i = 0; i < m2.rows; ++i){
+ m.vals[count++] = m2.vals[i];
+ }
+ return m;
+}
+
+data concat_data(data d1, data d2)
+{
+ data d;
+ d.shallow = 1;
+ d.X = concat_matrix(d1.X, d2.X);
+ d.y = concat_matrix(d1.y, d2.y);
+ return d;
+}
+
data load_categorical_data_csv(char *filename, int target, int k)
{
data d;
@@ -435,7 +666,7 @@
X.vals[i][j] = (double)bytes[j+1];
}
}
- translate_data_rows(d, -144);
+ translate_data_rows(d, -128);
scale_data_rows(d, 1./128);
//normalize_data_rows(d);
fclose(fp);
@@ -446,7 +677,7 @@
{
int j;
for(j = 0; j < n; ++j){
- int index = rand()%d.X.rows;
+ int index = rand_r(&data_seed)%d.X.rows;
memcpy(X+j*d.X.cols, d.X.vals[index], d.X.cols*sizeof(float));
memcpy(y+j*d.y.cols, d.y.vals[index], d.y.cols*sizeof(float));
}
@@ -491,7 +722,7 @@
fclose(fp);
}
//normalize_data_rows(d);
- translate_data_rows(d, -144);
+ translate_data_rows(d, -128);
scale_data_rows(d, 1./128);
return d;
}
@@ -500,7 +731,7 @@
{
int i;
for(i = d.X.rows-1; i > 0; --i){
- int index = rand()%i;
+ int index = rand_r(&data_seed)%i;
float *swap = d.X.vals[index];
d.X.vals[index] = d.X.vals[i];
d.X.vals[i] = swap;
--
Gitblit v1.10.0