Update bypass user name, check_validate ci and count_samples tools.

Author: Xreki

.github/actions/check-bypass/action.yml

@@ -1,5 +1,5 @@
 name: "Check bypass"
-description: "A custom action to encapsulate PFCCLab/ci-bypass"
+description: "A custom action to encapsulate GraphNet"
 inputs:
   github-token:
     description: "GitHub token"
@@ -18,7 +18,7 @@ runs:
     - id: check-bypass
       name: Check Bypass
       env:
-        CI_TEAM_MEMBERS: '["SigureMo", "risemeup1", "tianshuo78520a", "0x3878f", "swgu98", "luotao1", "XieYunshen"]'
+        CI_TEAM_MEMBERS: '["lixinqi", "Xreki"]'
       uses: PFCCLab/ci-bypass@v1
       with:
         github-token: ${{ inputs.github-token }}

tools/ci/check_validate.sh

@@ -16,7 +16,7 @@ export PYTHONPATH=${GRAPH_NET_EXTRACT_WORKSPACE}:$PYTHONPATH
 function check_paths_without_spaces() {
   LOG "[INFO] Checking for spaces in modified file paths..."
   git config --global --add safe.directory "*"
-  mapfile -t MODIFIED_FILES < <(git diff --name-only develop | grep -E "\bsamples\b/|\bpaddle_samples\b/")
+  mapfile -t MODIFIED_FILES < <(git diff --diff-filter=ACM --name-only develop | grep -E "\bsamples\b/|\bpaddle_samples\b/")
 
   for file in "${MODIFIED_FILES[@]}"; do
     if [[ "${file}" == *" "* ]]; then
@@ -30,7 +30,7 @@ function check_paths_without_spaces() {
 
 function prepare_torch_env() {
   git config --global --add safe.directory "*"
-  num_changed_samples=$(git diff --name-only develop | grep -E "\bsamples\b/.*/(model\.py|input_meta\.py|weight_meta\.py)$" | wc -l)
+  num_changed_samples=$(git diff --diff-filter=ACM --name-only develop | grep -E "\bsamples\b/.*/(model\.py|input_meta\.py|weight_meta\.py)$" | wc -l)
   if [ ${num_changed_samples} -ne 0 ]; then
     LOG "[INFO] Device Id: ${CUDA_VISIBLE_DEVICES}"
     # Update pip
@@ -48,7 +48,7 @@ function prepare_torch_env() {
 
 function prepare_paddle_env() {
   git config --global --add safe.directory "*"
-  num_changed_paddle_samples=$(git diff --name-only develop | grep -E "\bpaddle_samples\b/.*/(model\.py|input_meta\.py|weight_meta\.py)$" | wc -l)
+  num_changed_paddle_samples=$(git diff --diff-filter=ACM --name-only develop | grep -E "\bpaddle_samples\b/.*/(model\.py|input_meta\.py|weight_meta\.py)$" | wc -l)
   if [ ${num_changed_paddle_samples} -ne 0 ]; then
     LOG "[INFO] Device Id: ${CUDA_VISIBLE_DEVICES}"
     # Update pip
@@ -70,7 +70,7 @@ function prepare_paddle_env() {
 function check_torch_validation() {
   LOG "[INFO] Start run validate for changed torch samples ..."
   MODIFIED_MODEL_PATHS=()
-  for file in $(git diff --name-only develop | grep -E "\bsamples\b/.*/(model\.py|input_meta\.py|weight_meta\.py)$")
+  for file in $(git diff --diff-filter=ACM --name-only develop | grep -E "\bsamples\b/.*/(model\.py|input_meta\.py|weight_meta\.py)$")
   do
     LOG "[INFO] Found ${file} modified."
     model_path=$(dirname ${file})
@@ -104,7 +104,7 @@ function check_torch_validation() {
 function check_paddle_validation() {
   LOG "[INFO] Start run validate for changed paddle samples ..."
   MODIFIED_MODEL_PATHS=()
-  for file in $(git diff --name-only develop | grep -E "\bpaddle_samples\b/.*/(model\.py|input_meta\.py|weight_meta\.py)$")
+  for file in $(git diff --diff-filter=ACM --name-only develop | grep -E "\bpaddle_samples\b/.*/(model\.py|input_meta\.py|weight_meta\.py)$")
   do
     LOG "[INFO] Found ${file} modified."
     model_path=$(dirname ${file})

tools/count_sample.py

@@ -1,5 +1,5 @@
-# 统计 samples 目录下， graph_net.json 文件的数量
 import os
+import json
 
 
 filename = os.path.abspath(__file__)
@@ -15,14 +15,24 @@
 
     graph_net_count = 0
     graph_net_dict = {}
+    model_names_set = set()
     for category in model_categories:
         category_dir = os.path.join(samples_dir, category)
         if os.path.isdir(category_dir):
             graph_net_dict[category] = 0
             for root, dirs, files in os.walk(category_dir):
                 if "graph_net.json" in files:
-                    graph_net_count += 1
-                    graph_net_dict[category] += 1
+                    with open(os.path.join(root, "graph_net.json"), "r") as f:
+                        data = json.load(f)
+                        model_name = data.get("model_name", None)
+                    if model_name is not None:
+                        if model_name not in model_names_set:
+                            model_names_set.add(model_name)
+                            graph_net_count += 1
+                            graph_net_dict[category] += 1
+                    else:
+                        graph_net_count += 1
+                        graph_net_dict[category] += 1
 
     print(f"Number of {framework} samples: {graph_net_count}")
     for name, number in graph_net_dict.items():