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 | 37 ++++++++++++++++++++++++++++++++-----
1 files changed, 32 insertions(+), 5 deletions(-)
diff --git a/src/data.c b/src/data.c
index ca5f4a6..dafcc98 100644
--- a/src/data.c
+++ b/src/data.c
@@ -8,7 +8,7 @@
unsigned int data_seed;
-struct load_args{
+typedef struct load_args{
char **paths;
int n;
int m;
@@ -22,7 +22,10 @@
int classes;
int background;
data *d;
-};
+ char *path;
+ image *im;
+ image *resized;
+} load_args;
list *get_paths(char *filename)
{
@@ -69,7 +72,7 @@
X.cols = 0;
for(i = 0; i < n; ++i){
- image im = load_image(paths[i], w, h);
+ image im = load_image(paths[i], w, h, 1);
X.vals[i] = im.data;
X.cols = im.h*im.w*im.c;
}
@@ -468,6 +471,30 @@
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));
@@ -527,11 +554,11 @@
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");
+ 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/4, h/4);
+ 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]);
--
Gitblit v1.10.0