From f047cfff99e00e28c02eb59b6d32386c122f9af6 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Sun, 08 Mar 2015 18:31:12 +0000
Subject: [PATCH] renamed sigmoid to logistic
---
src/parser.c | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/src/parser.c b/src/parser.c
index 53e1f56..7b1057e 100644
--- a/src/parser.c
+++ b/src/parser.c
@@ -76,7 +76,7 @@
int n = option_find_int(options, "filters",1);
int size = option_find_int(options, "size",1);
int stride = option_find_int(options, "stride",1);
- char *activation_s = option_find_str(options, "activation", "sigmoid");
+ char *activation_s = option_find_str(options, "activation", "logistic");
ACTIVATION activation = get_activation(activation_s);
if(count == 0){
learning_rate = option_find_float(options, "learning_rate", .001);
@@ -120,7 +120,7 @@
int size = option_find_int(options, "size",1);
int stride = option_find_int(options, "stride",1);
int pad = option_find_int(options, "pad",0);
- char *activation_s = option_find_str(options, "activation", "sigmoid");
+ char *activation_s = option_find_str(options, "activation", "logistic");
ACTIVATION activation = get_activation(activation_s);
if(count == 0){
learning_rate = option_find_float(options, "learning_rate", .001);
@@ -161,7 +161,7 @@
int input;
float learning_rate, momentum, decay;
int output = option_find_int(options, "output",1);
- char *activation_s = option_find_str(options, "activation", "sigmoid");
+ char *activation_s = option_find_str(options, "activation", "logistic");
ACTIVATION activation = get_activation(activation_s);
if(count == 0){
input = option_find_int(options, "input",1);
@@ -775,7 +775,7 @@
fclose(fp);
}
-void load_weights(network *net, char *filename)
+void load_weights_upto(network *net, char *filename, int cutoff)
{
fprintf(stderr, "Loading weights from %s\n", filename);
FILE *fp = fopen(filename, "r");
@@ -788,7 +788,7 @@
set_learning_network(net, net->learning_rate, net->momentum, net->decay);
int i;
- for(i = 0; i < net->n; ++i){
+ for(i = 0; i < net->n && i < cutoff; ++i){
if(net->types[i] == CONVOLUTIONAL){
convolutional_layer layer = *(convolutional_layer *) net->layers[i];
int num = layer.n*layer.c*layer.size*layer.size;
@@ -825,6 +825,11 @@
fclose(fp);
}
+void load_weights(network *net, char *filename)
+{
+ load_weights_upto(net, filename, net->n);
+}
+
void save_network(network net, char *filename)
{
FILE *fp = fopen(filename, "w");
--
Gitblit v1.10.0