Skip to content

Commit cfa9d95

Browse files
aquagullaquagull
committed
merge develop
2 parents 078b947 + 80e69d8 commit cfa9d95

File tree

654 files changed

+19270
-9828
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

654 files changed

+19270
-9828
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ runs:
1818
- id: check-bypass
1919
name: Check Bypass
2020
env:
21-
CI_TEAM_MEMBERS: '["SigureMo", "risemeup1", "tianshuo78520a", "0x3878f", "swgu98", "luotao1", "XieYunshen"]'
21+
CI_TEAM_MEMBERS: '["tianshuo78520a", "swgu98", "risemeup1", "XieYunshen"]'
2222
uses: PFCCLab/ci-bypass@v1
2323
with:
2424
github-token: ${{ inputs.github-token }}

‎.github/workflows/Api-Benchmark-baseline.yml‎

Lines changed: 15 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ on:
1818
- others
1919
schedule:
2020
- cron: '0 21 * * *'
21-
- cron: '0 22 * * 3'
2221

2322
permissions: read-all
2423

@@ -52,7 +51,7 @@ jobs:
5251
is_pr: 'false'
5352

5453
api-benchmark-baseline-schedule:
55-
name: Api benchmark baseline
54+
name: Api benchmark baseline with schedule
5655
strategy:
5756
matrix:
5857
run-labels: [api-bm-20, api-bm-27]
@@ -63,49 +62,26 @@ jobs:
6362
baseline: 'true'
6463
run-labels: ${{ matrix.run-labels }}
6564

66-
api-benchmark-baseline-pr:
67-
name: Api benchmark baseline
65+
api-benchmark-baseline-pr-20:
66+
name: Api benchmark baseline with PR on 20
6867
if: github.event_name == 'workflow_dispatch' && github.event.inputs.job-name == 'api-benchmark'
69-
strategy:
70-
matrix:
71-
run-labels: [api-bm-20, api-bm-27]
7268
uses: ./.github/workflows/_Api-Benchmark.yml
7369
needs: [clone, build-docker]
7470
with:
7571
docker_build_image: ${{ needs.build-docker.outputs.docker_build_image }}
7672
baseline: 'true'
7773
MANUALLY_PR_ID: ${{ inputs.PR_ID }}
7874
MANUALLY_COMMIT_ID: ${{ inputs.COMMIT_ID }}
79-
run-labels: ${{ matrix.run-labels }}
75+
run-labels: api-bm-20
8076

81-
test1:
82-
runs-on: ubuntu-latest
83-
if: github.event.schedule == '0 0 * * *'
84-
steps:
85-
- name: Test
86-
run: |
87-
echo "test1"
88-
89-
test2:
90-
runs-on: ubuntu-latest
91-
if: github.event.schedule == '0 21 * * *'
92-
steps:
93-
- name: Test
94-
run: |
95-
echo "test2"
96-
97-
test3:
98-
runs-on: ubuntu-latest
99-
if: github.event.schedule == '0 22 * * 3'
100-
steps:
101-
- name: Test
102-
run: |
103-
echo "test3"
104-
105-
test4:
106-
runs-on: ubuntu-latest
107-
if: github.event.schedule == '0 21 * * 1'
108-
steps:
109-
- name: Test
110-
run: |
111-
echo "test4"
77+
api-benchmark-baseline-pr-27:
78+
name: Api benchmark baseline with PR on 27
79+
if: github.event_name == 'workflow_dispatch' && github.event.inputs.job-name == 'api-benchmark'
80+
uses: ./.github/workflows/_Api-Benchmark.yml
81+
needs: [clone, build-docker]
82+
with:
83+
docker_build_image: ${{ needs.build-docker.outputs.docker_build_image }}
84+
baseline: 'true'
85+
MANUALLY_PR_ID: ${{ inputs.PR_ID }}
86+
MANUALLY_COMMIT_ID: ${{ inputs.COMMIT_ID }}
87+
run-labels: api-bm-27

‎.github/workflows/_Api-Benchmark.yml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ env:
3131
PADDLE_ROOT: /paddle
3232
TASK: paddle-CI-${{ github.event.pull_request.number }}-api-benchmark
3333
ci_scripts: /paddle/ci
34-
BRANCH: ${{ github.event.pull_request.base.ref }}
34+
BRANCH: ${{ github.event.pull_request.base.ref || github.ref_name }}
3535
CI_name: api-benchmark
3636
no_proxy: "bcebos.com,apiin.im.baidu.com,gitee.com,aliyun.com,.baidu.com,.tuna.tsinghua.edu.cn"
3737

