fix ns in replicated mode

tensorpack/graph_builder/utils.py

@@ -40,10 +40,13 @@ def override_to_local_variable(enable=True):
             _replace_global_by_local(kwargs)
             return getter(name, *args, **kwargs)
 
+        orig_vs = tf.get_variable_scope()
+        # TODO TF1.5 has https://github.com/tensorflow/tensorflow/pull/14390
         with tf.variable_scope(
                 tf.get_variable_scope(),
                 custom_getter=custom_getter):
-            yield
+            with tf.name_scope(orig_vs.original_name_scope):
+                yield
     else:
         yield
 

tensorpack/models/regularize.py

@@ -107,7 +107,7 @@ def regularize_cost_from_collection(name='regularize_cost'):
         losses = tf.get_collection(tf.GraphKeys.REGULARIZATION_LOSSES)
     if len(losses) > 0:
         logger.info("Add REGULARIZATION_LOSSES of {} tensors on the total cost.".format(len(losses)))
-        reg_loss = tf.add_n(losses)
+        reg_loss = tf.add_n(losses, name=name)
         return reg_loss
     else:
         return None