Merge pull request pkmital#24 from bigsnarfdude/master

pkmital · web-flow · commit 4bd101c52db9 · 2016-11-10T23:38:04.000-08:00
refactored modern_convnet.py code for r11
diff --git a/python/libs/batch_norm.py b/python/libs/batch_norm.py
@@ -3,7 +3,6 @@
 """
 
 import tensorflow as tf
-from tensorflow.python import control_flow_ops
 
 
 def batch_norm(x, phase_train, scope='bn', affine=True):
@@ -54,7 +53,7 @@ def mean_var_with_update():
             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,
+        mean, var = tf.cond(phase_train,
                                           mean_var_with_update,
                                           lambda: (ema_mean, ema_var))
 
diff --git a/python/libs/connections.py b/python/libs/connections.py
@@ -3,7 +3,6 @@
 """
 import math
 import tensorflow as tf
-from tensorflow.python import control_flow_ops
 
 
 def batch_norm(x, phase_train, scope='bn', affine=True):
@@ -51,7 +50,7 @@ def mean_var_with_update():
             """
             with tf.control_dependencies([ema_apply_op]):
                 return tf.identity(batch_mean), tf.identity(batch_var)
-        mean, var = control_flow_ops.cond(phase_train,
+        mean, var = tf.cond(phase_train,
                                           mean_var_with_update,
                                           lambda: (ema_mean, ema_var))
 
