Skip to content

Commit 0c8c834

Browse files
xingmingyyjxingmingyyj
authored
Merge branch 'PaddlePaddle:develop' into fix_trunc
2 parents 7d0b214 + e1842d4 commit 0c8c834

File tree

164 files changed

+8993
-3549
lines changed

Some content is hidden

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

164 files changed

+8993
-3549
lines changed

‎.github/workflows/Approval.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
check-approvers:
1616
name: Check approval
1717
runs-on:
18-
group: HK-Clone
18+
group: APPROVAL
1919
steps:
2020
- name: Checkout Repository
2121
uses: actions/checkout@v4

‎.github/workflows/CI-Build.yml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,15 @@ jobs:
8585
can-skip: ${{ needs.build.outputs.can-skip }}
8686
docker_build_image: ${{ needs.build-docker.outputs.docker_build_image }}
8787

88+
doc-preview:
89+
name: Doc-Preview
90+
uses: ./.github/workflows/_Doc-Preview.yml
91+
needs: [build-docker, build]
92+
with:
93+
can-skip: ${{ needs.build.outputs.can-skip }}
94+
docker_doc_image: ${{ needs.build-docker.outputs.docker_doc_image }}
95+
96+
8897
slice:
8998
name: Slice
9099
uses: ./.github/workflows/_Slice.yml

