From 4a7a076d0939a491af8fe3fd63e5012ffd5afebc Mon Sep 17 00:00:00 2001
From: Alexey <AlexeyAB@users.noreply.github.com>
Date: Sun, 18 Feb 2018 23:28:46 +0000
Subject: [PATCH] Update Readme.md
---
src/parser.c | 31 +++++++++++++++++++++++--------
1 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/src/parser.c b/src/parser.c
index ae9e194..7803632 100644
--- a/src/parser.c
+++ b/src/parser.c
@@ -238,15 +238,17 @@
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);
- layer l = make_region_layer(params.batch, params.w, params.h, num, classes, coords);
+ layer l = make_region_layer(params.batch, params.w, params.h, num, classes, coords, max_boxes);
assert(l.outputs == params.inputs);
l.log = option_find_int_quiet(options, "log", 0);
l.sqrt = option_find_int_quiet(options, "sqrt", 0);
+ l.small_object = option_find_int_quiet(options, "small_object", 0);
l.softmax = option_find_int(options, "softmax", 0);
- l.max_boxes = option_find_int_quiet(options, "max",30);
+ //l.max_boxes = option_find_int_quiet(options, "max",30);
l.jitter = option_find_float(options, "jitter", .2);
l.rescore = option_find_int_quiet(options, "rescore",0);
@@ -532,6 +534,7 @@
net->saturation = option_find_float_quiet(options, "saturation", 1);
net->exposure = option_find_float_quiet(options, "exposure", 1);
net->hue = option_find_float_quiet(options, "hue", 0);
+ net->power = option_find_float_quiet(options, "power", 4);
if(!net->inputs && !(net->h && net->w && net->c)) error("No input parameters supplied");
@@ -571,7 +574,7 @@
net->gamma = option_find_float(options, "gamma", 1);
net->step = option_find_int(options, "step", 1);
} else if (net->policy == POLY || net->policy == RANDOM){
- net->power = option_find_float(options, "power", 1);
+ //net->power = option_find_float(options, "power", 1);
}
net->max_batches = option_find_int(options, "max_batches", 0);
}
@@ -584,6 +587,11 @@
network parse_network_cfg(char *filename)
{
+ return parse_network_cfg_custom(filename, 0);
+}
+
+network parse_network_cfg_custom(char *filename, int batch)
+{
list *sections = read_cfg(filename);
node *n = sections->front;
if(!n) error("Config file has no sections");
@@ -600,6 +608,7 @@
params.w = net.w;
params.c = net.c;
params.inputs = net.inputs;
+ if (batch > 0) net.batch = batch;
params.batch = net.batch;
params.time_steps = net.time_steps;
params.net = net;
@@ -666,6 +675,8 @@
}else{
fprintf(stderr, "Type not recognized: %s\n", s->type);
}
+ l.onlyforward = option_find_int_quiet(options, "onlyforward", 0);
+ l.stopbackward = option_find_int_quiet(options, "stopbackward", 0);
l.dontload = option_find_int_quiet(options, "dontload", 0);
l.dontloadscales = option_find_int_quiet(options, "dontloadscales", 0);
option_unused(options);
@@ -699,6 +710,8 @@
return net;
}
+
+
list *read_cfg(char *filename)
{
FILE *file = fopen(filename, "r");
@@ -836,7 +849,7 @@
fwrite(&major, sizeof(int), 1, fp);
fwrite(&minor, sizeof(int), 1, fp);
fwrite(&revision, sizeof(int), 1, fp);
- fwrite(net.seen, sizeof(uint64_t), 1, fp);
+ fwrite(net.seen, sizeof(int), 1, fp);
int i;
for(i = 0; i < net.n && i < cutoff; ++i){
@@ -1025,12 +1038,14 @@
fread(&minor, sizeof(int), 1, fp);
fread(&revision, sizeof(int), 1, fp);
if ((major * 10 + minor) >= 2) {
- fread(net->seen, sizeof(uint64_t), 1, fp);
+ printf("\n seen 64 \n");
+ uint64_t iseen = 0;
+ fread(&iseen, sizeof(uint64_t), 1, fp);
+ *net->seen = iseen;
}
else {
- int iseen = 0;
- fread(&iseen, sizeof(int), 1, fp);
- *net->seen = iseen;
+ printf("\n seen 32 \n");
+ fread(net->seen, sizeof(int), 1, fp);
}
int transpose = (major > 1000) || (minor > 1000);
--
Gitblit v1.10.0