From 1c05ebf522f0bb5776ba51a46d94aa101220fea1 Mon Sep 17 00:00:00 2001
From: AlexeyAB <alexeyab84@gmail.com>
Date: Thu, 07 Jun 2018 00:39:30 +0000
Subject: [PATCH] Minor fix
---
src/detector.c | 68 ++++++++++++++++++++++++++--------
1 files changed, 52 insertions(+), 16 deletions(-)
diff --git a/src/detector.c b/src/detector.c
index 6150df4..0c0b14d 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"
@@ -92,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;
@@ -110,7 +106,7 @@
args.hue = net.hue;
#ifdef OPENCV
- args.threads = 3;
+ args.threads = 3 * ngpus;
IplImage* img = NULL;
float max_img_loss = 5;
int number_of_lines = 100;
@@ -194,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)
@@ -221,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);
}
@@ -376,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;
@@ -470,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);
@@ -542,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) {
@@ -582,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;
@@ -720,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]);
@@ -843,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
@@ -1043,7 +1069,8 @@
{
list *options = read_data_cfg(datacfg);
char *name_list = option_find_str(options, "names", "data/names.list");
- char **names = get_labels(name_list);
+ int names_size = 0;
+ char **names = get_labels_custom(name_list, &names_size); //get_labels(name_list);
image **alphabet = load_alphabet();
network net = parse_network_cfg_custom(cfgfile, 1); // set batch=1
@@ -1052,6 +1079,11 @@
}
//set_batch_network(&net, 1);
fuse_conv_batchnorm(net);
+ if (net.layers[net.n - 1].classes != names_size) {
+ printf(" Error: in the file %s number of names %d that isn't equal to classes=%d in the file %s \n",
+ name_list, names_size, net.layers[net.n - 1].classes, datacfg);
+ if(net.layers[net.n - 1].classes > names_size) getchar();
+ }
srand(2222222);
double time;
char buff[256];
@@ -1070,10 +1102,10 @@
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;
+ image sized = resize_image(im, net.w, net.h);
+ //image sized = letterbox_image(im, net.w, net.h); letterbox = 1;
layer l = net.layers[net.n-1];
//box *boxes = calloc(l.w*l.h*l.n, sizeof(box));
@@ -1139,6 +1171,7 @@
// free memory
free_ptrs(names, net.layers[net.n - 1].classes);
+ free_list_contents_kvp(options);
free_list(options);
int i;
@@ -1225,6 +1258,9 @@
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, ext_output);
+
+ free_list_contents_kvp(options);
+ free_list(options);
}
else printf(" There isn't such command: %s", argv[2]);
}
--
Gitblit v1.10.0