From 9802287b5890d9b2cc250adba1b9810657a95c9c Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Fri, 18 Dec 2015 23:55:58 +0000
Subject: [PATCH] some fixes
---
src/convolutional_layer.c | 30 ++++++++++++++++++++++++------
1 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/src/convolutional_layer.c b/src/convolutional_layer.c
index ec571a6..e97b00d 100644
--- a/src/convolutional_layer.c
+++ b/src/convolutional_layer.c
@@ -194,13 +194,25 @@
#endif
}
-void bias_output(float *output, float *biases, int batch, int n, int size)
+void add_bias(float *output, float *biases, int batch, int n, int size)
{
int i,j,b;
for(b = 0; b < batch; ++b){
for(i = 0; i < n; ++i){
for(j = 0; j < size; ++j){
- output[(b*n + i)*size + j] = biases[i];
+ output[(b*n + i)*size + j] += biases[i];
+ }
+ }
+ }
+}
+
+void scale_bias(float *output, float *scales, int batch, int n, int size)
+{
+ int i,j,b;
+ for(b = 0; b < batch; ++b){
+ for(i = 0; i < n; ++i){
+ for(j = 0; j < size; ++j){
+ output[(b*n + i)*size + j] *= scales[i];
}
}
}
@@ -222,7 +234,7 @@
int out_w = convolutional_out_width(l);
int i;
- bias_output(l.output, l.biases, l.batch, l.n, out_h*out_w);
+ fill_cpu(l.outputs*l.batch, 0, l.output, 1);
int m = l.n;
int k = l.size*l.size*l.c;
@@ -241,10 +253,16 @@
}
if(l.batch_normalize){
- mean_cpu(l.output, l.batch, l.n, l.out_h*l.out_w, l.mean);
- variance_cpu(l.output, l.mean, l.batch, l.n, l.out_h*l.out_w, l.variance);
- normalize_cpu(l.output, l.mean, l.variance, l.batch, l.n, l.out_h*l.out_w);
+ if(state.train){
+ mean_cpu(l.output, l.batch, l.n, l.out_h*l.out_w, l.mean);
+ variance_cpu(l.output, l.mean, l.batch, l.n, l.out_h*l.out_w, l.variance);
+ normalize_cpu(l.output, l.mean, l.variance, l.batch, l.n, l.out_h*l.out_w);
+ } else {
+ normalize_cpu(l.output, l.rolling_mean, l.rolling_variance, l.batch, l.n, l.out_h*l.out_w);
+ }
+ scale_bias(l.output, l.scales, l.batch, l.n, out_h*out_w);
}
+ add_bias(l.output, l.biases, l.batch, l.n, out_h*out_w);
activate_array(l.output, m*n*l.batch, l.activation);
}
--
Gitblit v1.10.0