modify get fully fusible subgraph

Author: roll-away

graph_net/test/new_graph_decompose_and_look_for_fully_fusible_subgraph_test.sh

@@ -31,36 +31,3 @@ CONFIG=$(echo $config_json_str | base64 -w 0)
 
 # python3 -m graph_net.model_path_handler --model-path $GRAPH_NET_ROOT/../samples/$MODEL_PATH_IN_SAMPLES --handler-config=$CONFIG
 python3 -m graph_net.model_path_handler --model-path-list $INPUT_MODEL_LIST --handler-config=$CONFIG
-
-
-# 1. 读取总输入数量 (通过计算输入模型列表文件中的行数)
-if [ ! -f "$INPUT_MODEL_LIST" ]; then
-    echo "input dir $INPUT_MODEL_LIST not exist."
-    TOTAL_INPUT_COUNT=0
-else
-    # wc -l 计算行数, awk '{print $1}' 移除文件名
-    TOTAL_INPUT_COUNT=$(wc -l < "$INPUT_MODEL_LIST")
-fi
-
-# 2. 统计已产出文件夹数量
-if [ ! -d "$OUTPUT_DIR" ]; then
-    echo "output dir $OUTPUT_DIR not exist."
-    PRODUCED_COUNT=0
-else
-    # 查找 OUTPUT_DIR 下的一级子目录数量
-    # -mindepth 1: 忽略父目录本身
-    # -maxdepth 1: 只查找一级目录
-    # -type d: 只查找目录 (文件夹)
-    PRODUCED_COUNT=$(find "$OUTPUT_DIR" -mindepth 1 -maxdepth 1 -type d | wc -l)
-fi
-
-
-echo "Total Input = $TOTAL_INPUT_COUNT"
-echo "Total Output = $PRODUCED_COUNT"
-
-# 3. 计算产出率 (使用 bc 进行浮点数运算)
-if [ "$TOTAL_INPUT_COUNT" -gt 0 ]; then
-    # scale=2 设置小数点后两位精度
-    PRODUCTION_RATE=$(echo "scale=2; ($PRODUCED_COUNT * 100) / $TOTAL_INPUT_COUNT" | bc)
-    echo "Production Rate = ${PRODUCTION_RATE}%"
-fi

graph_net/torch/fully_fusible_subgraph_extractor.py

@@ -60,14 +60,20 @@ def _get_sub_ranges(self):
                 ), f"Invalid range generated: start={start_pos}, end={end_pos}, max={self.config['max_nodes']}"
                 yield start_pos, end_pos
 
-    def _handle_success(self, temp_dir: str, start_pos: int, end_pos: int) -> str:
-        target_name = f"_start{start_pos}_end{end_pos}"
+    def _handle_success(
+        self, temp_dir: str, start_pos: int, end_pos: int, model_name
+    ) -> str:
+        target_name = f"{model_name}_start{start_pos}_end{end_pos}"
         target_path = os.path.join(
             self.config["output_dir"],
             target_name,
         )
         os.makedirs(target_path, exist_ok=True)
-        shutil.move(temp_dir, target_path)
+        # shutil.move(temp_dir, target_path)
+        for item in os.listdir(temp_dir):
+            source = os.path.join(temp_dir, item)
+            destination = os.path.join(target_path, item)
+            shutil.move(source, destination)
         return target_path
 
     def _build_decompose_config(
@@ -76,7 +82,7 @@ def _build_decompose_config(
         graph_net_root = os.path.dirname(graph_net.__file__)
 
         check_fusible_config = {
-            "handler_path": f"{graph_net_root}/torch/naive_graph_decomposer.py",
+            "handler_path": f"{graph_net_root}/torch/graph_decomposer.py",
             "handler_class_name": "NaiveDecomposerExtractor",
             "handler_config": {
                 "model_path_prefix": model_path_prefix,
@@ -105,7 +111,9 @@ def __call__(self, rel_model_path):
                 )
                 success = predicator(model_path)
                 if success:
-                    target_path = self._handle_success(temp_dir, start_pos, end_pos)
+                    target_path = self._handle_success(
+                        temp_dir, start_pos, end_pos, os.path.basename(model_path)
+                    )
                     print(
                         f"SUCCESS in finding the biggest fully fusible subgraph. Result saved to: {target_path}"
                     )