From 9d42f49a240136a8cd643cdc1f98230d4f22b05e Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Tue, 25 Aug 2015 01:27:42 +0000
Subject: [PATCH] changing data loading
---
src/data.h | 33 ++++++++++++++++++++++++++-------
1 files changed, 26 insertions(+), 7 deletions(-)
diff --git a/src/data.h b/src/data.h
index 993a7a7..f71e04a 100644
--- a/src/data.h
+++ b/src/data.h
@@ -19,26 +19,45 @@
return dist;
}
-
typedef struct{
matrix X;
matrix y;
int shallow;
} data;
+typedef enum {
+ CLASSIFICATION_DATA, DETECTION_DATA, CAPTCHA_DATA, REGION_DATA, IMAGE_DATA
+} data_type;
+
+typedef struct load_args{
+ char **paths;
+ char *path;
+ int n;
+ int m;
+ char **labels;
+ int k;
+ int h;
+ int w;
+ int nh;
+ int nw;
+ int num_boxes;
+ int classes;
+ int background;
+ data *d;
+ image *im;
+ image *resized;
+ data_type type;
+} load_args;
void free_data(data d);
+pthread_t load_data_in_thread(load_args args);
+
void print_letters(float *pred, int n);
data load_data_captcha(char **paths, int n, int m, int k, int w, int h);
data load_data_captcha_encode(char **paths, int n, int m, int w, int h);
data load_data(char **paths, int n, int m, char **labels, int k, int w, int h);
-pthread_t load_data_thread(char **paths, int n, int m, char **labels, int k, int w, int h, data *d);
-pthread_t load_image_thread(char *path, image *im, image *resized, int w, int h);
-
-pthread_t load_data_detection_thread(int n, char **paths, int m, int classes, int w, int h, int nh, int nw, int background, data *d);
-data load_data_detection_jitter_random(int n, char **paths, int m, int classes, int w, int h, int num_boxes, int background);
-pthread_t load_data_localization_thread(int n, char **paths, int m, int classes, int w, int h, data *d);
+data load_data_detection(int n, char **paths, int m, int classes, int w, int h, int num_boxes, int background);
data load_cifar10_data(char *filename);
data load_all_cifar10();
--
Gitblit v1.10.0