Commit efa492d6 authored by Yuxin Wu's avatar Yuxin Wu

name scope of StagingInput: use the one in _setup

parent 05352860
...@@ -3,7 +3,7 @@ six ...@@ -3,7 +3,7 @@ six
termcolor>=1.1 termcolor>=1.1
tabulate>=0.7.7 tabulate>=0.7.7
tqdm>4.11.1 tqdm>4.11.1
msgpack-python>0.4.0 msgpack
msgpack-numpy>=0.3.9 msgpack-numpy>=0.3.9
pyzmq>=16 pyzmq>=16
subprocess32; python_version < '3.0' subprocess32; python_version < '3.0'
......
...@@ -520,6 +520,8 @@ class StagingInput(FeedfreeInput): ...@@ -520,6 +520,8 @@ class StagingInput(FeedfreeInput):
def _setup(self, inputs): def _setup(self, inputs):
self._input.setup(inputs) self._input.setup(inputs)
with self.cached_name_scope():
pass # just to cache the correct ns to use
def _get_callbacks(self): def _get_callbacks(self):
cbs = self._input.get_callbacks() cbs = self._input.get_callbacks()
......
...@@ -165,7 +165,7 @@ class InputSource(object): ...@@ -165,7 +165,7 @@ class InputSource(object):
with tf.name_scope(self._name_scope): with tf.name_scope(self._name_scope):
yield self._name_scope yield self._name_scope
else: else:
name = type(self).__name__ + '/' name = type(self).__name__
with tf.name_scope(name) as ns: with tf.name_scope(name) as ns:
self._name_scope = ns self._name_scope = ns
yield ns yield ns
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment