From b32a287e38f4c6a41828f18b4669dec9f3af4943 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Thu, 17 Jul 2014 17:17:52 +0000
Subject: [PATCH] Merge branch 'master' of pjreddie.com:jnet
---
src/parser.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/parser.c b/src/parser.c
index 4aa0a79..b008882 100644
--- a/src/parser.c
+++ b/src/parser.c
@@ -48,6 +48,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);
+ int pad = option_find_int(options, "pad",0);
char *activation_s = option_find_str(options, "activation", "sigmoid");
ACTIVATION activation = get_activation(activation_s);
if(count == 0){
@@ -62,7 +63,7 @@
c = m.c;
if(h == 0) error("Layer before convolutional layer must output image.");
}
- convolutional_layer *layer = make_convolutional_layer(net.batch,h,w,c,n,size,stride, activation);
+ convolutional_layer *layer = make_convolutional_layer(net.batch,h,w,c,n,size,stride,pad,activation);
char *data = option_find_str(options, "data", 0);
if(data){
char *curr = data;
@@ -89,6 +90,7 @@
int i;
int input;
int output = option_find_int(options, "output",1);
+ float dropout = option_find_float(options, "dropout", 0.);
char *activation_s = option_find_str(options, "activation", "sigmoid");
ACTIVATION activation = get_activation(activation_s);
if(count == 0){
@@ -97,7 +99,7 @@
}else{
input = get_network_output_size_layer(net, count-1);
}
- connected_layer *layer = make_connected_layer(net.batch, input, output, activation);
+ connected_layer *layer = make_connected_layer(net.batch, input, output, dropout, activation);
char *data = option_find_str(options, "data", 0);
if(data){
char *curr = data;
--
Gitblit v1.10.0