Skip to content

Commit 1bdd369

Browse files
committed
Merge remote-tracking branch 'origin/develop' into fp32tofp16
2 parents 4ccd519 + e1842d4 commit 1bdd369

File tree

132 files changed

+7429
-3401
lines changed

Some content is hidden

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

132 files changed

+7429
-3401
lines changed

.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/_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

.github/workflows/_Linux-XPU.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ jobs:
181181
run: |
182182
runner_name=`(echo $PWD|awk -F '/' '{print $3}')`
183183
echo $runner_name
184-
wget -q https://xly-devops.bj.bcebos.com/PR/utils.sh
184+
wget -q https://xly-devops.bj.bcebos.com/utils.sh
185185
source utils.sh
186186
determine_kunlun_runner ${runner_name}
187187
@@ -260,6 +260,7 @@ jobs:
260260
- name: Run test
261261
run: |
262262
docker exec -t ${{ env.container_name }} /bin/bash -c '
263+
source ${{ github.workspace }}/../../../proxy
263264
bash ${ci_scripts}/kunlun_test.sh
264265
'
265266

.github/workflows/_Model-Benchmark.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ jobs:
3434

3535
model-benchmark:
3636
name: Benchmark test
37+
needs: check-bypass
3738
if: ${{ inputs.can-skip != 'true' && needs.check-bypass.outputs.can-skip != 'true' }}
3839
runs-on:
3940
group: model-bm

.github/workflows/_Slice.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ jobs:
9393
python3.10 -m pip config set global.cache-dir ${{ github.workspace }}/../../../.cache/pip
9494
python3.10 -m pip install $wheel_link
9595
python3.10 -m pip install torch==2.6.0 torchvision==0.21.0 torchaudio==2.6.0 --index-url https://download.pytorch.org/whl/cu118
96+
export FLAGS_share_tensor_for_grad_tensor_holder=True
9697
python3.10 ci/slice/test_slice_perform.py
9798
'
9899

.github/workflows/_Static-Check.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
container_name=${TASK}-$(date +%Y%m%d-%H%M%S)
5656
echo "container_name=${container_name}" >> ${{ github.env }}
5757
docker_image=${{ inputs.docker_build_image }}
58-
docker run -d -t --name ${container_name} \
58+
docker run -d -t --gpus all --name ${container_name} \
5959
-v "/home/data/cfs:/home/data/cfs" \
6060
-v "/home/data/cfs/.cache:/root/.cache" \
6161
-v "/home/data/cfs/.ccache:/root/.ccache" \

.github/workflows/_Windows-Inference.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ jobs:
8383
python -m pip install bce-python-sdk==0.8.74
8484
python -c "import wget;wget.download('https://paddle-github-action.cdn.bcebos.com/windows/tp_predownload/onnxruntime-win-x64-1.11.1.zip')"
8585
if not exist "third_party/onnxruntime/Windows" mkdir "third_party/onnxruntime/Windows"
86-
cp onnxruntime-win-x64-1.11.1.zip third_party/onnxruntime/Windows
86+
move onnxruntime-win-x64-1.11.1.zip third_party/onnxruntime/Windows
8787
call %ACTION_DIR%\proxy.bat
8888
call %ci_scripts%\build.bat
8989

.github/workflows/check-bypass.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
check-bypass:
1717
name: Check bypass
1818
runs-on:
19-
group: APPROVAL
19+
group: APPROVAL
2020
permissions:
2121
contents: read
2222
env:

.github/workflows/docker.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@ on:
3434
description: "Generate images for all CI usage"
3535
value: ${{ jobs.build-docker-images.outputs.docker_distribute_image }}
3636

37+
docker_doc_image:
38+
description: "Generate images for all CI usage"
39+
value: ${{ jobs.build-docker-images.outputs.docker_doc_image }}
40+
3741
jobs:
3842
build-docker-images:
3943
if: github.repository_owner == 'PaddlePaddle'
@@ -46,6 +50,7 @@ jobs:
4650
docker_coverage_image: ${{ steps.build-docker-images.outputs.docker_coverage_image }}
4751
docker_build_image: ${{ steps.build-docker-images.outputs.docker_build_image }}
4852
docker_distribute_image: ${{ steps.build-docker-images.outputs.docker_distribute_image }}
53+
docker_doc_image: ${{ steps.build-docker-images.outputs.docker_doc_image }}
4954
steps:
5055
- id: build-docker-images
5156
name: Build docker images
@@ -57,6 +62,7 @@ jobs:
5762
docker_coverage_file: Dockerfile.cuda117_cudnn8_gcc82_ubuntu18_coverage
5863
docker_build_file: Dockerfile.cuda11.2_cudnn8_gcc82_trt8
5964
docker_distribute_file: Dockerfile.cuda123_cudnn9_gcc122_ubuntu20
65+
docker_doc_file: Dockerfile.doc
6066
dockerfile_script: https://raw.githubusercontent.com/PaddlePaddle/Paddle/refs/heads/develop/tools/dockerfile/ci_dockerfile.sh
6167
dockerfile_origin: https://raw.githubusercontent.com/PaddlePaddle/Paddle/refs/heads/develop/tools/dockerfile/Dockerfile.ubuntu20
6268
run: |
@@ -78,11 +84,10 @@ jobs:
7884
if [ "${{ inputs.task }}" == "cpu" ]; then
7985
declare -A docker_files=(["docker_cpu"]="$docker_cpu_file" ["docker_inference"]="$docker_inference_file" ["docker_distribute"]="$docker_distribute_file")
8086
elif [ "${{ inputs.task }}" == "build" ]; then
81-
declare -A docker_files=(["docker_build"]="$docker_build_file")
87+
declare -A docker_files=(["docker_build"]="$docker_build_file" ["docker_doc"]="$docker_doc_file")
8288
else
8389
declare -A docker_files=(["docker_coverage"]="$docker_coverage_file")
8490
fi
85-
declare -A docker_files=(["docker_cpu"]="$docker_cpu_file" ["docker_inference"]="$docker_inference_file" ["docker_coverage"]="$docker_coverage_file" ["docker_build"]="$docker_build_file" ["docker_distribute"]="$docker_distribute_file")
8691
for name in "${!docker_files[@]}"
8792
do
8893
md5_value=`md5sum tools/dockerfile/${docker_files[$name]} | awk '{print $1}'`

0 commit comments

Comments
 (0)