Initial commit

python/mxnet/attribute.py

@@ -20,6 +20,7 @@
 from __future__ import absolute_import
 import threading
 import warnings
+from collections import defaultdict
 
 from .base import string_types, classproperty, with_metaclass, _MXClassPropertyMetaClass
 
@@ -34,6 +35,7 @@ class AttrScope(with_metaclass(_MXClassPropertyMetaClass, object)):
         The attributes to set for all symbol creations in the scope.
     """
     _current = threading.local()
+    _subgraph_names = defaultdict(int)
 
     def __init__(self, **kwargs):
         self._old_scope = None

python/mxnet/symbol/contrib.py

@@ -124,6 +124,14 @@ def _cut_subgraph(subg):
         syms.append(s)
     return syms
 
+def _get_unique_subgraph_name(subgraph_name):
+    attrs = AttrScope._current.value._attr
+    if attrs.get("__subgraph_name__", "") != "":
+        subgraph_name = "".join([attrs["__subgraph_name__"], "$", subgraph_name])
+    subgraph_name = subgraph_name + str(AttrScope._subgraph_names.get(subgraph_name, 0))
+    AttrScope._subgraph_names[subgraph_name] += 1
+    return subgraph_name
+
 # This construct a subgraph for given output nodes.
 # If an output node is one of the input nodes, we call identity to make sure
 # that outputs nodes are different from input nodes.
@@ -234,6 +242,7 @@ def check_data(inputs, in_type, msg):
     # the python function, we need to prune the computation graph constructed from
     # the function. One way of doing it is to mark the nodes in the computation graph
     # with AttrScope and prune the nodes without the special attribute.
+    name = _get_unique_subgraph_name(name)
     with AttrScope(__subgraph_name__=name):
         if isinstance(data, list):
             in_eles = [symbol.var(sym.name) for sym in data]
@@ -458,6 +467,7 @@ def _func_wrapper(loop_vars):
         return list(step_output), list(new_loop_vars)
 
     def _create_subgraph(graph_vars, graph_func, subgraph_name):
+        subgraph_name = _get_unique_subgraph_name(subgraph_name)
         with AttrScope(__subgraph_name__=subgraph_name):
             # create new variables with the same name,
             # them feed them to the given func
@@ -618,6 +628,7 @@ def _to_symbol_tuple(inputs, name):
         return inputs
 
     def _create_subgraph(graph_vars, graph_func, subgraph_name):
+        subgraph_name = _get_unique_subgraph_name(subgraph_name)
         with AttrScope(__subgraph_name__=subgraph_name):
             # create new variables with the same name,
             # them feed them to the given func