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 | 63 ++++++-------------------------
1 files changed, 13 insertions(+), 50 deletions(-)
diff --git a/src/detector.c b/src/detector.c
index bbe60cf..6150df4 100644
--- a/src/detector.c
+++ b/src/detector.c
@@ -36,17 +36,6 @@
static int coco_ids[] = {1,2,3,4,5,6,7,8,9,10,11,13,14,15,16,17,18,19,20,21,22,23,24,25,27,28,31,32,33,34,35,36,37,38,39,40,41,42,43,44,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,67,70,72,73,74,75,76,77,78,79,80,81,82,84,85,86,87,88,89,90};
-void replace_image_to_label(char *input_path, char *output_path) {
- find_replace(input_path, "images", "labels", output_path);
- find_replace(output_path, "JPEGImages", "labels", output_path);
- find_replace(output_path, ".jpg", ".txt", output_path);
- find_replace(output_path, ".png", ".txt", output_path);
- find_replace(output_path, ".bmp", ".txt", output_path);
- find_replace(output_path, ".JPG", ".txt", output_path);
- find_replace(output_path, ".JPEG", ".txt", output_path);
- find_replace(output_path, ".ppm", ".txt", output_path);
-}
-
void train_detector(char *datacfg, char *cfgfile, char *weightfile, int *gpus, int ngpus, int clear, int dont_show)
{
list *options = read_data_cfg(datacfg);
@@ -140,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;
@@ -486,14 +481,6 @@
char labelpath[4096];
replace_image_to_label(path, labelpath);
- //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);
int num_labels = 0;
box_label *truth = read_boxes(labelpath, &num_labels);
@@ -645,14 +632,6 @@
char labelpath[4096];
replace_image_to_label(path, labelpath);
- //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);
int num_labels = 0;
box_label *truth = read_boxes(labelpath, &num_labels);
int i, j;
@@ -668,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);
}
@@ -910,14 +886,7 @@
char *path = paths[i];
char labelpath[4096];
replace_image_to_label(path, labelpath);
- //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);
+
int num_labels = 0;
box_label *truth = read_boxes(labelpath, &num_labels);
//printf(" new path: %s \n", labelpath);
@@ -1133,12 +1102,6 @@
{
char labelpath[4096];
replace_image_to_label(input, labelpath);
- //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);
FILE* fw = fopen(labelpath, "wb");
int i;
@@ -1261,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