OrgLion-ML
/
darknet
mirror of https://github.com/AlexeyAB/darknet.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed mosaic=1 cutmix=1 memory leak for Training Classifier

This commit is contained in:
AlexeyAB 2019-12-27 12:54:20 +03:00
parent 35a3870979
commit b8605bda1e
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/data.c
View File

@ -1507,7 +1507,7 @@ data load_data_super(char **paths, int n, int m, int w, int h, int scale)
return d; return d;
} }
data load_data_augment(char **paths, int n, int m, char **labels, int k, tree *hierarchy, int use_flip, int min, int max, int w, int h, float angle, float aspect, float hue, float saturation, float exposure, int mixup, int use_blur, int show_imgs, float label_smooth_eps) data load_data_augment(char **paths, int n, int m, char **labels, int k, tree *hierarchy, int use_flip, int min, int max, int w, int h, float angle, float aspect, float hue, float saturation, float exposure, int use_mixup, int use_blur, int show_imgs, float label_smooth_eps)
{ {
char **paths_stored = paths; char **paths_stored = paths;
if(m) paths = get_random_paths(paths, n, m); if(m) paths = get_random_paths(paths, n, m);
@ -1516,7 +1516,7 @@ data load_data_augment(char **paths, int n, int m, char **labels, int k, tree *h
d.X = load_image_augment_paths(paths, n, use_flip, min, max, w, h, angle, aspect, hue, saturation, exposure); d.X = load_image_augment_paths(paths, n, use_flip, min, max, w, h, angle, aspect, hue, saturation, exposure);
d.y = load_labels_paths(paths, n, labels, k, hierarchy, label_smooth_eps); d.y = load_labels_paths(paths, n, labels, k, hierarchy, label_smooth_eps);
if (mixup && rand_int(0, 1)) { if (use_mixup && rand_int(0, 1)) {
char **paths_mix = get_random_paths(paths_stored, n, m); char **paths_mix = get_random_paths(paths_stored, n, m);
data d2 = { 0 }; data d2 = { 0 };
d2.shallow = 0; d2.shallow = 0;
@ -1528,7 +1528,7 @@ data load_data_augment(char **paths, int n, int m, char **labels, int k, tree *h
d3.shallow = 0; d3.shallow = 0;
data d4 = { 0 }; data d4 = { 0 };
d4.shallow = 0; d4.shallow = 0;
if (mixup >= 3) { if (use_mixup >= 3) {
char **paths_mix3 = get_random_paths(paths_stored, n, m); char **paths_mix3 = get_random_paths(paths_stored, n, m);
d3.X = load_image_augment_paths(paths_mix3, n, use_flip, min, max, w, h, angle, aspect, hue, saturation, exposure); d3.X = load_image_augment_paths(paths_mix3, n, use_flip, min, max, w, h, angle, aspect, hue, saturation, exposure);
d3.y = load_labels_paths(paths_mix3, n, labels, k, hierarchy, label_smooth_eps); d3.y = load_labels_paths(paths_mix3, n, labels, k, hierarchy, label_smooth_eps);
@ -1545,7 +1545,8 @@ data load_data_augment(char **paths, int n, int m, char **labels, int k, tree *h
int i, j; int i, j;
for (i = 0; i < d2.X.rows; ++i) { for (i = 0; i < d2.X.rows; ++i) {
if (mixup == 4) mixup = rand_int(2, 3); // alternate CutMix and Mosaic int mixup = use_mixup;
if (use_mixup == 4) mixup = rand_int(2, 3); // alternate CutMix and Mosaic
// MixUp ----------------------------------- // MixUp -----------------------------------
if (mixup == 1) { if (mixup == 1) {
@ -1637,7 +1638,7 @@ data load_data_augment(char **paths, int n, int m, char **labels, int k, tree *h
free_data(d2); free_data(d2);
if (mixup == 3) { if (use_mixup >= 3) {
free_data(d3); free_data(d3);
free_data(d4); free_data(d4);
} }

2
src/data.h
View File

@ -91,7 +91,7 @@ data load_data_detection(int n, char **paths, int m, int w, int h, int c, int bo
data load_data_tag(char **paths, int n, int m, int k, int use_flip, int min, int max, int w, int h, float angle, float aspect, float hue, float saturation, float exposure); data load_data_tag(char **paths, int n, int m, int k, int use_flip, int min, int max, int w, int h, float angle, float aspect, float hue, float saturation, float exposure);
matrix load_image_augment_paths(char **paths, int n, int use_flip, int min, int max, int w, int h, float angle, float aspect, float hue, float saturation, float exposure); matrix load_image_augment_paths(char **paths, int n, int use_flip, int min, int max, int w, int h, float angle, float aspect, float hue, float saturation, float exposure);
data load_data_super(char **paths, int n, int m, int w, int h, int scale); data load_data_super(char **paths, int n, int m, int w, int h, int scale);
data load_data_augment(char **paths, int n, int m, char **labels, int k, tree *hierarchy, int use_flip, int min, int max, int w, int h, float angle, float aspect, float hue, float saturation, float exposure, int mixup, int use_blur, int show_imgs, float label_smooth_eps); data load_data_augment(char **paths, int n, int m, char **labels, int k, tree *hierarchy, int use_flip, int min, int max, int w, int h, float angle, float aspect, float hue, float saturation, float exposure, int use_mixup, int use_blur, int show_imgs, float label_smooth_eps);
data load_go(char *filename); data load_go(char *filename);
box_label *read_boxes(char *filename, int *n); box_label *read_boxes(char *filename, int *n);