From b5936b499abc94c0efffbcc99b5698574b59d860 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Sat, 05 Sep 2015 00:52:44 +0000
Subject: [PATCH] lots of stuff
---
src/data.h | 61 ++++++++++++++++++++++++++++--
1 files changed, 57 insertions(+), 4 deletions(-)
diff --git a/src/data.h b/src/data.h
index 366a382..216ab0c 100644
--- a/src/data.h
+++ b/src/data.h
@@ -1,8 +1,23 @@
#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;
@@ -10,14 +25,51 @@
int shallow;
} data;
+typedef enum {
+ CLASSIFICATION_DATA, DETECTION_DATA, CAPTCHA_DATA, REGION_DATA, IMAGE_DATA, COMPARE_DATA
+} data_type;
+
+typedef struct load_args{
+ char **paths;
+ char *path;
+ int n;
+ int m;
+ char **labels;
+ 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;
+
+typedef struct{
+ int id;
+ float x,y,w,h;
+ float left, right, top, bottom;
+} box_label;
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, char **labels, 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);
+
+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);
+
+box_label *read_boxes(char *filename, int *n);
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);
@@ -28,5 +80,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