post-shadow

Author: xadupre

_unittests/ut_helpers/test_onnx_helper.py

@@ -458,7 +458,14 @@ def _mkv_(name):
             opset_imports=[oh.make_operatorsetid("", 18)],
             ir_version=10,
         )
-        self.assertEqual({"three"}, shadowing_names(model))
+        self.assertEqual(
+            (
+                {"three"},
+                set(),
+                {"cond", "Z", "X0", "Z_c", "three", "one_c", "Xred", "X00", "Y"},
+            ),
+            shadowing_names(model),
+        )
 
 
 if __name__ == "__main__":

onnx_diagnostic/_command_lines_parser.py

@@ -218,7 +218,9 @@ def _cmd_find(argv: List[Any]):
     args = parser.parse_args(argv[1:])
     if args.names == "SHADOW":
         onx = onnx.load(args.input, load_external_data=False)
-        print(f"shadowing names: {shadowing_names(onx)}")
+        s, ps = shadowing_names(onx)[:2]
+        print(f"shadowing names: {s}")
+        print(f"post-shadowing names: {ps}")
     elif args.v2:
         onx = onnx.load(args.input, load_external_data=False)
         res = list(

onnx_diagnostic/helpers/onnx_helper.py

@@ -1126,8 +1126,12 @@ def shadowing_names(
     verbose: int = 0,
     existing: Optional[Set[str]] = None,
     shadow_context: Optional[Set[str]] = None,
-) -> Set[str]:
-    """Returns the shadowing names."""
+    post_shadow_context: Optional[Set[str]] = None,
+) -> Tuple[Set[str], Set[str], Set[str]]:
+    """
+    Returns the shadowing names, the names created in the main graph
+    after they were created in a subgraphs and the names created by the nodes.
+    """
     if isinstance(proto, ModelProto):
         return shadowing_names(proto.graph)
     if isinstance(proto, GraphProto):
@@ -1141,6 +1145,7 @@ def shadowing_names(
             | set(i.name for i in proto.sparse_initializer)
             | set(i.name for i in proto.input if i.name),
             shadow_context=set(),
+            post_shadow_context=set(),
         )
     if isinstance(proto, FunctionProto):
         assert (
@@ -1151,6 +1156,7 @@ def shadowing_names(
             verbose=verbose,
             existing=set(i for i in proto.input if i),
             shadow_context=set(),
+            post_shadow_context=set(),
         )
 
     assert (
@@ -1159,6 +1165,8 @@ def shadowing_names(
     shadow = set()
     shadow_context = shadow_context.copy()
     existing = existing.copy()
+    created = set()
+    post_shadow = set()
     for node in proto:
         not_empty = set(n for n in node.input if n)
         intersection = not_empty & existing
@@ -1172,11 +1180,15 @@ def shadowing_names(
                 shadow |= set(i.name for i in g.input) & shadow_context
                 shadow |= set(i.name for i in g.initializer) & shadow_context
                 shadow |= set(i.name for i in g.sparse_initializer) & shadow_context
-                shadow |= shadowing_names(
+                s, ps, c = shadowing_names(
                     g.node, verbose=verbose, existing=existing, shadow_context=existing
                 )
+                shadow |= s
+                created |= c
 
         not_empty = set(n for n in node.output if n)
+        post_shadow |= not_empty & created
         shadow |= not_empty & shadow_context
         existing |= not_empty
-    return shadow
+        created |= not_empty
+    return shadow, post_shadow, created