From 08b757a0bf76efe8c76b453063a1bb19315bcaa6 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Wed, 14 Jan 2015 20:18:57 +0000
Subject: [PATCH] Stable, needs to be way faster
---
src/data.c | 58 +++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 45 insertions(+), 13 deletions(-)
diff --git a/src/data.c b/src/data.c
index 3f74f6b..ec9f9a7 100644
--- a/src/data.c
+++ b/src/data.c
@@ -6,6 +6,20 @@
#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;
+ float scale;
+ data *d;
+};
+
list *get_paths(char *filename)
{
char *path;
@@ -58,11 +72,14 @@
{
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_image_paths(char **paths, int n, int h, int w)
@@ -97,7 +114,7 @@
{
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;
@@ -165,11 +182,36 @@
jitter_image(a,224,224,dy,dx);
}
d.X.cols = 224*224*3;
- // print_matrix(d.y);
free(random_paths);
return d;
}
+void *load_detection_thread(void *ptr)
+{
+ struct load_args a = *(struct load_args*)ptr;
+ *a.d = load_data_detection_jitter_random(a.n, a.paths, a.m, a.h, a.w, a.nh, a.nw, a.scale);
+ free(ptr);
+ return 0;
+}
+
+pthread_t load_data_detection_thread(int n, char **paths, int m, int h, int w, int nh, int nw, float scale, 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->scale = scale;
+ args->d = d;
+ if(pthread_create(&thread, 0, load_detection_thread, args)) {
+ error("Thread creation failed");
+ }
+ return thread;
+}
data load_data_detection_random(int n, char **paths, int m, int h, int w, int nh, int nw, float scale)
{
@@ -193,21 +235,11 @@
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);
+ free(ptr);
return 0;
}
--
Gitblit v1.10.0