From 0f7f2899b65343e56b0a1188f703d459d824d398 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Mon, 16 Nov 2015 03:51:26 +0000
Subject: [PATCH] Fix for cuda 7.5
---
src/data.c | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/data.c b/src/data.c
index 2853d72..9b84c5a 100644
--- a/src/data.c
+++ b/src/data.c
@@ -153,7 +153,9 @@
{
char *labelpath = find_replace(path, "images", "labels");
labelpath = find_replace(labelpath, "JPEGImages", "labels");
+
labelpath = find_replace(labelpath, ".jpg", ".txt");
+ labelpath = find_replace(labelpath, ".JPG", ".txt");
labelpath = find_replace(labelpath, ".JPEG", ".txt");
int count = 0;
box_label *boxes = read_boxes(labelpath, &count);
@@ -366,7 +368,7 @@
}
}
-data load_data_region(int n, char **paths, int m, int w, int h, int size, int classes)
+data load_data_region(int n, char **paths, int m, int w, int h, int size, int classes, float jitter)
{
char **random_paths = get_random_paths(paths, n, m);
int i;
@@ -385,8 +387,8 @@
int oh = orig.h;
int ow = orig.w;
- int dw = ow/10;
- int dh = oh/10;
+ int dw = (ow*jitter);
+ int dh = (oh*jitter);
int pleft = (rand_uniform() * 2*dw - dw);
int pright = (rand_uniform() * 2*dw - dw);
@@ -547,7 +549,7 @@
check_error(status);
#endif
- printf("Loading data: %d\n", rand_r(&data_seed));
+ //printf("Loading data: %d\n", rand_r(&data_seed));
load_args a = *(struct load_args*)ptr;
if (a.type == CLASSIFICATION_DATA){
*a.d = load_data(a.paths, a.n, a.m, a.labels, a.classes, a.w, a.h);
@@ -556,7 +558,7 @@
} else if (a.type == WRITING_DATA){
*a.d = load_data_writing(a.paths, a.n, a.m, a.w, a.h, a.out_w, a.out_h);
} else if (a.type == REGION_DATA){
- *a.d = load_data_region(a.n, a.paths, a.m, a.w, a.h, a.num_boxes, a.classes);
+ *a.d = load_data_region(a.n, a.paths, a.m, a.w, a.h, a.num_boxes, a.classes, a.jitter);
} else if (a.type == COMPARE_DATA){
*a.d = load_data_compare(a.n, a.paths, a.m, a.classes, a.w, a.h);
} else if (a.type == IMAGE_DATA){
@@ -572,9 +574,7 @@
pthread_t thread;
struct load_args *ptr = calloc(1, sizeof(struct load_args));
*ptr = args;
- if(pthread_create(&thread, 0, load_thread, ptr)) {
- error("Thread creation failed");
- }
+ if(pthread_create(&thread, 0, load_thread, ptr)) error("Thread creation failed");
return thread;
}
--
Gitblit v1.10.0