Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into loss_api_fix

Author: zty-king

.github/workflows/Codestyle-Check.yml

@@ -49,6 +49,12 @@ jobs:
         if: steps.check-bypass.outputs.can-skip != 'true'
         run: |
           pip install pre-commit==2.17.0 cpplint==1.6.0  clang-format==13.0.0
+          pip install ast-grep-cli==0.39.9 # This version should be consistent with the one in .pre-commit-config.yaml
+
+      - name: Run ast-grep unit tests
+        if: steps.check-bypass.outputs.can-skip != 'true'
+        run: |
+          ast-grep test
 
       - name: Check pre-commit
         if: steps.check-bypass.outputs.can-skip != 'true'

.github/workflows/_Auto-Parallel.yml

@@ -96,6 +96,8 @@ jobs:
           source ${{ github.workspace }}/../../../proxy
           cd PaddleNLP
           git pull
+          git checkout 6ac04028757dfbcc089916997493611f62de81b2
+          git switch -c 6ac04028757dfbcc089916997493611f62de81b2
           git submodule update --init --recursive --force
           '
 

.github/workflows/_Distribute-stable-Formers.yml

@@ -72,7 +72,7 @@ jobs:
           CACHE_DIR: /root/.cache/build
           CCACHE_DIR: /root/.ccache/formers
           CFS_DIR: /home/data/cfs
