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

Author: lixinqi

.github/workflows/Validate-GPU.yml

@@ -78,6 +78,7 @@ jobs:
       - name: Run check
         env:
           work_dir: ${{ github.workspace }}
+        if: steps.check-bypass.outputs.can-skip != 'true'
         run: |
           docker exec -t ${{ env.container_name }} /bin/bash -c '
           source ${{ github.workspace }}/../../../proxy

README.md

@@ -91,17 +91,18 @@ python -m graph_net.config --global \
   --username "your-name" \
   --email "your-email"
 ```
-Once you have packaged these extracted computation graphs, submit them to the GraphNet community via the following group chats. [Discord](https://discord.gg/Pp5FKW92) is also available.
+Once you have packaged these extracted computation graphs, submit them to the GraphNet community via the following group chats.
 
 
 <div align="center">
 <table>
 <tr>
 <td align="center">
-    <img width="200" src="https://github.com/user-attachments/assets/1dc910dd-f5d8-4661-b6b8-d1ae23bb6ddb" />
+    <img width="200" src="https://github.com/user-attachments/assets/eef90a3e-ce83-4757-94ea-b0c0757785f0" />
 </td>
 <td align="center">
-    <img width="200" src="https://github.com/user-attachments/assets/140fa03e-36ef-44bf-8d9a-ca65c83b0139" />
+    <img width="150" src="https://cdn.prod.website-files.com/6257adef93867e50d84d30e2/67d00cf7266d2c75571aebde_Example.svg" />
+    <p><a href="https://discord.gg/43XQ3tf7">Channel</a> is also available.</p>
 </td>
 </tr>
 </table>

graph_net/__init__.py

@@ -1 +1 @@
-import graph_net.torch as torch
+

graph_net/paddle/__init__.py

@@ -0,0 +1,7 @@
+"""
+GraphNet Paddle Implementation
+"""
+
+from .samples_util import get_default_samples_directory
+
+__all__ = ["get_default_samples_directory"]

graph_net/paddle/check_redundant_incrementally.py

@@ -0,0 +1,84 @@
+from . import utils
+import argparse
+import importlib.util
+import inspect
+from pathlib import Path
+from typing import Type, Any
+import sys
+import os
+import os.path
+from dataclasses import dataclass
+from contextlib import contextmanager
+import time
+import glob
+
+
+def get_recursively_model_pathes(root_dir):
+    for sub_dir in _get_recursively_model_pathes(root_dir):
+        yield os.path.realpath(sub_dir)
+
+
+def _get_recursively_model_pathes(root_dir):
+    if is_single_model_dir(root_dir):
+        yield root_dir
+        return
+    for sub_dir in get_immediate_subdirectory_paths(root_dir):
+        if is_single_model_dir(sub_dir):
+            yield sub_dir
+        else:
+            yield from get_recursively_model_pathes(sub_dir)
+
+
+def get_immediate_subdirectory_paths(parent_dir):
+    return [
+        sub_dir
+        for name in os.listdir(parent_dir)
+        for sub_dir in [os.path.join(parent_dir, name)]
+        if os.path.isdir(sub_dir)
+    ]
+
+
+def is_single_model_dir(model_dir):
+    return os.path.isfile(f"{model_dir}/graph_net.json")
+
+
+def main(args):
+    assert os.path.isdir(args.model_path)
+    assert os.path.isdir(args.graph_net_samples_path)
+    current_model_graph_hash_pathes = set(
+        graph_hash_path
+        for model_path in get_recursively_model_pathes(args.model_path)
+        for graph_hash_path in [f"{model_path}/graph_hash.txt"]
+    )
+    graph_hash2graph_net_model_path = {
+        graph_hash: graph_hash_path
+        for model_path in get_recursively_model_pathes(args.graph_net_samples_path)
+        for graph_hash_path in [f"{model_path}/graph_hash.txt"]
+        if os.path.isfile(graph_hash_path)
+        if graph_hash_path not in current_model_graph_hash_pathes
+        for graph_hash in [open(graph_hash_path).read()]
+    }
+    for current_model_graph_hash_path in current_model_graph_hash_pathes:
+        graph_hash = open(current_model_graph_hash_path).read()
+        assert (
+            graph_hash not in graph_hash2graph_net_model_path
+        ), f"Redundant models detected. old-model-path:{current_model_graph_hash_path}, new-model-path:{graph_hash2graph_net_model_path[graph_hash]}."
+
+
+if __name__ == "__main__":
+    parser = argparse.ArgumentParser(description="Test compiler performance.")
+    parser.add_argument(
+        "--model-path",
+        type=str,
+        required=True,
+        help="Path to model file(s), each subdirectory containing graph_net.json will be regarded as a model",
+    )
+    parser.add_argument(
+        "--graph-net-samples-path",
+        type=str,
+        required=False,
+        default="default",
+        help="Path to GraphNet samples",
+    )
+    args = parser.parse_args()
+    main(args=args)

graph_net/paddle/remove_redundant_incrementally.py

@@ -0,0 +1,87 @@
+from . import utils
+import argparse
+import importlib.util
+import inspect
+from pathlib import Path
+from typing import Type, Any
+import sys
+import os
+import os.path
+from dataclasses import dataclass
+from contextlib import contextmanager
+import time
+import glob
+import shutil
+
+
+def get_recursively_model_pathes(root_dir):
+    for sub_dir in _get_recursively_model_pathes(root_dir):
+        yield os.path.realpath(sub_dir)
+
+
+def _get_recursively_model_pathes(root_dir):
+    if is_single_model_dir(root_dir):
+        yield root_dir
+        return
+    for sub_dir in get_immediate_subdirectory_paths(root_dir):
+        if is_single_model_dir(sub_dir):
+            yield sub_dir
+        else:
+            yield from get_recursively_model_pathes(sub_dir)
+
+
+def get_immediate_subdirectory_paths(parent_dir):
+    return [
+        sub_dir
+        for name in os.listdir(parent_dir)
+        for sub_dir in [os.path.join(parent_dir, name)]
+        if os.path.isdir(sub_dir)
+    ]
+
+
+def is_single_model_dir(model_dir):
+    return os.path.isfile(f"{model_dir}/graph_net.json")
+
+
+def main(args):
+    assert os.path.isdir(args.model_path)
+    assert os.path.isdir(args.graph_net_samples_path)
+    current_model_graph_hash_pathes = set(
+        graph_hash_path
+        for model_path in get_recursively_model_pathes(args.model_path)
+        for graph_hash_path in [f"{model_path}/graph_hash.txt"]
+    )
+    graph_hash2graph_net_model_path = {
+        graph_hash: graph_hash_path
+        for model_path in get_recursively_model_pathes(args.graph_net_samples_path)
+        for graph_hash_path in [f"{model_path}/graph_hash.txt"]
+        if os.path.isfile(graph_hash_path)
+        if graph_hash_path not in current_model_graph_hash_pathes
+        for graph_hash in [open(graph_hash_path).read()]
+    }
+    for current_model_graph_hash_path in current_model_graph_hash_pathes:
+        graph_hash = open(current_model_graph_hash_path).read()
+        if graph_hash not in graph_hash2graph_net_model_path:
+            continue
+        directory = os.path.dirname(current_model_graph_hash_path)
+        shutil.rmtree(directory)
+        os.makedirs(directory, exist_ok=True)
+
+
+if __name__ == "__main__":
+    parser = argparse.ArgumentParser(description="Test compiler performance.")
+    parser.add_argument(
+        "--model-path",
+        type=str,
+        required=True,
+        help="Path to model file(s), each subdirectory containing graph_net.json will be regarded as a model",
+    )
+    parser.add_argument(
+        "--graph-net-samples-path",
+        type=str,
+        required=False,
+        default="default",
+        help="Path to GraphNet samples",
+    )
+    args = parser.parse_args()
+    main(args=args)

graph_net/paddle/samples_util.py

@@ -0,0 +1,6 @@
+import graph_net
+import os
+
+
+def get_default_samples_directory():
+    return f"{os.path.dirname(graph_net.__file__)}/../paddle_samples"