From f9ecf6fd3f0df305d7103ecc3f15b23bba260baf Mon Sep 17 00:00:00 2001
From: AlexeyAB <alexeyab84@gmail.com>
Date: Mon, 21 May 2018 23:37:52 +0000
Subject: [PATCH] For Release build - equality check: output of [convolutional] == input of [yolo].
---
src/detector.c | 66 +++++++++++---------------------
1 files changed, 23 insertions(+), 43 deletions(-)
diff --git a/src/detector.c b/src/detector.c
index 3b486fb..6150df4 100644
--- a/src/detector.c
+++ b/src/detector.c
@@ -129,9 +129,15 @@
//int dim = (rand() % 12 + (init_w/32 - 5)) * 32; // +-160
//int dim = (rand() % 4 + 16) * 32;
//if (get_current_batch(net)+100 > net.max_batches) dim = 544;
- int random_val = rand() % 12;
- int dim_w = (random_val + (init_w / 32 - 5)) * 32; // +-160
- int dim_h = (random_val + (init_h / 32 - 5)) * 32; // +-160
+
+ //int random_val = rand() % 12;
+ //int dim_w = (random_val + (init_w / 32 - 5)) * 32; // +-160
+ //int dim_h = (random_val + (init_h / 32 - 5)) * 32; // +-160
+
+ float random_val = rand_scale(1.4); // *x or /x
+ int dim_w = roundl(random_val*init_w / 32) * 32;
+ int dim_h = roundl(random_val*init_h / 32) * 32;
+
if (dim_w < 32) dim_w = 32;
if (dim_h < 32) dim_h = 32;
@@ -474,14 +480,7 @@
if (nms) do_nms_obj(dets, nboxes, 1, nms);
char labelpath[4096];
- find_replace(path, "images", "labels", labelpath);
- find_replace(labelpath, "JPEGImages", "labels", labelpath);
- find_replace(labelpath, ".jpg", ".txt", labelpath);
- find_replace(labelpath, ".png", ".txt", labelpath);
- find_replace(labelpath, ".bmp", ".txt", labelpath);
- find_replace(labelpath, ".JPG", ".txt", labelpath);
- find_replace(labelpath, ".JPEG", ".txt", labelpath);
- find_replace(labelpath, ".ppm", ".txt", labelpath);
+ replace_image_to_label(path, labelpath);
int num_labels = 0;
box_label *truth = read_boxes(labelpath, &num_labels);
@@ -632,14 +631,7 @@
if (nms) do_nms_sort(dets, nboxes, l.classes, nms);
char labelpath[4096];
- find_replace(path, "images", "labels", labelpath);
- find_replace(labelpath, "JPEGImages", "labels", labelpath);
- find_replace(labelpath, ".jpg", ".txt", labelpath);
- find_replace(labelpath, ".png", ".txt", labelpath);
- find_replace(labelpath, ".bmp", ".txt", labelpath);
- find_replace(labelpath, ".JPG", ".txt", labelpath);
- find_replace(labelpath, ".JPEG", ".txt", labelpath);
- find_replace(labelpath, ".ppm", ".txt", labelpath);
+ replace_image_to_label(path, labelpath);
int num_labels = 0;
box_label *truth = read_boxes(labelpath, &num_labels);
int i, j;
@@ -655,11 +647,8 @@
char *path_dif = paths_dif[image_index];
char labelpath_dif[4096];
- find_replace(path_dif, "images", "labels", labelpath_dif);
- find_replace(labelpath_dif, "JPEGImages", "labels", labelpath_dif);
- find_replace(labelpath_dif, ".jpg", ".txt", labelpath_dif);
- find_replace(labelpath_dif, ".JPEG", ".txt", labelpath_dif);
- find_replace(labelpath_dif, ".png", ".txt", labelpath_dif);
+ replace_image_to_label(path_dif, labelpath_dif);
+
truth_dif = read_boxes(labelpath_dif, &num_labels_dif);
}
@@ -896,14 +885,8 @@
for (i = 0; i < number_of_images; ++i) {
char *path = paths[i];
char labelpath[4096];
- find_replace(path, "images", "labels", labelpath);
- find_replace(labelpath, "JPEGImages", "labels", labelpath);
- find_replace(labelpath, ".jpg", ".txt", labelpath);
- find_replace(labelpath, ".png", ".txt", labelpath);
- find_replace(labelpath, ".bmp", ".txt", labelpath);
- find_replace(labelpath, ".JPG", ".txt", labelpath);
- find_replace(labelpath, ".JPEG", ".txt", labelpath);
- find_replace(labelpath, ".ppm", ".txt", labelpath);
+ replace_image_to_label(path, labelpath);
+
int num_labels = 0;
box_label *truth = read_boxes(labelpath, &num_labels);
//printf(" new path: %s \n", labelpath);
@@ -1056,7 +1039,7 @@
#endif // OPENCV
void test_detector(char *datacfg, char *cfgfile, char *weightfile, char *filename, float thresh,
- float hier_thresh, int dont_show, int ext_output)
+ float hier_thresh, int dont_show, int ext_output, int save_labels)
{
list *options = read_data_cfg(datacfg);
char *name_list = option_find_str(options, "names", "data/names.list");
@@ -1113,16 +1096,12 @@
if (!dont_show) {
show_image(im, "predictions");
}
-/*
+
// pseudo labeling concept - fast.ai
+ if(save_labels)
{
char labelpath[4096];
- find_replace(input, ".jpg", ".txt", labelpath);
- find_replace(labelpath, ".png", ".txt", labelpath);
- find_replace(labelpath, ".bmp", ".txt", labelpath);
- find_replace(labelpath, ".JPG", ".txt", labelpath);
- find_replace(labelpath, ".JPEG", ".txt", labelpath);
- find_replace(labelpath, ".ppm", ".txt", labelpath);
+ replace_image_to_label(input, labelpath);
FILE* fw = fopen(labelpath, "wb");
int i;
@@ -1143,7 +1122,7 @@
}
fclose(fw);
}
-*/
+
free_detections(dets, nboxes);
free_image(im);
free_image(sized);
@@ -1193,6 +1172,7 @@
// extended output in test mode (output of rect bound coords)
// and for recall mode (extended output table-like format with results for best_class fit)
int ext_output = find_arg(argc, argv, "-ext_output");
+ int save_labels = find_arg(argc, argv, "-save_labels");
if(argc < 4){
fprintf(stderr, "usage: %s %s [train/test/valid] [cfg] [weights (optional)]\n", argv[0], argv[1]);
return;
@@ -1229,7 +1209,7 @@
if(strlen(weights) > 0)
if (weights[strlen(weights) - 1] == 0x0d) weights[strlen(weights) - 1] = 0;
char *filename = (argc > 6) ? argv[6]: 0;
- if(0==strcmp(argv[2], "test")) test_detector(datacfg, cfg, weights, filename, thresh, hier_thresh, dont_show, ext_output);
+ if(0==strcmp(argv[2], "test")) test_detector(datacfg, cfg, weights, filename, thresh, hier_thresh, dont_show, ext_output, save_labels);
else if(0==strcmp(argv[2], "train")) train_detector(datacfg, cfg, weights, gpus, ngpus, clear, dont_show);
else if(0==strcmp(argv[2], "valid")) validate_detector(datacfg, cfg, weights, outfile);
else if(0==strcmp(argv[2], "recall")) validate_detector_recall(datacfg, cfg, weights);
@@ -1244,7 +1224,7 @@
if(strlen(filename) > 0)
if (filename[strlen(filename) - 1] == 0x0d) filename[strlen(filename) - 1] = 0;
demo(cfg, weights, thresh, hier_thresh, cam_index, filename, names, classes, frame_skip, prefix, out_filename,
- http_stream_port, dont_show);
+ http_stream_port, dont_show, ext_output);
}
else printf(" There isn't such command: %s", argv[2]);
}
--
Gitblit v1.10.0