From 9e98f1b68e2ebf618d7f65a0985f5efd11e413f9 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Thu, 18 Dec 2014 18:47:33 +0000
Subject: [PATCH] Not sure
---
src/data.c | 99 ++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 85 insertions(+), 14 deletions(-)
diff --git a/src/data.c b/src/data.c
index 79cfcec..86e59ef 100644
--- a/src/data.c
+++ b/src/data.c
@@ -19,7 +19,7 @@
return lines;
}
-void fill_truth_detection(char *path, float *truth, int height, int width, int num_height, int num_width, float scale)
+void fill_truth_detection(char *path, float *truth, int height, int width, int num_height, int num_width, float scale, int dx, int dy)
{
int box_height = height/num_height;
int box_width = width/num_width;
@@ -29,8 +29,16 @@
if(!file) file_error(labelpath);
int x, y, h, w;
while(fscanf(file, "%d %d %d %d", &x, &y, &w, &h) == 4){
+ 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 = (float)(x%box_width)/box_height;
float dh = (float)(y%box_width)/box_width;
float sh = h/scale;
@@ -89,7 +97,7 @@
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);
+ fill_truth_detection(paths[i], y.vals[i], height, width, num_height, num_width, scale,0,0);
}
return y;
}
@@ -128,6 +136,33 @@
}
}
+data load_data_detection_jitter_random(int n, char **paths, int m, int h, int w, int nh, int nw, float scale)
+{
+ 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]);
+ }
+ data d;
+ d.shallow = 0;
+ d.X = load_image_paths(random_paths, n, h, w);
+ int k = nh*nw*5;
+ d.y = make_matrix(n, k);
+ for(i = 0; i < n; ++i){
+ int dx = rand()%32;
+ int dy = rand()%32;
+ fill_truth_detection(random_paths[i], d.y.vals[i], 224, 224, nh, nw, scale, dx, dy);
+
+ image a = float_to_image(h, w, 3, d.X.vals[i]);
+ jitter_image(a,224,224,dy,dx);
+ }
+ free(random_paths);
+ return d;
+}
+
+
data load_data_detection_random(int n, char **paths, int m, int h, int w, int nh, int nw, float scale)
{
char **random_paths = calloc(n, sizeof(char*));
@@ -145,16 +180,7 @@
return d;
}
-data load_data(char **paths, int n, char **labels, int k, int h, int w)
-{
- data d;
- d.shallow = 0;
- d.X = load_image_paths(paths, n, h, w);
- d.y = load_labels_paths(paths, n, labels, k);
- return d;
-}
-
-data load_data_random(int n, char **paths, int m, char **labels, int k, int h, int w)
+char **get_random_paths(char **paths, int n, int m)
{
char **random_paths = calloc(n, sizeof(char*));
int i;
@@ -163,11 +189,56 @@
random_paths[i] = paths[index];
if(i == 0) printf("%s\n", paths[index]);
}
- data d = load_data(random_paths, n, labels, k, h, w);
- free(random_paths);
+ return random_paths;
+}
+
+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;
}
+struct load_args{
+ char **paths;
+ int n;
+ int m;
+ char **labels;
+ int k;
+ int h;
+ int w;
+ data *d;
+};
+
+void *load_in_thread(void *ptr)
+{
+ 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);
+ 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");
+ }
+ return thread;
+}
+
data load_categorical_data_csv(char *filename, int target, int k)
{
data d;
--
Gitblit v1.10.0