Merge pull request #25 from DreSimpelo/patch-3

Update to batch_norm (Unwanted ema updates)

Author: pkmital

python/libs/batch_norm.py

@@ -41,7 +41,6 @@ def batch_norm(x, phase_train, scope='bn', affine=True):
 
         batch_mean, batch_var = tf.nn.moments(x, [0, 1, 2], name='moments')
         ema = tf.train.ExponentialMovingAverage(decay=0.9)
-        ema_apply_op = ema.apply([batch_mean, batch_var])
         ema_mean, ema_var = ema.average(batch_mean), ema.average(batch_var)
 
         def mean_var_with_update():
@@ -52,6 +51,7 @@ def mean_var_with_update():
             name : TYPE
                 Description
             """
+            ema_apply_op = ema.apply([batch_mean, batch_var])
             with tf.control_dependencies([ema_apply_op]):
                 return tf.identity(batch_mean), tf.identity(batch_var)
         mean, var = control_flow_ops.cond(phase_train,