Fix path.

Author: Xreki

.github/workflows/Validate-GPU.yml

@@ -61,7 +61,7 @@ jobs:
             -v "/home/data/cfs/.ccache:/root/.ccache" \
             -v "/dev/shm:/dev/shm" \
             -v ${{ github.workspace }}/../../..:${{ github.workspace }}/../../.. \
-            -v ${{ github.workspace }}:/graphnet \
+            -v ${{ github.workspace }}:${{ github.workspace }} \
             -e python \
             -e core_index \
             -e BRANCH \
@@ -73,7 +73,7 @@ jobs:
             -e CACHE_DIR \
             -e GITHUB_API_TOKEN \
             -e CFS_DIR \
-            -w /graphnet --network host ${docker_image}
+            -w ${{ github.workspace }} --network host ${docker_image}
 
       - name: Run check
         env:

graph_net/paddle/check_redundant_incrementally.py

@@ -46,23 +46,44 @@ def main(args):
     assert os.path.isdir(
         args.graph_net_samples_path
     ), f"args.graph_net_samples_path ({args.graph_net_samples_path}) is not a directory!"
+
+    current_model_graph_hash_pathes = set()
+    if args.model_path:
+        assert os.path.isdir(
+            args.model_path
+        ), f"args.model_path {args.model_path} is not a directory!"
+        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"]
+        )
+
     find_redundant = False
     graph_hash2graph_net_model_path = {}
     for model_path in get_recursively_model_pathes(args.graph_net_samples_path):
-        if args.model_path is None or args.model_path != model_path:
-            graph_hash_path = f"{model_path}/graph_hash.txt"
-            if os.path.isfile(graph_hash_path):
-                graph_hash = open(graph_hash_path).read()
-                if graph_hash not in graph_hash2graph_net_model_path.keys():
-                    graph_hash2graph_net_model_path[graph_hash] = [graph_hash_path]
-                else:
-                    find_redundant = True
-                    graph_hash2graph_net_model_path[graph_hash].append(graph_hash_path)
+        graph_hash_path = f"{model_path}/graph_hash.txt"
+        if (
+            os.path.isfile(graph_hash_path)
+            and graph_hash_path not in current_model_graph_hash_pathes
+        ):
+            graph_hash = open(graph_hash_path).read()
+            if graph_hash not in graph_hash2graph_net_model_path.keys():
+                graph_hash2graph_net_model_path[graph_hash] = [graph_hash_path]
+            else:
+                find_redundant = True
+                graph_hash2graph_net_model_path[graph_hash].append(graph_hash_path)
     print(
         f"Totally {len(graph_hash2graph_net_model_path)} unique samples under {args.graph_net_samples_path}."
     )
 
     if not args.model_path:
+        # Check whether the specified model is redundant.
+        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.\n\tgraph_hash:{graph_hash}, newly-added-model-path:{current_model_graph_hash_path}, existing-model-path:{graph_hash2graph_net_model_path[graph_hash]}."
+    else:
         # Check whether there are redundant samples under samples directory.
         for graph_hash, graph_paths in graph_hash2graph_net_model_path.items():
             if len(graph_paths) > 1:
@@ -72,21 +93,6 @@ def main(args):
         assert (
             not find_redundant
         ), f"Redundant models detected under {args.graph_net_samples_path}."
-    else:
-        # Check whether the specified model is redundant.
-        assert os.path.isdir(
-            args.model_path
-        ), f"args.model_path {args.model_path} is not a directory!"
-        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"]
-        )
-        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__":

graph_net/paddle/samples_util.py

@@ -3,4 +3,5 @@
 
 
 def get_default_samples_directory():
-    return f"{os.path.dirname(graph_net.__file__)}/../paddle_samples"
+    graph_net_root = os.path.dirname(os.path.dirname(graph_net.__file__))
+    return f"{graph_net_root}/paddle_samples"