From 47528e37cf29e0f9da6885213e5aee044bed84ef Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Wed, 15 Apr 2015 08:04:38 +0000
Subject: [PATCH] crop layer scaling and trans on cpu

---
 src/data.c |   35 +++++++++++++++++++++++------------
 1 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/src/data.c b/src/data.c
index c454d84..012d7cf 100644
--- a/src/data.c
+++ b/src/data.c
@@ -6,6 +6,8 @@
 #include <stdlib.h>
 #include <string.h>
 
+unsigned int data_seed;
+
 struct load_args{
     char **paths;
     int n;
@@ -40,7 +42,7 @@
     char **random_paths = calloc(n, sizeof(char*));
     int i;
     for(i = 0; i < n; ++i){
-        int index = rand()%m;
+        int index = rand_r(&data_seed)%m;
         random_paths[i] = paths[index];
         if(i == 0) printf("%s\n", paths[index]);
     }
@@ -100,7 +102,7 @@
     int i;
     for(i = 0; i < n; ++i){
         box swap = b[i];
-        int index = rand()%n;
+        int index = rand_r(&data_seed)%n;
         b[i] = b[index];
         b[index] = swap;
     }
@@ -292,6 +294,12 @@
     d.y = make_matrix(n, k);
     for(i = 0; i < n; ++i){
         image orig = load_image_color(random_paths[i], 0, 0);
+        float exposure = rand_uniform()+1;
+        if(rand_uniform() > .5) exposure = 1/exposure;
+
+        float saturation = rand_uniform()+1;
+        if(rand_uniform() > .5) saturation = 1/saturation;
+
         int oh = orig.h;
         int ow = orig.w;
 
@@ -308,8 +316,15 @@
 
         float sx = (float)swidth  / ow;
         float sy = (float)sheight / oh;
+        
+        /*
+        float angle = rand_uniform()*.1 - .05;
+        image rot = rotate_image(orig, angle);
+        free_image(orig);
+        orig = rot;
+        */
 
-        int flip = rand()%2;
+        int flip = rand_r(&data_seed)%2;
         image cropped = crop_image(orig, pleft, ptop, swidth, sheight);
         float dx = ((float)pleft/ow)/sx;
         float dy = ((float)ptop /oh)/sy;
@@ -328,11 +343,9 @@
 
 void *load_detection_thread(void *ptr)
 {
-    printf("Loading data: %d\n", rand());
+    printf("Loading data: %d\n", rand_r(&data_seed));
     struct load_args a = *(struct load_args*)ptr;
     *a.d = load_data_detection_jitter_random(a.n, a.paths, a.m, a.classes, a.w, a.h, a.num_boxes, a.background);
-    translate_data_rows(*a.d, -128);
-    scale_data_rows(*a.d, 1./128);
     free(ptr);
     return 0;
 }
@@ -373,8 +386,6 @@
 {
     struct load_args a = *(struct load_args*)ptr;
     *a.d = load_data(a.paths, a.n, a.m, a.labels, a.k, a.w, a.h);
-    translate_data_rows(*a.d, -128);
-    scale_data_rows(*a.d, 1./128);
     free(ptr);
     return 0;
 }
@@ -435,7 +446,7 @@
             X.vals[i][j] = (double)bytes[j+1];
         }
     }
-    translate_data_rows(d, -144);
+    translate_data_rows(d, -128);
     scale_data_rows(d, 1./128);
     //normalize_data_rows(d);
     fclose(fp);
@@ -446,7 +457,7 @@
 {
     int j;
     for(j = 0; j < n; ++j){
-        int index = rand()%d.X.rows;
+        int index = rand_r(&data_seed)%d.X.rows;
         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));
     }
@@ -491,7 +502,7 @@
         fclose(fp);
     }
     //normalize_data_rows(d);
-    translate_data_rows(d, -144);
+    translate_data_rows(d, -128);
     scale_data_rows(d, 1./128);
     return d;
 }
@@ -500,7 +511,7 @@
 {
     int i;
     for(i = d.X.rows-1; i > 0; --i){
-        int index = rand()%i;
+        int index = rand_r(&data_seed)%i;
         float *swap = d.X.vals[index];
         d.X.vals[index] = d.X.vals[i];
         d.X.vals[i] = swap;

--
Gitblit v1.10.0