Merge branch 'develop' into opt_paddle_unittest

Author: Xreki

graph_net/sample_pass/agent_unittest_generator.py

@@ -210,6 +210,7 @@ def __init__(
         self,
         framework: str,
         model_path: str,
+        output_name: str,
         output_dir: str,
         device: Literal["auto", "cpu", "cuda"] = "auto",
         generate_main: bool = False,
@@ -219,6 +220,7 @@ def __init__(
     ):
         self.framework = framework
         self.model_path = Path(model_path).resolve()
+        self.output_name = output_name
         self.output_dir = Path(output_dir)
         self.device = self._choose_device(device)
         self.generate_main = generate_main
@@ -283,7 +285,7 @@ def _make_data_input_predicator(
         return lambda *args, **kwargs: True
 
     def _write_to_file(self, unittest, output_dir):
-        output_path = Path(output_dir) / f"{self.model_path.name}_test.py"
+        output_path = Path(output_dir) / self.output_name
         output_path.parent.mkdir(parents=True, exist_ok=True)
         output_path.write_text(unittest, encoding="utf-8")
         print(
@@ -447,12 +449,25 @@ def declare_config(
     def __call__(self, rel_model_path: str):
         self.resumable_handle_sample(rel_model_path)
 
+    def sample_handled(self, rel_model_path: str) -> bool:
+        dst_model_path = Path(self.config["output_dir"]) / rel_model_path
+        if not dst_model_path.exists():
+            return False
+        output_name = self._get_output_name(rel_model_path)
+        num_model_py_files = len(list(dst_model_path.rglob(output_name)))
+        assert num_model_py_files <= 1
+        return num_model_py_files == 1
+
+    def _get_output_name(self, rel_model_path: str):
+        return f"{Path(rel_model_path).name}_test.py"
+
     def resume(self, rel_model_path: str):
         model_path_prefix = Path(self.config["model_path_prefix"])
         output_dir = Path(self.config["output_dir"])
         generator = AgentUnittestGenerator(
             framework=self.config["framework"],
             model_path=str(model_path_prefix / rel_model_path),
+            output_name=self._get_output_name(rel_model_path),
             output_dir=str(output_dir / rel_model_path),
             device=self.config["device"],
             generate_main=self.config["generate_main"],

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())