From 38bd6ae6ba24fc8c14fd61d1238ae94a983434b3 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Mon, 20 Jul 2015 23:16:26 +0000
Subject: [PATCH] Better partial function
---
src/parser.c | 82 +++++++++++++++++++++++++++++++----------
1 files changed, 62 insertions(+), 20 deletions(-)
diff --git a/src/parser.c b/src/parser.c
index 48567a1..5591dc3 100644
--- a/src/parser.c
+++ b/src/parser.c
@@ -7,12 +7,14 @@
#include "crop_layer.h"
#include "cost_layer.h"
#include "convolutional_layer.h"
+#include "normalization_layer.h"
#include "deconvolutional_layer.h"
#include "connected_layer.h"
#include "maxpool_layer.h"
#include "softmax_layer.h"
#include "dropout_layer.h"
#include "detection_layer.h"
+#include "avgpool_layer.h"
#include "route_layer.h"
#include "list.h"
#include "option_list.h"
@@ -28,8 +30,10 @@
int is_deconvolutional(section *s);
int is_connected(section *s);
int is_maxpool(section *s);
+int is_avgpool(section *s);
int is_dropout(section *s);
int is_softmax(section *s);
+int is_normalization(section *s);
int is_crop(section *s);
int is_cost(section *s);
int is_detection(section *s);
@@ -100,7 +104,6 @@
#ifdef GPU
if(weights || biases) push_deconvolutional_layer(layer);
#endif
- option_unused(options);
return layer;
}
@@ -129,7 +132,6 @@
#ifdef GPU
if(weights || biases) push_convolutional_layer(layer);
#endif
- option_unused(options);
return layer;
}
@@ -148,7 +150,6 @@
#ifdef GPU
if(weights || biases) push_connected_layer(layer);
#endif
- option_unused(options);
return layer;
}
@@ -156,7 +157,6 @@
{
int groups = option_find_int(options, "groups",1);
softmax_layer layer = make_softmax_layer(params.batch, params.inputs, groups);
- option_unused(options);
return layer;
}
@@ -164,11 +164,11 @@
{
int coords = option_find_int(options, "coords", 1);
int classes = option_find_int(options, "classes", 1);
- int rescore = option_find_int(options, "rescore", 1);
- int nuisance = option_find_int(options, "nuisance", 0);
- int background = option_find_int(options, "background", 1);
- detection_layer layer = make_detection_layer(params.batch, params.inputs, classes, coords, rescore, background, nuisance);
- option_unused(options);
+ 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 = 0;
+ detection_layer layer = make_detection_layer(params.batch, params.inputs, classes, coords, joint, rescore, background, objectness);
return layer;
}
@@ -177,7 +177,6 @@
char *type_s = option_find_str(options, "type", "sse");
COST_TYPE type = get_cost_type(type_s);
cost_layer layer = make_cost_layer(params.batch, params.inputs, type);
- option_unused(options);
return layer;
}
@@ -197,8 +196,10 @@
batch=params.batch;
if(!(h && w && c)) error("Layer before crop layer must output image.");
+ int noadjust = option_find_int_quiet(options, "noadjust",0);
+
crop_layer l = make_crop_layer(batch,h,w,c,crop_height,crop_width,flip, angle, saturation, exposure);
- option_unused(options);
+ l.noadjust = noadjust;
return l;
}
@@ -215,7 +216,19 @@
if(!(h && w && c)) error("Layer before maxpool layer must output image.");
maxpool_layer layer = make_maxpool_layer(batch,h,w,c,size,stride);
- option_unused(options);
+ return layer;
+}
+
+avgpool_layer parse_avgpool(list *options, size_params params)
+{
+ int batch,w,h,c;
+ w = params.w;
+ h = params.h;
+ c = params.c;
+ batch=params.batch;
+ if(!(h && w && c)) error("Layer before avgpool layer must output image.");
+
+ avgpool_layer layer = make_avgpool_layer(batch,w,h,c);
return layer;
}
@@ -223,10 +236,19 @@
{
float probability = option_find_float(options, "probability", .5);
dropout_layer layer = make_dropout_layer(params.batch, params.inputs, probability);
- option_unused(options);
return layer;
}
+layer parse_normalization(list *options, size_params params)
+{
+ float alpha = option_find_float(options, "alpha", .0001);
+ float beta = option_find_float(options, "beta" , .75);
+ float kappa = option_find_float(options, "kappa", 1);
+ int size = option_find_int(options, "size", 5);
+ layer l = make_normalization_layer(params.batch, params.w, params.h, params.c, size, alpha, beta, kappa);
+ return l;
+}
+
route_layer parse_route(list *options, size_params params, network net)
{
char *l = option_find(options, "layers");
@@ -264,7 +286,6 @@
}
}
- option_unused(options);
return layer;
}
@@ -274,7 +295,6 @@
net->learning_rate = option_find_float(options, "learning_rate", .001);
net->momentum = option_find_float(options, "momentum", .9);
net->decay = option_find_float(options, "decay", .0001);
- net->seen = option_find_int(options, "seen",0);
int subdivs = option_find_int(options, "subdivisions",1);
net->batch /= subdivs;
net->subdivisions = subdivs;
@@ -284,7 +304,6 @@
net->c = option_find_int_quiet(options, "channels",0);
net->inputs = option_find_int_quiet(options, "inputs", net->h * net->w * net->c);
if(!net->inputs && !(net->h && net->w && net->c)) error("No input parameters supplied");
- option_unused(options);
}
network parse_network_cfg(char *filename)
@@ -327,8 +346,12 @@
l = parse_detection(options, params);
}else if(is_softmax(s)){
l = parse_softmax(options, params);
+ }else if(is_normalization(s)){
+ l = parse_normalization(options, params);
}else if(is_maxpool(s)){
l = parse_maxpool(options, params);
+ }else if(is_avgpool(s)){
+ l = parse_avgpool(options, params);
}else if(is_route(s)){
l = parse_route(options, params, net);
}else if(is_dropout(s)){
@@ -342,6 +365,8 @@
}else{
fprintf(stderr, "Type not recognized: %s\n", s->type);
}
+ l.dontload = option_find_int_quiet(options, "dontload", 0);
+ option_unused(options);
net.layers[count] = l;
free_section(s);
n = n->next;
@@ -396,11 +421,22 @@
return (strcmp(s->type, "[max]")==0
|| strcmp(s->type, "[maxpool]")==0);
}
+int is_avgpool(section *s)
+{
+ return (strcmp(s->type, "[avg]")==0
+ || strcmp(s->type, "[avgpool]")==0);
+}
int is_dropout(section *s)
{
return (strcmp(s->type, "[dropout]")==0);
}
+int is_normalization(section *s)
+{
+ return (strcmp(s->type, "[lrn]")==0
+ || strcmp(s->type, "[normalization]")==0);
+}
+
int is_softmax(section *s)
{
return (strcmp(s->type, "[soft]")==0
@@ -464,7 +500,7 @@
return sections;
}
-void save_weights(network net, char *filename)
+void save_weights_upto(network net, char *filename, int cutoff)
{
fprintf(stderr, "Saving weights to %s\n", filename);
FILE *fp = fopen(filename, "w");
@@ -476,7 +512,7 @@
fwrite(&net.seen, sizeof(int), 1, fp);
int i;
- for(i = 0; i < net.n; ++i){
+ for(i = 0; i < net.n && i < cutoff; ++i){
layer l = net.layers[i];
if(l.type == CONVOLUTIONAL){
#ifdef GPU
@@ -510,10 +546,15 @@
}
fclose(fp);
}
+void save_weights(network net, char *filename)
+{
+ save_weights_upto(net, filename, net.n);
+}
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);
@@ -521,11 +562,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);
@@ -556,6 +597,7 @@
#endif
}
}
+ fprintf(stderr, "Done!\n");
fclose(fp);
}
--
Gitblit v1.10.0