From 4cf4a89f05c671041c217a724fc9b4b026eb9de9 Mon Sep 17 00:00:00 2001
From: AlexeyAB <alexeyab84@gmail.com>
Date: Fri, 01 Jun 2018 21:33:17 +0000
Subject: [PATCH] Minor fix
---
src/detector.c | 117 +++++++++++++++++++++++++++-------------------------------
1 files changed, 55 insertions(+), 62 deletions(-)
diff --git a/src/detector.c b/src/detector.c
index bbe60cf..202fbf9 100644
--- a/src/detector.c
+++ b/src/detector.c
@@ -1,8 +1,3 @@
-#ifdef _DEBUG
-#include <stdlib.h>
-#include <crtdbg.h>
-#endif
-
#include "network.h"
#include "region_layer.h"
#include "cost_layer.h"
@@ -36,17 +31,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);
@@ -103,7 +87,8 @@
load_args args = {0};
args.w = net.w;
args.h = net.h;
- args.paths = paths;
+ args.c = net.c;
+ args.paths = paths;
args.n = imgs;
args.m = plist->size;
args.classes = classes;
@@ -140,9 +125,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;
@@ -199,7 +190,7 @@
avg_loss = avg_loss*.9 + loss*.1;
i = get_current_batch(net);
- printf("\n %d: %f, %f avg, %f rate, %lf seconds, %d images\n", get_current_batch(net), loss, avg_loss, get_current_rate(net), (what_time_is_it_now()-time), i*imgs);
+ printf("\n %d: %f, %f avg loss, %f rate, %lf seconds, %d images\n", get_current_batch(net), loss, avg_loss, get_current_rate(net), (what_time_is_it_now()-time), i*imgs);
#ifdef OPENCV
if(!dont_show)
@@ -226,8 +217,25 @@
sprintf(buff, "%s/%s_final.weights", backup_directory, base);
save_weights(net, buff);
- //cvReleaseImage(&img);
- //cvDestroyAllWindows();
+#ifdef OPENCV
+ cvReleaseImage(&img);
+ cvDestroyAllWindows();
+#endif
+
+ // free memory
+ pthread_join(load_thread, 0);
+ free_data(buffer);
+
+ free(base);
+ free(paths);
+ free_list_contents(plist);
+ free_list(plist);
+
+ free_list_contents_kvp(options);
+ free_list(options);
+
+ free(nets);
+ free_network(net);
}
@@ -381,6 +389,7 @@
load_args args = { 0 };
args.w = net.w;
args.h = net.h;
+ args.c = net.c;
args.type = IMAGE_DATA;
//args.type = LETTERBOX_DATA;
@@ -475,7 +484,7 @@
for (i = 0; i < m; ++i) {
char *path = paths[i];
- image orig = load_image_color(path, 0, 0);
+ image orig = load_image(path, 0, 0, net.c);
image sized = resize_image(orig, net.w, net.h);
char *id = basecfg(path);
network_predict(net, sized.data);
@@ -486,14 +495,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);
@@ -555,6 +556,7 @@
char *mapf = option_find_str(options, "map", 0);
int *map = 0;
if (mapf) map = read_map(mapf);
+ FILE* reinforcement_fd = NULL;
network net = parse_network_cfg_custom(cfgfile, 1); // set batch=1
if (weightfile) {
@@ -595,6 +597,7 @@
load_args args = { 0 };
args.w = net.w;
args.h = net.h;
+ args.c = net.c;
args.type = IMAGE_DATA;
//args.type = LETTERBOX_DATA;
@@ -645,14 +648,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 +663,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);
}
@@ -744,9 +736,18 @@
}
}
}
-
+
unique_truth_count += num_labels;
+ //static int previous_errors = 0;
+ //int total_errors = fp_for_thresh + (unique_truth_count - tp_for_thresh);
+ //int errors_in_this_image = total_errors - previous_errors;
+ //previous_errors = total_errors;
+ //if(reinforcement_fd == NULL) reinforcement_fd = fopen("reinforcement.txt", "wb");
+ //char buff[1000];
+ //sprintf(buff, "%s\n", path);
+ //if(errors_in_this_image > 0) fwrite(buff, sizeof(char), strlen(buff), reinforcement_fd);
+
free_detections(dets, nboxes);
free(id);
free_image(val[t]);
@@ -867,6 +868,7 @@
free(truth_classes_count);
fprintf(stderr, "Total Detection Time: %f Seconds\n", (double)(time(0) - start));
+ if (reinforcement_fd != NULL) fclose(reinforcement_fd);
}
#ifdef OPENCV
@@ -910,14 +912,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);
@@ -1101,7 +1096,7 @@
if(!input) return;
strtok(input, "\n");
}
- image im = load_image_color(input,0,0);
+ image im = load_image(input,0,0,net.c);
int letterbox = 0;
//image sized = resize_image(im, net.w, net.h);
image sized = letterbox_image(im, net.w, net.h); letterbox = 1;
@@ -1133,12 +1128,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;
@@ -1176,6 +1165,7 @@
// free memory
free_ptrs(names, net.layers[net.n - 1].classes);
+ free_list_contents_kvp(options);
free_list(options);
int i;
@@ -1261,7 +1251,10 @@
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);
+
+ free_list_contents_kvp(options);
+ free_list(options);
}
else printf(" There isn't such command: %s", argv[2]);
}
--
Gitblit v1.10.0