‎.github/workflows/CI-Windows.yml‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
name: CI-Windows
2+
3+
on:
4+
pull_request:
5+
types: [opened, synchronize]
6+
branches: [develop, release/**]
7+
8+
permissions: read-all
9+
10+
concurrency:
11+
group: ${{ github.event.pull_request.number }}-Windows
12+
cancel-in-progress: true
13+
14+
env:
15+
PR_ID: ${{ github.event.pull_request.number }}
16+
COMMIT_ID: ${{ github.event.pull_request.head.sha }}
17+
18+
jobs:
19+
clone:
20+
name: Clone-windows
21+
uses: ./.github/workflows/_Clone-windows.yml
22+
23+
win-openblas:
24+
name: Windows-OPENBLAS
25+
uses: ./.github/workflows/_Windows-OPENBLAS.yml
26+
needs: clone
27+
28+
win-gpu:
29+
name: Windows-GPU
30+
uses: ./.github/workflows/_Windows-GPU.yml
31+
needs: clone
32+
33+
win-inference:
34+
name: Windows-Inference
35+
uses: ./.github/workflows/_Windows-Inference.yml
36+
needs: clone

‎.github/workflows/CheckPRTemplate.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
check:
1010
name: Check
1111
runs-on:
12-
group: HK-Clone
12+
group: APPROVAL
1313
permissions:
1414
contents: read
1515
steps:

‎.github/workflows/Codestyle-Check.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
name: Pre Commit
1010
if: ${{ github.repository_owner == 'PaddlePaddle' }}
1111
runs-on:
12-
group: HK-Clone
12+
group: APPROVAL
1313
env:
1414
PR_ID: ${{ github.event.pull_request.number }}
1515
BRANCH: develop

‎.github/workflows/_CE-Framework.yml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ jobs:
3030
whl:
3131
name: Whl
3232
if: ${{ inputs.can-skip != 'true' }}
33-
runs-on: ubuntu-latest
33+
runs-on:
34+
group: GZ_BD-CPU
3435
env:
3536
TASK: paddle-CI-${{ github.event.pull_request.number }}-CE-Framework-whl
3637
steps:
@@ -60,6 +61,11 @@ jobs:
6061
run: |
6162
bash ci/check_whl_size.sh
6263
64+
- name: Terminate and delete the container
65+
if: always()
66+
run: |
67+
rm -rf * .[^.]*
68+
6369
infer:
6470
name: Infer
6571
if: ${{ inputs.can-skip != 'true' }}

‎.github/workflows/_Clone-linux.yml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,6 @@ jobs:
4040
group: HK-Clone
4141

4242
steps:
43-
- name: Clean environment
44-
run: |
45-
rm -rf * .[^.]*
46-
4743
- name: Clone paddle
4844
uses: actions/checkout@v4
4945
with:

‎.github/workflows/_Clone-windows.yml‎

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
name: Clone-windows
2+
3+
on:
4+
workflow_call:
5+
6+
permissions: read-all
7+
8+
env:
9+
PR_ID: ${{ github.event.pull_request.number }}
10+
COMMIT_ID: ${{ github.event.pull_request.head.sha }}
11+
BRANCH: ${{ github.base_ref }}
12+
ci_scripts: ${{ github.workspace }}\ci\windows
13+
WORK_DIR: ${{ github.workspace }}\..
14+
15+
defaults:
16+
run:
17+
shell: cmd
18+
19+
jobs:
20+
clone:
21+
name: Clone Paddle
22+
runs-on:
23+
group: win-clone
24+
steps:
25+
- name: Git config
26+
run: |
27+
git config --global user.name "PaddleCI"
28+
git config --global user.email "paddle_ci@example.com"
29+
git config --global http.postBuffer 524288000
30+
git config --global core.longpaths true
31+
32+
- name: Clone paddle
33+
uses: actions/checkout@v4
34+
with:
35+
ref: ${{ github.event.pull_request.base.ref }}
36+
fetch-depth: 1000
37+
38+
- name: Merge pr
39+
run: |
40+
git config --unset http.https://github.com/.extraheader
41+
REM git submodule foreach --recursive sh -c "git config --local --unset-all 'http.https://github.com/.extraheader'"
42+
REM git submodule foreach --recursive sh -c "git config remote.origin.fetch '+refs/heads/*:refs/remotes/origin/*'"
43+
git switch %BRANCH%
44+
git branch -D test
45+
git gc
46+
git switch -c test
47+
git fetch origin pull/%PR_ID%/head:pr
48+
git merge --no-ff pr
49+
git branch -d pr
50+
REM call %ci_scripts%\third_party_tag.bat
51+
52+
- name: Upload paddle to bos
53+
working-directory: ..
54+
env:
55+
BCE_FILE: ${{ github.workspace }}\..\bce-python-sdk-new\BosClient.py
56+
run: |
57+
if not exist %WORK_DIR%\bce-python-sdk-new (
58+
echo There is no bce in this PC, will install bce.
59+
pip install wget
60+
pip install shutil
61+
echo Download package from https://xly-devops.bj.bcebos.com/home/bos_new.tar.gz
62+
python -c "import wget;wget.download('https://xly-devops.bj.bcebos.com/home/bos_new.tar.gz')"
63+
python -c "import shutil;shutil.unpack_archive('bos_new.tar.gz', extract_dir='./bce-python-sdk-new',format='gztar')"
64+
)
65+
python -m pip install pycryptodome
66+
python -m pip install bce-python-sdk==0.8.74
67+
tar -cf Paddle.tar Paddle && zstd Paddle.tar
68+
python %BCE_FILE% Paddle.tar.zst paddle-github-action/windows/PR/%PR_ID%/%COMMIT_ID%
69+
del Paddle.tar Paddle.tar.zst
70+
71+
- name: Clean env
72+
run: |
73+
cd ${{ github.workspace }}
74+
git switch %BRANCH%
75+
git branch -D test
76+
git gc

‎.github/workflows/_Doc-Preview.yml‎

Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
name: Model-benchmark
2+
3+
on:
4+
workflow_call:
5+
inputs:
6+
docker_doc_image:
7+
type: string
8+
required: true
9+
can-skip:
10+
type: string
11+
required: false
12+
13+
env:
14+
PR_ID: ${{ github.event.pull_request.number }}
15+
COMMIT_ID: ${{ github.event.pull_request.head.sha }}
16+
ci_scripts: /workspace/paddle/ci
17+
BRANCH: ${{ github.event.pull_request.base.ref }}
18+
TASK: paddle-CI-${{ github.event.pull_request.number }}-Doc-Preview
19+
CI_name: Doc-Preview
20+
no_proxy: "bcebos.com,apiin.im.baidu.com,gitee.com,aliyun.com,.baidu.com,.tuna.tsinghua.edu.cn"
21+
22+
defaults:
23+
run:
24+
shell: bash
25+
26+
jobs:
27+
check-bypass:
28+
name: Check bypass for Doc-Preview
29+
uses: ./.github/workflows/check-bypass.yml
30+
with:
31+
workflow-name: 'Doc-Preview'
32+
secrets:
33+
github-token: ${{ secrets.GITHUB_TOKEN }}
34+
35+
build-doc:
36+
name: Build doc
37+
runs-on:
38+
group: BD_BJ-V100
39+
steps:
40+
- name: Check docker image and run container
41+
env:
42+
AGILE_PULL_ID: ${{ github.event.pull_request.number }}
43+
AGILE_REVISION: ${{ github.event.pull_request.head.sha }}
44+
BUILD_DOC: "true"
45+
UPLOAD_DOC: "true"
46+
BOSBUCKET: "paddle-site-web-dev"
47+
PREVIEW_SITE: "paddle-docs-preview.paddlepaddle.org.cn"
48+
AGILE_COMPILE_BRANCH: ${{ github.event.pull_request.base.ref }}
49+
BOS_CREDENTIAL_AK: "paddle"
50+
BOS_CREDENTIAL_SK: "paddle"
51+
run: |
52+
container_name=${TASK}-$(date +%Y%m%d-%H%M%S)
53+
echo "container_name=${container_name}" >> ${{ github.env }}
54+
docker_image=${{ inputs.docker_doc_image }}
55+
docker run -d -t --name ${container_name} \
56+
-v "/home/data/cfs:/home/data/cfs" \
57+
-v "/home/data/cfs/.cache/python35-cpu:/root/.cache" \
58+
-v "/home/data/cfs/.ccache:/root/.ccache" \
59+
-v "/dev/shm:/dev/shm" \
60+
-v ${{ github.workspace }}/../../..:${{ github.workspace }}/../../.. \
61+
-v ${{ github.workspace }}:/paddle \
62+
-e AGILE_PULL_ID \
63+
-e AGILE_REVISION \
64+
-e BUILD_DOC \
65+
-e UPLOAD_DOC \
66+
-e BOSBUCKET \
67+
-e PREVIEW_SITE \
68+
-e BRANCH \
69+
-e AGILE_COMPILE_BRANCH \
70+
-e BOS_CREDENTIAL_AK \
71+
-e BOS_CREDENTIAL_SK \
72+
-e no_proxy \
73+
-w /paddle --network host ${docker_image}
74+
75+
- name: Doc build
76+
run: |
77+
docker exec -t ${{ env.container_name }} /bin/bash -c '
78+
rm -rf * .[^.]*
79+
wget -q https://xly-devops.bj.bcebos.com/PR/build_whl/${AGILE_PULL_ID}/${AGILE_REVISION}/build.tar.gz
80+
tar --use-compress-program="pigz -1" -xpf build.tar.gz
81+
cd ./paddle
82+
api_doc_spec_diff=$(python tools/diff_api.py paddle/fluid/API_DEV.spec.doc paddle/fluid/API_PR.spec.doc)
83+
if [ "$api_doc_spec_diff" == "" ]; then
84+
echo "API documents no change."
85+
exit 0
86+
fi
87+
88+
curl -sS -o /tmp/entrypoint.sh https://paddle-dev-tools-open.bj.bcebos.com/fluiddoc-preview/entrypoint-paddle-docs-review.sh
89+
cd /
90+
source ${{ github.workspace }}/../../../proxy
91+
bash "/tmp/entrypoint.sh"
92+
'
93+
94+
- name: Terminate and delete the container
95+
if: always()
96+
run: |
97+
docker exec -t ${{ env.container_name }} /bin/bash -c 'rm -rf * .[^.]*'
98+
docker rm -f ${{ env.container_name }}

‎.github/workflows/_Linux-DCU.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ jobs:
194194
run: |
195195
set -x
196196
runner_name=`(echo $PWD|awk -F '/' '{print $3}')`
197-
wget -q https://xly-devops.bj.bcebos.com/PR/utils.sh
197+
wget -q https://xly-devops.bj.bcebos.com/utils.sh
198198
source utils.sh
199199
determine_dcu_runner ${runner_name}
200200

0 commit comments

Comments
 (0)