From 6c675a09278aeb7f579ff9ee7c20e990119be8ff Mon Sep 17 00:00:00 2001
From: Yu Hao <jinyu121@gmail.com>
Date: Thu, 31 May 2018 06:04:16 +0000
Subject: [PATCH] Fix openCV 3.4.1 highgui
---
src/parser.c | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/src/parser.c b/src/parser.c
index 7441ae2..188ba54 100644
--- a/src/parser.c
+++ b/src/parser.c
@@ -270,7 +270,12 @@
int *mask = parse_yolo_mask(a, &num);
int max_boxes = option_find_int_quiet(options, "max", 30);
layer l = make_yolo_layer(params.batch, params.w, params.h, num, total, mask, classes, max_boxes);
- assert(l.outputs == params.inputs);
+ if (l.outputs != params.inputs) {
+ printf("Error: l.outputs == params.inputs \n");
+ printf("filters= in the [convolutional]-layer doesn't correspond to classes= or mask= in [yolo]-layer \n");
+ exit(EXIT_FAILURE);
+ }
+ //assert(l.outputs == params.inputs);
//l.max_boxes = option_find_int_quiet(options, "max", 90);
l.jitter = option_find_float(options, "jitter", .2);
@@ -308,7 +313,12 @@
int max_boxes = option_find_int_quiet(options, "max", 30);
layer l = make_region_layer(params.batch, params.w, params.h, num, classes, coords, max_boxes);
- assert(l.outputs == params.inputs);
+ if (l.outputs != params.inputs) {
+ printf("Error: l.outputs == params.inputs \n");
+ printf("filters= in the [convolutional]-layer doesn't correspond to classes= or num= in [region]-layer \n");
+ exit(EXIT_FAILURE);
+ }
+ //assert(l.outputs == params.inputs);
l.log = option_find_int_quiet(options, "log", 0);
l.sqrt = option_find_int_quiet(options, "sqrt", 0);
@@ -712,6 +722,7 @@
params.time_steps = net.time_steps;
params.net = net;
+ float bflops = 0;
size_t workspace_size = 0;
n = n->next;
int count = 0;
@@ -719,7 +730,7 @@
fprintf(stderr, "layer filters size input output\n");
while(n){
params.index = count;
- fprintf(stderr, "%5d ", count);
+ fprintf(stderr, "%4d ", count);
s = (section *)n->val;
options = s->options;
layer l = {0};
@@ -796,10 +807,12 @@
params.c = l.out_c;
params.inputs = l.outputs;
}
+ if (l.bflops > 0) bflops += l.bflops;
}
free_list(sections);
net.outputs = get_network_output_size(net);
net.output = get_network_output(net);
+ printf("Total BFLOPS %5.3f \n", bflops);
if(workspace_size){
//printf("%ld\n", workspace_size);
#ifdef GPU
--
Gitblit v1.10.0