Unify BN behavior in TF and Theano

satels · Aug 3, 2016 · 97d2a73 · 97d2a73
1 parent 5367a44
commit 97d2a73
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/keras/backend/tensorflow_backend.py b/keras/backend/tensorflow_backend.py
@@ -649,7 +649,9 @@ def normalize_batch_in_training(x, gamma, beta,
 
 
 def batch_normalization(x, mean, std, beta, gamma, epsilon=0.0001):
-    '''Apply batch normalization on x given mean, std, beta and gamma.
+    '''Apply batch normalization on x given mean, std, beta and gamma:
+
+    output = (x - mean) / (sqrt(std) + epsilon) * gamma + beta
     '''
     return tf.nn.batch_normalization(x, mean, std, beta, gamma, epsilon)
 

diff --git a/keras/backend/theano_backend.py b/keras/backend/theano_backend.py
@@ -386,7 +386,8 @@ def normalize_batch_in_training(x, gamma, beta,
 def batch_normalization(x, mean, std, beta, gamma, epsilon=0.0001):
     '''Apply batch normalization on x given mean, std, beta and gamma.
     '''
-    normed = T.nnet.bn.batch_normalization(x, gamma, beta, mean, std + epsilon,
+    normed = T.nnet.bn.batch_normalization(x, gamma, beta, mean,
+                                           sqrt(std) + epsilon,
                                            mode='high_mem')
     return normed