From b13ad6d5fd23f68f506c14ede4282126d893702b Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Wed, 05 Nov 2014 22:49:58 +0000
Subject: [PATCH] Can validate on imagenet now
---
src/data.c | 40 ++++++++++++++++++++++++++++++++++++++--
1 files changed, 38 insertions(+), 2 deletions(-)
diff --git a/src/data.c b/src/data.c
index aa8fecf..a5da9d3 100644
--- a/src/data.c
+++ b/src/data.c
@@ -41,9 +41,11 @@
d.y = make_matrix(n, k);
for(i = 0; i < n; ++i){
- image im = load_image(paths[i], h, w);
+ image im = load_image_color(paths[i], h, w);
d.X.vals[i] = im.data;
d.X.cols = im.h*im.w*im.c;
+ }
+ for(i = 0; i < n; ++i){
fill_truth(paths[i], labels, k, d.y.vals[i]);
}
return d;
@@ -60,6 +62,14 @@
return d;
}
+char **get_labels(char *filename)
+{
+ list *plist = get_paths(filename);
+ char **labels = (char **)list_to_array(plist);
+ free_list(plist);
+ return labels;
+}
+
void free_data(data d)
{
if(!d.shallow){
@@ -73,6 +83,7 @@
data load_data_image_pathfile_part(char *filename, int part, int total, char **labels, int k, int h, int w)
{
+ clock_t time = clock();
list *plist = get_paths(filename);
char **paths = (char **)list_to_array(plist);
int start = part*plist->size/total;
@@ -84,6 +95,20 @@
return d;
}
+data load_data_random(int n, char **paths, int m, char **labels, int k, int h, int w)
+{
+ char **random_paths = calloc(n, sizeof(char*));
+ int i;
+ for(i = 0; i < n; ++i){
+ int index = rand()%m;
+ random_paths[i] = paths[index];
+ if(i == 0) printf("%s\n", paths[index]);
+ }
+ data d = load_data_image_paths(random_paths, n, labels, k, h, w);
+ free(random_paths);
+ return d;
+}
+
data load_data_image_pathfile_random(char *filename, int n, char **labels, int k, int h, int w)
{
int i;
@@ -148,7 +173,7 @@
return d;
}
-void get_batch(data d, int n, float *X, float *y)
+void get_random_batch(data d, int n, float *X, float *y)
{
int j;
for(j = 0; j < n; ++j){
@@ -158,6 +183,17 @@
}
}
+void get_next_batch(data d, int n, int offset, float *X, float *y)
+{
+ int j;
+ for(j = 0; j < n; ++j){
+ int index = offset + j;
+ memcpy(X+j*d.X.cols, d.X.vals[index], d.X.cols*sizeof(float));
+ memcpy(y+j*d.y.cols, d.y.vals[index], d.y.cols*sizeof(float));
+ }
+}
+
+
data load_all_cifar10()
{
data d;
--
Gitblit v1.10.0