Merge branch 'develop' of https://github.com/PaddlePaddle/GraphNet into subgraph_dataset

Author: JewelRoam

graph_net/torch/decompose_util.py

@@ -59,7 +59,7 @@ def get_range_idx2range_by_split_positions():
         ]
 
     def get_range_idx2range_by_subgraph_ranges():
-        assert submodules_body_nodes is not None
+        assert subgraph_ranges is not None
         num_nodes = len(submodules_body_nodes)
         for i in range(len(subgraph_ranges)):
             start, end = subgraph_ranges[i]
@@ -72,7 +72,7 @@ def get_range_idx2range_by_subgraph_ranges():
 
     range_idx2range = (
         get_range_idx2range_by_split_positions()
-        if (chain_style or submodules_body_nodes is None)
+        if (chain_style or subgraph_ranges is None)
         else get_range_idx2range_by_subgraph_ranges()
     )
     range_idx2submodule_body_nodes = [

graph_net/torch/fx_graph_parse_util.py

@@ -116,8 +116,8 @@ def _rename_placeholder(name, pattern2replacement):
     if not (name[:2] == "L_" or name[:2] == "l_"):
         return name
     name = name[2:]
-    if name[0] == "l":
-        name = "L" + name[1:]
+    if name[:2] == "l_":
+        name = "L_" + name[2:]
     for pattern, replacement in pattern2replacement.items():
         name = name.replace(pattern, replacement)
     return name
@@ -161,7 +161,7 @@ def get_input_names_from_placeholder():
         if node.op != "placeholder":
             continue
         node.target = _rename_placeholder(node.target, pattern2replacement)
-        node.name = _rename_placeholder(node.name, pattern2replacement)
+        node.name = node.target
 
     def get_diff_input_names():
         placeholder_names = set(get_input_names_from_placeholder())