From a4485b8a6656c2a2fa0b78ca7c035523c8149b8c Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Wed, 10 Jun 2015 15:49:25 +0000
Subject: [PATCH] Merge branch 'master' of pjreddie.com:jnet
---
src/data.h | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/src/data.h b/src/data.h
index f38a8d0..bda804f 100644
--- a/src/data.h
+++ b/src/data.h
@@ -5,6 +5,8 @@
#include "matrix.h"
#include "list.h"
+extern unsigned int data_seed;
+
static inline float distance_from_edge(int x, int max)
{
int dx = (max/2) - x;
@@ -27,17 +29,20 @@
void free_data(data d);
void print_letters(float *pred, int n);
-data load_data_captcha(char **paths, int n, int m, int k, int h, int w);
-data load_data_captcha_encode(char **paths, int n, int m, int h, int w);
-data load_data(char **paths, int n, int m, char **labels, int k, int h, int w);
-pthread_t load_data_thread(char **paths, int n, int m, char **labels, int k, int h, int w, data *d);
+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_data_detection_thread(int n, char **paths, int m, int classes, int h, int w, int nh, int nw, int background, data *d);
-data load_data_detection_jitter_random(int n, char **paths, int m, int classes, int h, int w, int num_boxes, int background);
+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_image_pathfile(char *filename, char **labels, int k, int h, int w);
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);
@@ -48,5 +53,6 @@
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