-          paddle_whl: /workspace/dist/paddlepaddle_gpu-0.0.0-cp310-cp310-linux_x86_64.whl
+          paddle_whl: /workspace/dist/*.whl
           formers_docker: ccr-2vdh3abv-pub.cnc.bj.baidubce.com/paddlepaddle/paddle:cuda126-dev-latest
         run: |
           export CUDA_SO="$(\ls -d /usr/lib64/libcuda* | xargs -I{} echo '-v {}:{}') $(\ls -d /usr/lib64/libnvidia* | xargs -I{} echo '-v {}:{}')"

.github/workflows/_Distribute-stable.yml

@@ -49,7 +49,6 @@ jobs:
           WITH_TESTING: "ON"
           WITH_INFERENCE_API_TEST: "OFF"
           COVERALLS_UPLOAD: "ON"
-          PADDLE_VERSION: 0.0.0
           CUDA_VISIBLE_DEVICES: 0,1
           GIT_PR_ID: ${{ github.event.pull_request.number }}
           GPUBOX_DEMO_INSTALL_DIR: /root/.cache/build
@@ -89,7 +88,6 @@ jobs:
             -e WITH_TESTING \
             -e COVERALLS_UPLOAD \
             -e GIT_PR_ID \
-            -e PADDLE_VERSION \
             -e WITH_DISTRIBUTE \
             -e PY_VERSION \
             -e WITH_TENSORRT \
@@ -190,7 +188,7 @@ jobs:
         env:
           home_path: ${{ github.workspace }}/..
           bos_file: ${{ github.workspace }}/../bos_retry/BosClient.py
-          paddle_whl: paddlepaddle_gpu-0.0.0-cp310-cp310-linux_x86_64.whl
+          paddle_whl: "*.whl"
         run: |
           docker exec -t ${{ env.container_name }} /bin/bash -c '
           set -x

.github/workflows/_Windows-GPU.yml

@@ -35,6 +35,7 @@ jobs:
     runs-on:
       group: win-gpu
     env:
+      PADDLE_VERSION: 0.0.0
       NIGHTLY_MODE: "OFF"
       WITH_UNITY_BUILD: "ON"
       WITH_TPCACHE: "ON"

.github/workflows/_Windows-Inference.yml

@@ -35,6 +35,7 @@ jobs:
     runs-on:
       group: win-infer
     env:
+      PADDLE_VERSION: 0.0.0
       NIGHTLY_MODE: "OFF"
       WITH_UNITY_BUILD: "ON"
       WITH_TPCACHE: "ON"

.github/workflows/_Windows-OPENBLAS.yml

@@ -36,6 +36,7 @@ jobs:
     runs-on:
       group: win-openblas
     env:
+      PADDLE_VERSION: 0.0.0
       NIGHTLY_MODE: "OFF"
       WITH_UNITY_BUILD: "ON"
       WITH_CACHE: "OFF"

.pre-commit-config.yaml

@@ -37,6 +37,10 @@ repos:
           (?x)^(
             test/dygraph_to_static/test_error.py
           )$
+  - repo: https://github.com/PFCCLab/ast-grep-pre-commit-mirror
+    rev: v0.39.9
+    hooks:
+      - id: ast-grep
   - repo: local
     hooks:
       - id: copyright_checker
@@ -56,7 +60,7 @@ repos:
         args: [--force-exclude]
   # For Python files
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.13.0
+    rev: v0.14.4
     hooks:
       - id: ruff-check
         args: [--fix, --exit-non-zero-on-fix, --no-cache]
@@ -158,7 +162,10 @@ repos:
           (?x)^(
             \.github/.+\.(yaml|yml)|
             \.pre-commit-config\.yaml|
-            \.yamlfmt
+            \.yamlfmt|
+            sgconfig\.yml|
+            ci/rules/.+\.yml|
+            ci/rule-tests/.+\.yml
           )
   # Others
   - repo: local

ci/check_approval.sh

@@ -330,19 +330,6 @@ if [ "${EMPTY_GRAD_OP_REGISTERED}" != "" ] && [ "${GIT_PT_ID}" != "" ]; then
     check_approval 1 phlrain XiaoguangHu01 kolinwei JiabinYang
 fi
 
-INVALID_UNITTEST_ASSERT_CHECK=`echo "$ALL_ADDED_LINES" | grep -zoE '\+\s+((assert\s+)|(self\.assert(True|Equal)\())(\s*\+\s*)?(np|numpy)\.(allclose|array_equal)[^+]*' || true`
-if [ "${INVALID_UNITTEST_ASSERT_CHECK}" != "" ] && [ "${PR_ID}" != "" ]; then
-    echo_line="It is recommended to use 'np.testing.assert_allclose' and 'np.testing.assert_array_equal' instead of 'self.assertTrue(np.allclose(...))' and 'self.assertTrue(np.array_equal(...))'.\nPlease modify the code below. If anything is unclear, please read the specification [ https://github.com/PaddlePaddle/community/blob/master/rfcs/CodeStyle/20220805_code_style_improvement_for_unittest.md#background ]. If it is a mismatch, please request SigureMo (Recommend) or zrr1999 review and approve.\nThe code that do not meet the specification are as follows:\n${INVALID_UNITTEST_ASSERT_CHECK}\n"
-    check_approval 1 SigureMo zrr1999
-fi
-
-TEST_FILE_ADDED_LINES=$(git diff -U0 upstream/$BRANCH -- test |grep "^+")
-ENABLE_TO_STATIC_CHECK=`echo "$TEST_FILE_ADDED_LINES" | grep "enable_to_static(" || true`
-if [ "${ENABLE_TO_STATIC_CHECK}" != "" ] && [ "${PR_ID}" != "" ]; then
-    echo_line="You must have one RD (SigureMo, DrRyanHuang, zrr1999 or gouzil) approval for using 'paddle.jit.enable_to_static', we recommend using 'enable_to_static_guard' in the related test files.\n"
-    check_approval 1 SigureMo DrRyanHuang zrr1999 gouzil
-fi
-
 HAS_MODIFIED_DY2ST_TEST_FILES=$(git diff --name-only --diff-filter=ACMR upstream/$BRANCH | grep "test/dygraph_to_static/test_" || true)
 if [ "${HAS_MODIFIED_DY2ST_TEST_FILES}" != "" ] && [ "${PR_ID}" != "" ]; then
     error_lines=`python ${PADDLE_ROOT}/test/dygraph_to_static/check_approval.py ${HAS_MODIFIED_DY2ST_TEST_FILES}`

ci/distribute_test.sh

@@ -148,7 +148,7 @@ pip config set global.index-url https://pypi.tuna.tsinghua.edu.cn/simple
 pip install onnx==1.17.0
 pip install -r "${work_dir}/python/requirements.txt"
 pip install -r "${work_dir}/python/unittest_py/requirements.txt"
-pip install  --force-reinstall ${work_dir}/dist/paddlepaddle_gpu-0.0.0-cp310-cp310-linux_x86_64.whl --no-deps
+pip install  --force-reinstall ${work_dir}/dist/*.whl --no-deps
 echo "::endgroup::"
 ldconfig