From cd8d53df21f3ad2810add2a8cff766c745f55a17 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Fri, 09 May 2014 22:14:52 +0000
Subject: [PATCH] So there WAS this huge bug. Gone now
---
src/data.c | 51 ++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 42 insertions(+), 9 deletions(-)
diff --git a/src/data.c b/src/data.c
index 2c5932b..6d2061e 100644
--- a/src/data.c
+++ b/src/data.c
@@ -1,5 +1,4 @@
#include "data.h"
-#include "list.h"
#include "utils.h"
#include "image.h"
@@ -11,6 +10,7 @@
{
char *path;
FILE *file = fopen(filename, "r");
+ if(!file) file_error(filename);
list *lines = make_list();
while((path=fgetl(file))){
list_insert(lines, path);
@@ -30,7 +30,7 @@
}
}
-data load_data_image_paths(char **paths, int n, char **labels, int k)
+data load_data_image_paths(char **paths, int n, char **labels, int k, int h, int w)
{
int i;
data d;
@@ -40,7 +40,7 @@
d.y = make_matrix(n, k);
for(i = 0; i < n; ++i){
- image im = load_image(paths[i]);
+ image im = load_image(paths[i], h, w);
d.X.vals[i] = im.data;
d.X.cols = im.h*im.w*im.c;
fill_truth(paths[i], labels, k, d.y.vals[i]);
@@ -48,11 +48,11 @@
return d;
}
-data load_data_image_pathfile(char *filename, char **labels, int k)
+data load_data_image_pathfile(char *filename, char **labels, int k, int h, int w)
{
list *plist = get_paths(filename);
char **paths = (char **)list_to_array(plist);
- data d = load_data_image_paths(paths, plist->size, labels, k);
+ data d = load_data_image_paths(paths, plist->size, labels, k, h, w);
free_list_contents(plist);
free_list(plist);
free(paths);
@@ -70,20 +70,20 @@
}
}
-data load_data_image_pathfile_part(char *filename, int part, int total, char **labels, int k)
+data load_data_image_pathfile_part(char *filename, int part, int total, char **labels, int k, int h, int w)
{
list *plist = get_paths(filename);
char **paths = (char **)list_to_array(plist);
int start = part*plist->size/total;
int end = (part+1)*plist->size/total;
- data d = load_data_image_paths(paths+start, end-start, labels, k);
+ data d = load_data_image_paths(paths+start, end-start, labels, k, h, w);
free_list_contents(plist);
free_list(plist);
free(paths);
return d;
}
-data load_data_image_pathfile_random(char *filename, int n, char **labels, int k)
+data load_data_image_pathfile_random(char *filename, int n, char **labels, int k, int h, int w)
{
int i;
list *plist = get_paths(filename);
@@ -92,8 +92,9 @@
for(i = 0; i < n; ++i){
int index = rand()%plist->size;
random_paths[i] = paths[index];
+ if(i == 0) printf("%s\n", paths[index]);
}
- data d = load_data_image_paths(random_paths, n, labels, k);
+ data d = load_data_image_paths(random_paths, n, labels, k, h, w);
free_list_contents(plist);
free_list(plist);
free(paths);
@@ -118,6 +119,30 @@
return d;
}
+data load_cifar10_data(char *filename)
+{
+ data d;
+ d.shallow = 0;
+ long i,j;
+ matrix X = make_matrix(10000, 3072);
+ matrix y = make_matrix(10000, 10);
+ d.X = X;
+ d.y = y;
+
+ FILE *fp = fopen(filename, "rb");
+ for(i = 0; i < 10000; ++i){
+ unsigned char bytes[3073];
+ fread(bytes, 1, 3073, fp);
+ int class = bytes[0];
+ y.vals[i][class] = 1;
+ for(j = 0; j < X.cols; ++j){
+ X.vals[i][j] = (double)bytes[j+1];
+ }
+ }
+ fclose(fp);
+ return d;
+}
+
void randomize_data(data d)
{
int i;
@@ -133,6 +158,14 @@
}
}
+void scale_data_rows(data d, float s)
+{
+ int i;
+ for(i = 0; i < d.X.rows; ++i){
+ scale_array(d.X.vals[i], d.X.cols, s);
+ }
+}
+
void normalize_data_rows(data d)
{
int i;
--
Gitblit v1.10.0