From d0b9326a352ed2fbc3ae66fdef40b4533a2f211d Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Tue, 11 Aug 2015 06:22:27 +0000
Subject: [PATCH] Hacks to get nightmare to not break gridsizing
---
src/data.c | 17 -----------------
1 files changed, 0 insertions(+), 17 deletions(-)
diff --git a/src/data.c b/src/data.c
index 2b61853..6a41d13 100644
--- a/src/data.c
+++ b/src/data.c
@@ -197,8 +197,6 @@
h = constrain(0, 1, h);
if (w < .01 || h < .01) continue;
if(1){
- //w = sqrt(w);
- //h = sqrt(h);
w = pow(w, 1./2.);
h = pow(h, 1./2.);
}
@@ -425,18 +423,10 @@
d.X.vals = calloc(d.X.rows, sizeof(float*));
d.X.cols = h*w*3;
- clock_t time;
- clock_t load = 0;
- clock_t resize = 0;
- clock_t crop = 0;
-
int k = num_boxes*num_boxes*(4+classes+background);
d.y = make_matrix(n, k);
for(i = 0; i < n; ++i){
- time=clock();
image orig = load_image_color(random_paths[i], 0, 0);
- load += clock() - time;
- time = clock();
int oh = orig.h;
int ow = orig.w;
@@ -465,9 +455,6 @@
int flip = rand_r(&data_seed)%2;
image cropped = crop_image(orig, pleft, ptop, swidth, sheight);
- crop += clock() - time;
- time = clock();
-
float dx = ((float)pleft/ow)/sx;
float dy = ((float)ptop /oh)/sy;
@@ -475,15 +462,11 @@
if(flip) flip_image(sized);
d.X.vals[i] = sized.data;
- resize += clock() - time;
- time = clock();
-
fill_truth_detection(random_paths[i], d.y.vals[i], classes, num_boxes, flip, background, dx, dy, 1./sx, 1./sy);
free_image(orig);
free_image(cropped);
}
- printf("load: %f, crop: %f, resize: %f\n", sec(load), sec(crop), sec(resize));
free(random_paths);
return d;
}
--
Gitblit v1.10.0