From 42d7438879c815494e623e20daf42cae3eeaff8a Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Fri, 10 Jul 2015 23:38:25 +0000
Subject: [PATCH] added jnet
---
src/parser.c | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/parser.c b/src/parser.c
index c0db443..18c3860 100644
--- a/src/parser.c
+++ b/src/parser.c
@@ -167,7 +167,7 @@
int rescore = option_find_int(options, "rescore", 0);
int joint = option_find_int(options, "joint", 0);
int objectness = option_find_int(options, "objectness", 0);
- int background = option_find_int(options, "background", 1);
+ int background = option_find_int(options, "background", 0);
detection_layer layer = make_detection_layer(params.batch, params.inputs, classes, coords, joint, rescore, background, objectness);
option_unused(options);
return layer;
@@ -343,6 +343,7 @@
}else{
fprintf(stderr, "Type not recognized: %s\n", s->type);
}
+ l.dontload = option_find_int_quiet(options, "dontload", 0);
net.layers[count] = l;
free_section(s);
n = n->next;
@@ -514,7 +515,8 @@
void load_weights_upto(network *net, char *filename, int cutoff)
{
- fprintf(stderr, "Loading weights from %s\n", filename);
+ fprintf(stderr, "Loading weights from %s...", filename);
+ fflush(stdout);
FILE *fp = fopen(filename, "r");
if(!fp) file_error(filename);
@@ -522,11 +524,11 @@
fread(&net->momentum, sizeof(float), 1, fp);
fread(&net->decay, sizeof(float), 1, fp);
fread(&net->seen, sizeof(int), 1, fp);
- fprintf(stderr, "%f %f %f %d\n", net->learning_rate, net->momentum, net->decay, net->seen);
int i;
for(i = 0; i < net->n && i < cutoff; ++i){
layer l = net->layers[i];
+ if (l.dontload) continue;
if(l.type == CONVOLUTIONAL){
int num = l.n*l.c*l.size*l.size;
fread(l.biases, sizeof(float), l.n, fp);
@@ -557,6 +559,7 @@
#endif
}
}
+ fprintf(stderr, "Done!\n");
fclose(fp);
}
--
Gitblit v1.10.0