From cb1f33c6ae840e8dc0f43518daf76e6ed01034f0 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Mon, 08 Dec 2014 19:48:57 +0000
Subject: [PATCH] Fixed race condition in server
---
src/data.h | 32 +++++++++++++++++++++++---------
1 files changed, 23 insertions(+), 9 deletions(-)
diff --git a/src/data.h b/src/data.h
index c01384c..b9707c9 100644
--- a/src/data.h
+++ b/src/data.h
@@ -1,18 +1,32 @@
#ifndef DATA_H
#define DATA_H
-#include "image.h"
+#include "matrix.h"
+#include "list.h"
typedef struct{
- int n;
- image *images;
- double **truth;
-} batch;
+ matrix X;
+ matrix y;
+ int shallow;
+} data;
-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);
+data load_data(char **paths, int n, char **labels, int k, int h, int w);
+data load_data_random(int n, char **paths, int m, char **labels, int k, int h, int w);
+data load_data_detection_random(int n, char **paths, int m, int h, int w, int nh, int nw, float scale);
+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();
+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);
#endif
--
Gitblit v1.10.0