From eaf033c0570308dfcd381ed61d274c7f5add7cfc Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Mon, 09 Nov 2015 21:27:02 +0000
Subject: [PATCH] Added tiny yolo model
---
src/data.h | 44 +++++++++++++++++++++++++++++++++++++++-----
1 files changed, 39 insertions(+), 5 deletions(-)
diff --git a/src/data.h b/src/data.h
index 8e3e1d9..0dacea2 100644
--- a/src/data.h
+++ b/src/data.h
@@ -4,6 +4,7 @@
#include "matrix.h"
#include "list.h"
+#include "image.h"
extern unsigned int data_seed;
@@ -18,28 +19,60 @@
return dist;
}
-
typedef struct{
matrix X;
matrix y;
int shallow;
} data;
+typedef enum {
+ CLASSIFICATION_DATA, DETECTION_DATA, CAPTCHA_DATA, REGION_DATA, IMAGE_DATA, COMPARE_DATA, WRITING_DATA
+} data_type;
+
+typedef struct load_args{
+ char **paths;
+ char *path;
+ int n;
+ int m;
+ char **labels;
+ int h;
+ int w;
+ int out_w;
+ int out_h;
+ int nh;
+ int nw;
+ int num_boxes;
+ int classes;
+ int background;
+ float jitter;
+ 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);
+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);
-pthread_t load_data_thread(char **paths, int n, int m, char **labels, int k, int w, int h, data *d);
+data load_data_detection(int n, char **paths, int m, int classes, int w, int h, 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);
-
+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, int out_w, int out_h);
+
list *get_paths(char *filename);
char **get_labels(char *filename);
void get_random_batch(data d, int n, float *X, float *y);
@@ -50,5 +83,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