@@ -76,7 +76,7 @@ jobs:
7676
- name: Check docker image and run container
7777
env:
7878
python: "python3.10"
79-
GIT_PR_ID: ${{ github.event.pull_request.number }}
79+
GIT_PR_ID: ${{ github.event.pull_request.number || '0' }}
8080
GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}
8181
RUN_ID: ${{ github.run_id }}
8282
wheel_link: https://paddle-github-action.bj.bcebos.com/PR/build/${{ github.event.pull_request.number }}/${{ github.event.pull_request.head.sha }}/paddlepaddle_gpu-0.0.0-cp310-cp310-linux_x86_64.whl
@@ -134,13 +134,14 @@ jobs:
134134
cp /paddle/PTSTools/Uploader/apibm_config.yml .
135135
source ${{ github.workspace }}/../../../proxy
136136
if [[ "${{ inputs.baseline }}" == "true" ]];then
137+
set -e
137138
if [[ "${{ inputs.MANUALLY_PR_ID }}" == "" ]]; then
138-
export pr_wheel_link=https://paddle-github-action.bj.bcebos.com/PR/build/${{ github.event.pull_request.number }}/${{ github.event.pull_request.head.sha }}/paddlepaddle_gpu-0.0.0-cp310-cp310-linux_x86_64.whl
139+
export pr_wheel_link=https://paddle-github-action.bj.bcebos.com/PR/build/$PR_ID/$COMMIT_ID/paddlepaddle_gpu-0.0.0-cp310-cp310-linux_x86_64.whl
139140
else
140141
export pr_wheel_link=https://paddle-github-action.bj.bcebos.com/PR/build/${{ inputs.MANUALLY_PR_ID }}/${{ inputs.MANUALLY_COMMIT_ID }}/paddlepaddle_gpu-0.0.0-cp310-cp310-linux_x86_64.whl
141142
fi
142143
${python} -m pip install $pr_wheel_link
143-
${python} runner_ci_action.py --yaml ../yaml/api_benchmark_fp32.yml --baseline_whl_link $pr_wheel_link
144+
${python} runner_ci_multipro_action.py --yaml ../yaml/sort_api_benchmark_fp32.yml --core_index ${core_index} --baseline_whl_link $pr_wheel_link
144145
exit 0
145146
fi
146147
${python} -m pip install $wheel_link

‎.github/workflows/check-bypass.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
permissions:
2121
contents: read
2222
env:
23-
CI_TEAM_MEMBERS: '["SigureMo", "risemeup1", "tianshuo78520a", "0x3878f", "swgu98", "luotao1", "XieYunshen", "mmglove", "fightfat"]'
23+
CI_TEAM_MEMBERS: '["tianshuo78520a", "swgu98", "risemeup1" , "XieYunshen"]'
2424
outputs:
2525
can-skip: ${{ steps.check-bypass.outputs.can-skip }}
2626
steps:

‎.pre-commit-config.yaml‎

Lines changed: 0 additions & 104 deletions
Original file line numberDiff line numberDiff line change
@@ -55,116 +55,12 @@ repos:
5555
- id: typos
5656
args: [--force-exclude]
5757
# For Python files
58-
- repo: https://github.com/psf/black-pre-commit-mirror
59-
rev: 25.1.0
60-
hooks:
61-
- id: black
62-
exclude: |
63-
(?x)^(
64-
ci/.+
65-
66-
| cmake/.+
67-
68-
| r/.+
69-
70-
| paddle/scripts/.+
71-
72-
| setup.py
73-
74-
| paddle/.+
75-
76-
| python/paddle/[a-c].+
77-
78-
| python/paddle/de.+
79-
80-
| python/paddle/distributed/a.+
81-
82-
| python/paddle/distributed/[b-e].+
83-
84-
# | python/paddle/distributed/f.+
85-
86-
# | python/paddle/distributed/[g-z].+
87-
88-
# | python/paddle/[e-i].+
89-
90-
# | python/paddle/j.+
91-
92-
# | python/paddle/[k-n].+
93-
94-
# | python/paddle/[o-t].+
95-
96-
# | python/paddle/[u-z].+
97-
98-
# | python/_.+
99-
100-
# | test/a.+
101-
102-
# | test/[b-h].+
103-
104-
# | test/[i-k].+
105-
106-
# | test/l.+
107-
108-
# | test/[m-z].+
109-
110-
# | tools/.+
111-
)$
11258
- repo: https://github.com/astral-sh/ruff-pre-commit
11359
rev: v0.12.0
11460
hooks:
11561
- id: ruff-check
11662
args: [--fix, --exit-non-zero-on-fix, --no-cache]
11763
- id: ruff-format
118-
exclude: |
119-
(?x)^(
120-
# ci/.+
121-
122-
# | cmake/.+
123-
124-
# | r/.+
125-
126-
# | paddle/scripts/.+
127-
128-
# | setup.py
129-
130-
# | paddle/.+
131-
132-
# | python/paddle/[a-c].+
133-
134-
# | python/paddle/de.+
135-
136-
# | python/paddle/distributed/a.+
137-
138-
# | python/paddle/distributed/[b-e].+
139-
140-
| python/paddle/distributed/f.+
141-
142-
| python/paddle/distributed/[g-z].+
143-
144-
| python/paddle/[e-i].+
145-
146-
| python/paddle/j.+
147-
148-
| python/paddle/[k-n].+
149-
150-
| python/paddle/[o-t].+
151-
152-
| python/paddle/[u-z].+
153-
154-
| python/_.+
155-
156-
| test/a.+
157-
158-
| test/[b-h].+
159-
160-
| test/[i-k].+
161-
162-
| test/l.+
163-
164-
| test/[m-z].+
165-
166-
| tools/.+
167-
)$
16864
# For C++ files
16965
- repo: local
17066
hooks:

