Fix tensor name for batch norm (#663); plus some docs update.

docs/modules/utils.rst

@@ -26,14 +26,6 @@ tensorpack.utils.fs module
     :undoc-members:
     :show-inheritance:
 
-tensorpack.utils.globvars module
---------------------------------
-
-.. automodule:: tensorpack.utils.globvars
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
 tensorpack.utils.loadcaffe module
 ---------------------------------
 

examples/Char-RNN/char-rnn.py

@@ -16,11 +16,15 @@ from six.moves import range
 from tensorpack import *
 from tensorpack.tfutils import summary, optimizer
 from tensorpack.tfutils.gradproc import GlobalNormClip
-from tensorpack.utils.globvars import globalns as param
 
 import tensorflow as tf
 rnn = tf.contrib.rnn
 
+class _NS: pass  # noqa
+
+
+param = _NS()
+
 # some model hyperparams to set
 param.batch_size = 128
 param.rnn_size = 256

tensorpack/models/batch_norm.py

@@ -54,7 +54,7 @@ def update_bn_ema(xn, batch_mean, batch_var,
     else:
         tf.add_to_collection(tf.GraphKeys.UPDATE_OPS, update_op1)
         tf.add_to_collection(tf.GraphKeys.UPDATE_OPS, update_op2)
-        return xn
+        return tf.identity(xn, name='output')
 
 
 def reshape_for_bn(param, ndims, chan, data_format):

tensorpack/tfutils/common.py

@@ -47,7 +47,6 @@ def get_default_sess_config(mem_fraction=0.99):
     # conf.graph_options.rewrite_options.memory_optimization = \
     #     rwc.RewriterConfig.HEURISTICS
 
-
     # May hurt performance
     # conf.graph_options.optimizer_options.global_jit_level = tf.OptimizerOptions.ON_1
     # conf.graph_options.place_pruned_graph = True

tensorpack/train/interface.py

@@ -2,8 +2,6 @@
 # -*- coding: utf-8 -*-
 # File: interface.py
 
-import tensorflow as tf
-
 from ..input_source import (
     InputSource, FeedInput, QueueInput, StagingInput, DummyConstantInput)
 from ..utils import logger