Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions .github/workflows/CE-DCU-XPU.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,6 @@ jobs:
needs: clone
uses: ./.github/workflows/docker.yml

xpu:
name: Linux-XPU
uses: ./.github/workflows/_Linux-XPU.yml
needs: [clone, build-docker]
with:
docker_xpu_image: ${{ needs.build-docker.outputs.docker_xpu_image }}

dcu:

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 可维护性建议(未完成迁移,不阻塞合入):本 PR 删掉 xpu job 后,这个夜间工作流只剩 dcu,但文件名和首行 name: CE-DCU-XPU 仍带 XPU,CI.yml:53-54 的注释也继续指向该文件,容易让人误以为夜间仍在回归 XPU。建议把 name 改为 CE-DCU(可同时重命名为 CE-DCU.yml),并同步更新 CI.yml:54 的引用。

name: Linux-DCU
uses: ./.github/workflows/_Linux-DCU.yml
Expand Down
10 changes: 9 additions & 1 deletion .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,15 @@ jobs:
with:
clone-can-skip: ${{ needs.clone.outputs.can-skip }}

# Linux-XPU and Linux-DCU moved off the PR gate to nightly CE regression.
xpu:
name: Linux-XPU
uses: ./.github/workflows/_Linux-XPU.yml
needs: [clone, build-docker]
with:
docker_xpu_image: ${{ needs.build-docker.outputs.docker_xpu_image }}
clone-can-skip: ${{ needs.clone.outputs.can-skip }}

# Linux-DCU moved off the PR gate to nightly CE regression.
# See .github/workflows/CE-DCU-XPU.yml (scheduled at 02:00 UTC+8).

cpu:
Expand Down
30 changes: 22 additions & 8 deletions .github/workflows/_Linux-XPU.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,20 @@ on:
docker_xpu_image:
type: string
required: true
clone-can-skip:
type: string
required: false
default: "false"

env:
docker_image: ${{ inputs.docker_xpu_image }}
PR_ID: ${{ '0' }}
COMMIT_ID: ${{ github.sha }}
PR_ID: ${{ github.event.pull_request.number }}
COMMIT_ID: ${{ github.event.pull_request.head.sha }}
ci_scripts: /paddle/ci
ci_scripts_runner: ${{ github.workspace }}/ci
work_dir: /paddle
PADDLE_ROOT: /paddle
BRANCH: ${{ github.ref_name }}
BRANCH: ${{ github.event.pull_request.base.ref }}
CI_name: xpu
no_proxy: "bcebos.com,apiin.im.baidu.com,gitee.com,aliyun.com,.baidu.com,.tuna.tsinghua.edu.cn"

Expand All @@ -24,10 +28,20 @@ defaults:
shell: bash

jobs:
check-bypass:
name: Check bypass
uses: ./.github/workflows/check-bypass.yml
with:
workflow-name: "xpu"
secrets:
github-token: ${{ secrets.GITHUB_TOKEN }}

build:
name: Build
needs: [check-bypass]
if: ${{ needs.check-bypass.outputs.can-skip != 'true' && inputs.clone-can-skip != 'true' }}
env:
TASK: paddle-CI-xpu_build
TASK: paddle-CI-${{ github.event.pull_request.number }}-xpu_build
runs-on:
group: XPU-build
timeout-minutes: 120
Expand All @@ -38,7 +52,7 @@ jobs:
WITH_XPU: "ON"
COVERALLS_UPLOAD: "OFF"
WITH_AVX: "OFF"
GIT_PR_ID: ${{ '0' }}
GIT_PR_ID: ${{ github.event.pull_request.number }}
PADDLE_VERSION: 0.0.0
WITH_TESTING: "ON"
WITH_DISTRIBUTE: "ON"
Expand Down Expand Up @@ -111,7 +125,7 @@ jobs:
git remote add upstream https://github.com/PaddlePaddle/Paddle.git
source ${{ github.workspace }}/../../../proxy
git config pull.rebase false
git checkout test 2>/dev/null || git checkout "$BRANCH"
git checkout test
echo "Pull upstream develop or target branch"
bash ci/git_pull.sh $BRANCH
git submodule update
Expand Down Expand Up @@ -168,7 +182,7 @@ jobs:
name: Test
needs: build
env:
TASK: paddle-CI-xpu_test
TASK: paddle-CI-${{ github.event.pull_request.number }}-xpu_test
runs-on:
group: Kunlun
timeout-minutes: 120
Expand All @@ -188,7 +202,7 @@ jobs:
COVERALLS_UPLOAD: "OFF"
CMAKE_BUILD_TYPE: Release
WITH_AVX: "OFF"
GIT_PR_ID: ${{ '0' }}
GIT_PR_ID: ${{ github.event.pull_request.number }}
PADDLE_VERSION: 0.0.0
WITH_TESTING: "ON"
WITH_DISTRIBUTE: "ON"
Expand Down
30 changes: 30 additions & 0 deletions .github/workflows/rerun.yml
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,36 @@ jobs:
REPO: ${{ github.event.repository.name }}
JOB_NAME: 'Coverage test'

- name: Rerun XPU
if: ${{ contains(github.event.comment.body, 'xpu') && !contains(github.event.comment.body, 'build') && !contains(github.event.comment.body, 'test') }}
uses: ./.github/actions/rerun-workflow
with:
PR_ID: ${{ github.event.issue.number }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
OWNER: ${{ github.repository_owner }}
REPO: ${{ github.event.repository.name }}
JOB_NAME: 'Linux-XPU / Check bypass / Check bypass'

- name: Rerun XPU build
if: ${{ contains(github.event.comment.body, 'xpu') && contains(github.event.comment.body, 'build') }}
uses: ./.github/actions/rerun-workflow
with:
PR_ID: ${{ github.event.issue.number }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
OWNER: ${{ github.repository_owner }}
REPO: ${{ github.event.repository.name }}
JOB_NAME: 'Linux-XPU / Build'

- name: Rerun XPU test
if: ${{ contains(github.event.comment.body, 'xpu') && contains(github.event.comment.body, 'test') }}
uses: ./.github/actions/rerun-workflow
with:
PR_ID: ${{ github.event.issue.number }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
OWNER: ${{ github.repository_owner }}
REPO: ${{ github.event.repository.name }}
JOB_NAME: 'Linux-XPU / Test'

- name: Rerun Distribute-stable build
if: ${{ contains(github.event.comment.body, 'distribute') && !contains(github.event.comment.body, 'test') }}
uses: ./.github/actions/rerun-workflow
Expand Down
Loading