From 8a504c737d2bc3b9b37cb79cb50fbf7eecda07df Mon Sep 17 00:00:00 2001
From: Tino Hager <tino.hager@nager.at>
Date: Wed, 27 Jun 2018 21:56:47 +0000
Subject: [PATCH] repair tabs spaces
---
src/parser.c | 34 ++++++++++++++++++++++++++--------
1 files changed, 26 insertions(+), 8 deletions(-)
diff --git a/src/parser.c b/src/parser.c
index ba2cd12..1a32407 100644
--- a/src/parser.c
+++ b/src/parser.c
@@ -268,9 +268,14 @@
char *a = option_find_str(options, "mask", 0);
int *mask = parse_yolo_mask(a, &num);
- int max_boxes = option_find_int_quiet(options, "max", 30);
+ int max_boxes = option_find_int_quiet(options, "max", 90);
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);
@@ -291,7 +296,7 @@
for (i = 0; i < len; ++i) {
if (a[i] == ',') ++n;
}
- for (i = 0; i < n; ++i) {
+ for (i = 0; i < n && i < total*2; ++i) {
float bias = atof(a);
l.biases[i] = bias;
a = strchr(a, ',') + 1;
@@ -305,10 +310,15 @@
int coords = option_find_int(options, "coords", 4);
int classes = option_find_int(options, "classes", 20);
int num = option_find_int(options, "num", 1);
- int max_boxes = option_find_int_quiet(options, "max", 30);
+ int max_boxes = option_find_int_quiet(options, "max", 90);
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);
@@ -344,7 +354,7 @@
for(i = 0; i < len; ++i){
if (a[i] == ',') ++n;
}
- for(i = 0; i < n; ++i){
+ for(i = 0; i < n && i < num*2; ++i){
float bias = atof(a);
l.biases[i] = bias;
a = strchr(a, ',')+1;
@@ -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,15 +807,17 @@
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
if(gpu_index >= 0){
- net.workspace = cuda_make_array(0, (workspace_size-1)/sizeof(float)+1);
+ net.workspace = cuda_make_array(0, workspace_size/sizeof(float) + 1);
}else {
net.workspace = calloc(1, workspace_size);
}
@@ -812,6 +825,11 @@
net.workspace = calloc(1, workspace_size);
#endif
}
+ LAYER_TYPE lt = net.layers[net.n - 1].type;
+ if ((net.w % 32 != 0 || net.h % 32 != 0) && (lt == YOLO || lt == REGION || lt == DETECTION)) {
+ printf("\n Warning: width=%d and height=%d in cfg-file must be divisible by 32 for default networks Yolo v1/v2/v3!!! \n\n",
+ net.w, net.h);
+ }
return net;
}
--
Gitblit v1.10.0