From 351996d9f0390ef44412fa678bc7a073a94e23e5 Mon Sep 17 00:00:00 2001
From: AlexeyAB <alexeyab84@gmail.com>
Date: Thu, 16 Mar 2017 18:49:36 +0000
Subject: [PATCH] Fixed memory leak in DLL, added load_image() & free_image(), added read_names_from_file()
---
src/data.c | 49 ++++++++++++++++++++++++++++++++++---------------
1 files changed, 34 insertions(+), 15 deletions(-)
diff --git a/src/data.c b/src/data.c
index a2390a9..c64bbce 100644
--- a/src/data.c
+++ b/src/data.c
@@ -29,7 +29,7 @@
int i;
pthread_mutex_lock(&mutex);
for(i = 0; i < n; ++i){
- int index = rand()%m;
+ int index = random_gen()%m;
indexes[i] = index;
random_paths[i] = paths[index];
if(i == 0) printf("%s\n", paths[index]);
@@ -39,15 +39,24 @@
}
*/
+inline unsigned int random_gen()
+{
+ unsigned int Num = 0;
+ rand_s(&Num);
+ return Num;
+}
+
char **get_random_paths(char **paths, int n, int m)
{
char **random_paths = calloc(n, sizeof(char*));
int i;
pthread_mutex_lock(&mutex);
- for(i = 0; i < n; ++i){
- int index = rand()%m;
+ //printf("n = %d \n", n);
+ for(i = 0; i < n; ++i){
+ int index = random_gen() % m;
random_paths[i] = paths[index];
//if(i == 0) printf("%s\n", paths[index]);
+ //printf("grp: %s\n", paths[index]);
}
pthread_mutex_unlock(&mutex);
return random_paths;
@@ -113,7 +122,7 @@
for(i = 0; i < n; ++i){
image im = load_image_color(paths[i], 0, 0);
image crop = random_augment_image(im, angle, aspect, min, max, size);
- int flip = rand()%2;
+ int flip = random_gen()%2;
if (flip) flip_image(crop);
random_distort_image(crop, hue, saturation, exposure);
@@ -161,7 +170,7 @@
int i;
for(i = 0; i < n; ++i){
box_label swap = b[i];
- int index = rand()%n;
+ int index = random_gen()%n;
b[i] = b[index];
b[index] = swap;
}
@@ -171,6 +180,13 @@
{
int i;
for(i = 0; i < n; ++i){
+ if(boxes[i].x == 0 && boxes[i].y == 0) {
+ boxes[i].x = 999999;
+ boxes[i].y = 999999;
+ boxes[i].w = 999999;
+ boxes[i].h = 999999;
+ continue;
+ }
boxes[i].left = boxes[i].left * sx - dx;
boxes[i].right = boxes[i].right * sx - dx;
boxes[i].top = boxes[i].top * sy - dy;
@@ -289,6 +305,7 @@
find_replace(path, "images", "labels", labelpath);
find_replace(labelpath, "JPEGImages", "labels", labelpath);
+ find_replace(labelpath, "raw", "labels", labelpath);
find_replace(labelpath, ".jpg", ".txt", labelpath);
find_replace(labelpath, ".png", ".txt", labelpath);
find_replace(labelpath, ".JPG", ".txt", labelpath);
@@ -309,7 +326,7 @@
h = boxes[i].h;
id = boxes[i].id;
- if (w < .01 || h < .01) continue;
+ if ((w < .01 || h < .01)) continue;
truth[i*5+0] = x;
truth[i*5+1] = y;
@@ -514,7 +531,7 @@
float sx = (float)swidth / ow;
float sy = (float)sheight / oh;
- int flip = rand()%2;
+ int flip = random_gen()%2;
image cropped = crop_image(orig, pleft, ptop, swidth, sheight);
float dx = ((float)pleft/ow)/sx;
@@ -600,7 +617,7 @@
data load_data_swag(char **paths, int n, int classes, float jitter)
{
- int index = rand()%n;
+ int index = random_gen()%n;
char *random_path = paths[index];
image orig = load_image_color(random_path, 0, 0);
@@ -633,7 +650,7 @@
float sx = (float)swidth / w;
float sy = (float)sheight / h;
- int flip = rand()%2;
+ int flip = random_gen()%2;
image cropped = crop_image(orig, pleft, ptop, swidth, sheight);
float dx = ((float)pleft/w)/sx;
@@ -683,7 +700,7 @@
float sx = (float)swidth / ow;
float sy = (float)sheight / oh;
- int flip = rand()%2;
+ int flip = random_gen()%2;
image cropped = crop_image(orig, pleft, ptop, swidth, sheight);
float dx = ((float)pleft/ow)/sx;
@@ -706,7 +723,8 @@
void *load_thread(void *ptr)
{
- //printf("Loading data: %d\n", rand());
+ srand(time(0));
+ //printf("Loading data: %d\n", random_gen());
load_args a = *(struct load_args*)ptr;
if(a.exposure == 0) a.exposure = 1;
if(a.saturation == 0) a.saturation = 1;
@@ -749,6 +767,7 @@
void *load_threads(void *ptr)
{
+ srand(time(0));
int i;
load_args args = *(load_args *)ptr;
if (args.threads == 0) args.threads = 1;
@@ -843,7 +862,7 @@
for(i = 0; i < n; ++i){
image im = load_image_color(paths[i], 0, 0);
image crop = random_crop_image(im, w*scale, h*scale);
- int flip = rand()%2;
+ int flip = random_gen()%2;
if (flip) flip_image(crop);
image resize = resize_image(crop, w, h);
d.X.vals[i] = resize.data;
@@ -965,7 +984,7 @@
{
int j;
for(j = 0; j < n; ++j){
- int index = rand()%d.X.rows;
+ int index = random_gen()%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));
}
@@ -1078,7 +1097,7 @@
{
int i;
for(i = d.X.rows-1; i > 0; --i){
- int index = rand()%i;
+ int index = random_gen()%i;
float *swap = d.X.vals[index];
d.X.vals[index] = d.X.vals[i];
d.X.vals[i] = swap;
@@ -1142,7 +1161,7 @@
int i;
for(i = 0; i < num; ++i){
- int index = rand()%d.X.rows;
+ int index = random_gen()%d.X.rows;
r.X.vals[i] = d.X.vals[index];
r.y.vals[i] = d.y.vals[index];
}
--
Gitblit v1.10.0