From 6c54f5ffb240f0c97b7d33a55ce852716d422919 Mon Sep 17 00:00:00 2001
From: AlexeyAB <alexeyab84@gmail.com>
Date: Wed, 06 Jun 2018 23:20:44 +0000
Subject: [PATCH] Show inconsistent information if it is present in .cfg and .names files
---
src/detector.c | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/src/detector.c b/src/detector.c
index 6fc6b67..0c0b14d 100644
--- a/src/detector.c
+++ b/src/detector.c
@@ -87,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;
@@ -105,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;
@@ -388,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;
@@ -482,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);
@@ -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;
@@ -1066,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
@@ -1075,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];
@@ -1093,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));
--
Gitblit v1.10.0