From 08d6910521d9aa05a11d0db154ae70874e47d0e1 Mon Sep 17 00:00:00 2001
From: Alexey <AlexeyAB@users.noreply.github.com>
Date: Wed, 09 Aug 2017 21:06:24 +0000
Subject: [PATCH] Update Readme.md
---
src/data.h | 25 +++++++++++++++++--------
1 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/src/data.h b/src/data.h
index 1220be0..618d89c 100644
--- a/src/data.h
+++ b/src/data.h
@@ -2,11 +2,14 @@
#define DATA_H
#include <pthread.h>
+#if defined(_MSC_VER) && _MSC_VER < 1900
+ #define inline __inline
+#endif
+
#include "matrix.h"
#include "list.h"
#include "image.h"
-
-extern unsigned int data_seed;
+#include "tree.h"
static inline float distance_from_edge(int x, int max)
{
@@ -23,7 +26,6 @@
int w, h;
matrix X;
matrix y;
- int *indexes;
int shallow;
int *num_boxes;
box **boxes;
@@ -34,6 +36,7 @@
} data_type;
typedef struct load_args{
+ int threads;
char **paths;
char *path;
int n;
@@ -52,12 +55,15 @@
int scale;
float jitter;
float angle;
+ float aspect;
float saturation;
float exposure;
+ float hue;
data *d;
image *im;
image *resized;
data_type type;
+ tree *hierarchy;
} load_args;
typedef struct{
@@ -68,17 +74,19 @@
void free_data(data d);
+pthread_t load_data(load_args args);
+
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 w, int h, int boxes, int classes, float jitter);
-data load_data_tag(char **paths, int n, int m, int k, int min, int max, int size, float angle, float exposure, float saturation);
-data load_data_augment(char **paths, int n, int m, char **labels, int k, int min, int max, int size, float angle, float exposure, float saturation);
+data load_data_old(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 w, int h, int boxes, int classes, float jitter, float hue, float saturation, float exposure);
+data load_data_tag(char **paths, int n, int m, int k, int min, int max, int size, float angle, float aspect, float hue, float saturation, float exposure);
+matrix load_image_augment_paths(char **paths, int n, int min, int max, int size, float angle, float aspect, float hue, float saturation, float exposure);
data load_data_super(char **paths, int n, int m, int w, int h, int scale);
-data load_data_study(char **paths, int n, int m, char **labels, int k, int min, int max, int size, float angle, float exposure, float saturation);
+data load_data_augment(char **paths, int n, int m, char **labels, int k, tree *hierarchy, int min, int max, int size, float angle, float aspect, float hue, float saturation, float exposure);
data load_go(char *filename);
box_label *read_boxes(char *filename, int *n);
@@ -90,6 +98,7 @@
list *get_paths(char *filename);
char **get_labels(char *filename);
void get_random_batch(data d, int n, float *X, float *y);
+data get_data_part(data d, int part, int total);
data get_random_data(data d, int num);
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);
--
Gitblit v1.10.0