Merge remote-tracking branch 'upstream/develop' into fix1009

Author: hd9568

.github/CODEOWNERS

@@ -0,0 +1,2 @@
+# Paddle API Docs
+docs/api/paddle @jzhang533 @sunzhongkai588 @mattheliu

.github/workflows/check-bypass.yml

@@ -0,0 +1,51 @@
+on:
+  workflow_call:
+    inputs:
+      workflow-name:
+        required: true
+        type: string
+    secrets:
+      github-token:
+        required: true
+    outputs:
+      can-skip:
+        description: "Whether the workflow can be skipped."
+        value: ${{ jobs.check-bypass.outputs.can-skip }}
+
+jobs:
+  check-bypass:
+    name: Check bypass
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+    env:
+      CI_TEAM_MEMBERS: '["tianshuo78520a", "swgu98", "risemeup1", "luotao1", "SigureMo", "ooooo-create"]'
+    outputs:
+      can-skip: ${{ steps.check-bypass.outputs.can-skip }}
+    steps:
+      - name: Cleanup
+        run: |
+          rm -rf * .[^.]*
+
+      - id: check-bypass
+        name: Check Bypass
+        uses: PFCCLab/ci-bypass@v2
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          non-pull-request-event-strategy: "never-skipped"
+          type: "composite"
+          composite-rule: |
+            {
+              "any": [
+                {
+                  "type": "labeled",
+                  "label": ["skip-ci: ${{ inputs.workflow-name }}", "skip-ci: all"],
+                  "username": ${{ env.CI_TEAM_MEMBERS }}
+                },
+                {
+                  "type": "commented",
+                  "comment-pattern": [".*/skip-ci ${{ inputs.workflow-name }}.*", ".*/skip-ci all.*"],
+                  "username": ${{ env.CI_TEAM_MEMBERS }}
+                }
+              ]
+            }

.github/workflows/codestyle-check.yml

@@ -0,0 +1,56 @@
+name: Codestyle Check
+
+on:
+  pull_request:
+    branches: ["develop"]
+
+jobs:
+  check-bypass:
+    name: Check bypass
+    if: ${{ inputs.can-skip != 'true' }}
+    uses: ./.github/workflows/check-bypass.yml
+    with:
+      workflow-name: "codestyle"
+    secrets:
+      github-token: ${{ secrets.GITHUB_TOKEN }}
+
+  check-codestyle:
+    name: Run codestyle check
+    needs: check-bypass
+    if: ${{ github.repository_owner == 'PaddlePaddle' && needs.check-bypass.outputs.can-skip != 'true' }}
+    runs-on: ubuntu-latest
+    env:
+      PR_ID: ${{ github.event.pull_request.number }}
+      BRANCH: develop
+
+    steps:
+      - name: Cleanup
+        run: |
+          rm -rf * .[^.]*
+
+      - name: Checkout base repo
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.pull_request.base.ref }}
+          fetch-depth: 200
+
+      - name: Merge PR to test branch
+        run: |
+          git fetch origin pull/${PR_ID}/merge
+          git checkout -b test FETCH_HEAD
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@v6
+        with:
+          python-version: "3.13"
+          enable-cache: true
+
+      - name: Install prek
+        run: |
+          uv tool install prek
+
+      - name: Run prek
+        run: |
+          set +e
+          bash -x ci_scripts/check_code.sh;EXCODE=$?
+          exit $EXCODE

ci_scripts/check_code.sh

@@ -22,17 +22,22 @@ set +x
 SCRIPT_DIR="$( cd "$( dirname "$0" )" && pwd )"
 cd $SCRIPT_DIR/..
 
-# use pre-commit 2.17
-if ! [[ $(pre-commit --version) == *"2.17.0"* ]]; then
-    pip install pre-commit==2.17.0 1>nul
-fi
-
 diff_files=$(git diff --name-only --diff-filter=ACMR ${BRANCH})
 num_diff_files=$(echo "$diff_files" | wc -l)
 echo -e "diff files between pr and ${BRANCH}:\n${diff_files}"
 
+PRE_COMMIT_EXE="pre-commit"
+# Use prek to replace pre-commit if prek is installed
+if command -v prek &> /dev/null
+then
+    echo "Detected prek, use prek to check code style for better performance."
+    PRE_COMMIT_EXE="prek"
+else
+    echo "prek not found, use pre-commit to check code style."
+fi
+
 echo "Checking code style by pre-commit ..."
-pre-commit run --files ${diff_files};check_error=$?
+$PRE_COMMIT_EXE run --files ${diff_files};check_error=$?
 
 if test ! -z "$(git diff)"; then
     echo -e '\n************************************************************************************'
@@ -47,7 +52,7 @@ if [ ${check_error} != 0 ];then
     echo "Your PR code style check failed."
     echo "Please install pre-commit locally and set up git hook scripts:"
     echo ""
-    echo "    pip install pre-commit==2.17.0"
+    echo "    pip install pre-commit"
     echo "    pre-commit install"
     echo ""
     if [[ $num_diff_files -le 100 ]];then

ci_scripts/check_pr_approval.py

@@ -102,17 +102,11 @@ else
 fi
 
 EXIT_CODE=0
-# 3 check code style/format.
-ls ${DIR_PATH}
-/bin/bash -x  ${DIR_PATH}/check_code.sh
-if [ $? -ne 0 ];then
-    EXIT_CODE=1
-fi
 
 git merge --no-edit upstream/${BRANCH}
 need_check_cn_doc_files=$(find_all_cn_api_files_modified_by_pr)
 echo $need_check_cn_doc_files