‎ci/auto_parallel/ci_auto_parallel.sh‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ get_diff_TO_case(){
7777
case_list[${#case_list[*]}]=llama_auto
7878
case_list[${#case_list[*]}]=gpt-3_auto
7979
case_list[${#case_list[*]}]=gpt-3_dygraph
80+
case_list[${#case_list[*]}]=deepseek_auto
8081
}
8182

8283
print_info(){
@@ -258,6 +259,14 @@ if [[ ${#case_list[*]} -ne 0 ]];then
258259
execute_func_list $cmd gpt-3_dygraph
259260
let case_num++
260261
clean_file ${work_dir}/../PaddleNLP/llm
262+
elif [[ ${case} == "deepseek_auto" ]];then
263+
cmd=${work_dir}/../PaddleNLP/scripts/distribute/ci_case_auto.sh
264+
timeout 5m bash $cmd prepare_case deepseek_case_list_auto $FLAGS_install_deps $FLAGS_download_data
265+
execute_func_list $cmd deepseek_auto
266+
export FLAGS_install_deps=1
267+
export FLAGS_download_data="deepseek ""$FLAGS_download_data"
268+
let case_num++
269+
clean_file ${work_dir}/../PaddleNLP/llm/auto_parallel/deepseek-v3
261270
else
262271
echo -e "\033[31m ---- no ${case} \033"
263272
let case_num++

‎ci/coverage_test.sh‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,14 @@ function is_run_distribute_in_op_test() {
2424
echo "export FLAGS_COVERAGE_RUN_AUTO_PARALLEL_IN_OP_TEST=1" >> "$HOME/.bashrc"
2525
fi
2626
done
27-
ALL_CHANGE_FILES=`git diff --numstat upstream/$BRANCH | awk '{print $3}' | grep ".py"|| true`
27+
ALL_CHANGE_FILES=$(git diff --name-only upstream/$BRANCH | grep ".py"|| true)
2828
echo ${ALL_CHANGE_FILES}
2929
for CHANGE_FILE in ${ALL_CHANGE_FILES}; do
30-
ALL_OPTEST_BAN_AUTO_PARALLEL_TEST=`git diff -U0 upstream/$BRANCH ${PADDLE_ROOT}/${CHANGE_FILE} | grep "+" | grep "check_auto_parallel=" || true`
30+
TARGET_FILE="${PADDLE_ROOT}/${CHANGE_FILE}"
31+
if [ ! -f "$TARGET_FILE" ]; then
32+
continue
33+
fi
34+
ALL_OPTEST_BAN_AUTO_PARALLEL_TEST=`git diff -U0 upstream/$BRANCH -- "$TARGET_FILE" | grep "+" | grep "check_auto_parallel=" || true`
3135
if [ "${ALL_OPTEST_BAN_AUTO_PARALLEL_TEST}" != "" ] && [ "${GIT_PR_ID}" != "" ]; then
3236
export FLAGS_COVERAGE_RUN_AUTO_PARALLEL_IN_OP_TEST=1
3337
echo "export FLAGS_COVERAGE_RUN_AUTO_PARALLEL_IN_OP_TEST=1" >> "$HOME/.bashrc"

‎cmake/external/xpu.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ set(XPU_FFT_LIB_NAME "libcufft.so")
3434
add_compile_definitions(XPUAPI_NOT_INCLUDE_DEPRECATED)
3535

3636
if(NOT DEFINED XPU_XHPC_BASE_DATE)
37-
set(XPU_XHPC_BASE_DATE "dev/20250814")
37+
set(XPU_XHPC_BASE_DATE "dev/20250821")
3838
endif()
3939
set(XPU_XCCL_BASE_VERSION "3.0.3.1") # For XRE5
4040
if(NOT DEFINED XPU_XFT_BASE_VERSION)

0 commit comments

Comments
 (0)