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 | 75 ++++++++++++++++++++++++++++++++++---
1 files changed, 68 insertions(+), 7 deletions(-)
diff --git a/src/data.h b/src/data.h
index c01384c..f71e04a 100644
--- a/src/data.h
+++ b/src/data.h
@@ -1,18 +1,79 @@
#ifndef DATA_H
#define DATA_H
+#include <pthread.h>
+#include "matrix.h"
+#include "list.h"
#include "image.h"
+extern unsigned int data_seed;
+
+static inline float distance_from_edge(int x, int max)
+{
+ int dx = (max/2) - x;
+ if (dx < 0) dx = -dx;
+ dx = (max/2) + 1 - dx;
+ dx *= 2;
+ float dist = (float)dx/max;
+ if (dist > 1) dist = 1;
+ 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;
- image *images;
- double **truth;
-} batch;
+ 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;
-batch get_all_data(char *filename, char **labels, int k);
-batch random_batch(char *filename, int n, char **labels, int k);
-batch get_batch(char *filename, int curr, int total, char **labels, int k);
-void free_batch(batch b);
+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);
+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();
+
+data load_data_writing(char **paths, int n, int m, int w, int h);
+
+list *get_paths(char *filename);
+char **get_labels(char *filename);
+void get_random_batch(data d, int n, float *X, float *y);
+void get_next_batch(data d, int n, int offset, float *X, float *y);
+data load_categorical_data_csv(char *filename, int target, int k);
+void normalize_data_rows(data d);
+void scale_data_rows(data d, float s);
+void translate_data_rows(data d, float s);
+void randomize_data(data d);
+data *split_data(data d, int part, int total);
+data concat_data(data d1, data d2);
#endif
--
Gitblit v1.10.0