-# 4 Chinese api docs check
+# 3 Chinese api docs check
 if [ "${need_check_cn_doc_files}" = "" ] ; then
     echo "chinese api doc fileslist is empty, skip check."
 else
@@ -127,7 +121,7 @@ else
     fi
 fi
 
-# 5 Chinese api_label check
+# 4 Chinese api_label check
 /bin/bash -x ${DIR_PATH}/check_api_label_cn.sh
 if [ $? -ne 0 ];then
     set +x
@@ -141,18 +135,12 @@ fi
 if [ ${EXIT_CODE} -ne 0 ]; then
     set +x
     echo "=========================================================================================="
-    echo "Code style check or API Chinese doc check failed! Please check the error info above carefully."
+    echo "API Chinese doc check failed! Please check the error info above carefully."
     echo "=========================================================================================="
     set -x
     exit ${EXIT_CODE}
 fi
 
-# 6 Approval check
-/bin/bash  ${DIR_PATH}/checkapproval.sh
-if [ $? -ne 0 ];then
-    exit 1
-fi
-
 echo "PADDLE_WHL=${PADDLE_WHL}"
 # print preview url
 echo "${PREVIEW_URL_PROMPT}"

ci_scripts/checkapproval.sh

@@ -11,12 +11,26 @@ generate_preview_url() {
     local file_path="$1"
     local pr_id="$2"
     local path_no_ext="${file_path%.*}"
-    local base_url="http://preview-pr-${pr_id}.paddle-docs-preview.paddlepaddle.org.cn/documentation/docs/zh/"
+
+    # Check if file ends with _en (English version)
+    # _en.rst will only reach English preview, _en.md can be reached in both English and Chinese previews
+    # To Simplify, we treat all _en files as English version
+    if [[ "$path_no_ext" == *_en ]]; then
+        local base_url="http://preview-pr-${pr_id}.paddle-docs-preview.paddlepaddle.org.cn/documentation/docs/en/"
+    else
+        # Use /zh/ path for Chinese version
+        local base_url="http://preview-pr-${pr_id}.paddle-docs-preview.paddlepaddle.org.cn/documentation/docs/zh/"
+    fi
+
     local final_url="${base_url}${path_no_ext}.html"
     echo "$final_url"
 }
 
-mapfile -t all_git_files < <(git diff --name-only --diff-filter=ACMR develop | sed 's#^docs/##')
+# Use merge-base to find the common ancestor between PR branch and develop
+# This ensures we only get changes from this PR, excluding commits merged to develop after PR creation
+BASE_COMMIT=$(git merge-base HEAD develop 2>/dev/null || echo "develop")
+
+mapfile -t all_git_files < <(git diff --name-only --diff-filter=ACMR "$BASE_COMMIT" | sed 's#^docs/##')
 
 output_lines=()
 
@@ -31,9 +45,16 @@ done
 if [ ${#output_lines[@]} -gt 0 ]; then
     cat <<-EOF
 <details>
-<summary>📚 本次 PR 文档预览链接 (点击展开)</summary>
-
-以下是本次 PR 中变更文档的预览链接：
+<summary>📚 本次 PR 文档预览链接（点击展开）</summary>
+
+<table>
+<tr>
+<td>
+ℹ️ <b>预览提醒</b><br>
+请等待 <code>Docs-NEW</code> 流水线运行完成后再点击预览链接，否则可能会看到旧版本内容或遇到链接无法访问的情况。
+</td>
+</tr>
+</table>
 
 $(printf '%s\n' "${output_lines[@]}")
 

ci_scripts/ci_start.sh

@@ -7,7 +7,7 @@ FLAGS_conv_workspace_size_limit
 *******************************************
 (since 0.13.0)
 
-The workspace limit size in MB unit for choosing cuDNN convolution algorithms. The inner funciton of cuDNN obtain the fastest suited algorithm that fits within this memory limit. Usually, large workspace size may lead to choose faster algorithms, but significant increasing memory workspace. Users need to trade-off between memory and speed.
+The workspace limit size in MB unit for choosing cuDNN convolution algorithms. The inner function of cuDNN obtain the fastest suited algorithm that fits within this memory limit. Usually, large workspace size may lead to choose faster algorithms, but significant increasing memory workspace. Users need to trade-off between memory and speed.
 
 Values accepted
 ---------------
@@ -60,7 +60,7 @@ FLAGS_cudnn_exhaustive_search
 *******************************************
 (since 1.2.0)
 
-Whether to use exhaustive search method to choose convolution algorithms. There are two search methods, heuristic search and exhaustive search in cuDNN. The exhaustive search attempts all cuDNN algorithms to choose the fastest algorithm. This method is time-consuming, the choosed algorithm will be cached for the given layer specifications. Once the layer specifications (like batch size, feature map size) are changed, it will search again.
+Whether to use exhaustive search method to choose convolution algorithms. There are two search methods, heuristic search and exhaustive search in cuDNN. The exhaustive search attempts all cuDNN algorithms to choose the fastest algorithm. This method is time-consuming, the chosen algorithm will be cached for the given layer specifications. Once the layer specifications (like batch size, feature map size) are changed, it will search again.
 
 Values accepted
 ---------------

ci_scripts/report_preview_url.sh

@@ -575,7 +575,7 @@ Time Unit: s, IPS Unit: steps/s
 
 ### 3.3 Benchmark 信息展示
 
-Benckmark 信息用于展示模型的吞吐量以及时间开销。
+Benchmark 信息用于展示模型的吞吐量以及时间开销。
 
 ```plain
 ============================================Perf Summary============================================