Skip to content

Commit 3ca50d0

Browse files
Merge branch 'develop' into feat/cat_clamp_alongaxis
2 parents 76433aa + 1995c8f commit 3ca50d0

File tree

848 files changed

+18142
-6763
lines changed

Some content is hidden

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

848 files changed

+18142
-6763
lines changed

.github/workflows/CI-Build.yml

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ jobs:
2121
uses: ./.github/workflows/_Clone-linux.yml
2222
with:
2323
clone_dir: Paddle-build
24+
workflow-name: 'CI-build'
2425

2526
build-docker:
2627
name: build docker images
@@ -33,74 +34,74 @@ jobs:
3334
inference:
3435
name: PR-CI-Inference
3536
uses: ./.github/workflows/_Inference.yml
36-
needs: build-docker
37+
needs: [clone, build-docker]
3738
with:
3839
docker_inference_image: ${{ needs.build-docker.outputs.docker_build_image }}
40+
clone-can-skip: ${{ needs.clone.outputs.can-skip }}
3941

4042
build:
4143
name: Linux-build
4244
uses: ./.github/workflows/_Linux-build.yml
43-
needs: build-docker
45+
needs: [clone, build-docker]
4446
with:
4547
docker_build_image: ${{ needs.build-docker.outputs.docker_build_image }}
4648

4749
static-check:
4850
name: Static-Check
4951
uses: ./.github/workflows/_Static-Check.yml
50-
needs: [build-docker, build]
52+
needs: [clone, build-docker, build]
5153
with:
5254
can-skip: ${{ needs.build.outputs.can-skip }}
5355
docker_build_image: ${{ needs.build-docker.outputs.docker_build_image }}
5456

5557
ce-framework:
5658
name: CE-Framework
5759
uses: ./.github/workflows/_CE-Framework.yml
58-
needs: [build-docker, build]
60+
needs: [clone, build-docker, build]
5961
with:
6062
can-skip: ${{ needs.build.outputs.can-skip }}
6163
docker_build_image: ${{ needs.build-docker.outputs.docker_build_image }}
6264

6365
ce-cinn-framework:
6466
name: CE-CINN-Framework
6567
uses: ./.github/workflows/_CE-CINN-Framework.yml
66-
needs: [build-docker, build]
68+
needs: [clone, build-docker, build]
6769
with:
6870
can-skip: ${{ needs.build.outputs.can-skip }}
6971
docker_build_image: ${{ needs.build-docker.outputs.docker_build_image }}
7072

7173
api-benchmark:
7274
name: Api-Benchmark
7375
uses: ./.github/workflows/_Api-Benchmark.yml
74-
needs: [build-docker, build]
76+
needs: [clone, build-docker, build]
7577
with:
7678
can-skip: ${{ needs.build.outputs.can-skip }}
7779
docker_build_image: ${{ needs.build-docker.outputs.docker_build_image }}
7880

7981
auto-parallel:
8082
name: Auto-Parallel
8183
uses: ./.github/workflows/_Auto-Parallel.yml
82-
needs: [build-docker, build]
84+
needs: [clone, build-docker, build]
8385
with:
8486
can-skip: ${{ needs.build.outputs.can-skip }}
8587
docker_build_image: ${{ needs.build-docker.outputs.docker_build_image }}
8688

8789
model-benchmark:
8890
name: Model-Benchmark
8991
uses: ./.github/workflows/_Model-Benchmark.yml
90-
needs: [build-docker, build]
92+
needs: [clone, build-docker, build]
9193
with:
9294
can-skip: ${{ needs.build.outputs.can-skip }}
9395
docker_build_image: ${{ needs.build-docker.outputs.docker_build_image }}
9496

9597
doc-preview:
9698
name: Doc-Preview
9799
uses: ./.github/workflows/_Doc-Preview.yml
98-
needs: [build-docker, build]
100+
needs: [clone, build-docker, build]
99101
with:
100102
can-skip: ${{ needs.build.outputs.can-skip }}
101103
docker_doc_image: ${{ needs.build-docker.outputs.docker_doc_image }}
102104

103-
104105
slice:
105106
name: Slice
106107
uses: ./.github/workflows/_Slice.yml

.github/workflows/CI.yml

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ jobs:
1919
clone:
2020
name: Clone-linux
2121
uses: ./.github/workflows/_Clone-linux.yml
22+
with:
23+
workflow-name: 'CI'
2224

2325
build-docker:
2426
name: build docker images
@@ -28,47 +30,53 @@ jobs:
2830
sot:
2931
name: PR-CI-SOT
3032
uses: ./.github/workflows/_SOT.yml
31-
needs: build-docker
33+
needs: [clone, build-docker]
3234
with:
3335
docker_cpu_image: ${{ needs.build-docker.outputs.docker_cpu_image }}
36+
clone-can-skip: ${{ needs.clone.outputs.can-skip }}
3437

3538
mac:
3639
name: Mac-CPU
3740
uses: ./.github/workflows/_Mac.yml
3841
needs: clone
42+
with:
43+
clone-can-skip: ${{ needs.clone.outputs.can-skip }}
3944

4045
xpu:
4146
name: Linux-XPU
4247
uses: ./.github/workflows/_Linux-XPU.yml
43-
needs: build-docker
48+
needs: [clone, build-docker]
4449
with:
4550
docker_xpu_image: ${{ needs.build-docker.outputs.docker_xpu_image }}
51+
clone-can-skip: ${{ needs.clone.outputs.can-skip }}
4652

4753
dcu:
4854
name: Linux-DCU
4955
uses: ./.github/workflows/_Linux-DCU.yml
50-
needs: build-docker
56+
needs: [clone, build-docker]
5157
with:
5258
docker_dcu_image: ${{ needs.build-docker.outputs.docker_dcu_image }}
59+
clone-can-skip: ${{ needs.clone.outputs.can-skip }}
5360

5461
cpu:
5562
name: Linux-CPU
5663
uses: ./.github/workflows/_Linux-CPU.yml
57-
needs: build-docker
64+
needs: [clone, build-docker]
5865
with:
5966
docker_cpu_image: ${{ needs.build-docker.outputs.docker_cpu_image }}
6067

6168
npu:
6269
name: Linux-NPU
6370
uses: ./.github/workflows/_Linux-NPU.yml
64-
needs: [cpu, build-docker]
71+
needs: [clone, cpu, build-docker]
6572
with:
6673
can-skip: ${{ needs.cpu.outputs.can-skip }}
6774
docker_npu_image: ${{ needs.build-docker.outputs.docker_npu_image }}
6875

6976
distribute:
7077
name: Distribute-stable
7178
uses: ./.github/workflows/_Distribute-stable.yml
72-
needs: build-docker
79+
needs: [clone, build-docker]
7380
with:
7481
docker_distribute_image: ${{ needs.build-docker.outputs.docker_distribute_image }}
82+
clone-can-skip: ${{ needs.clone.outputs.can-skip }}

.github/workflows/_Api-Benchmark.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ defaults:
2828
jobs:
2929
check-bypass:
3030
name: Check bypass
31+
if: ${{ inputs.can-skip != 'true' }}
3132
uses: ./.github/workflows/check-bypass.yml
3233
with:
3334
workflow-name: 'api-benchmark'
@@ -37,7 +38,7 @@ jobs:
3738
data-storage:
3839
name: Performance data storage
3940
needs: check-bypass
40-
if: ${{ inputs.can-skip != 'true' && needs.check-bypass.outputs.can-skip != 'true' }}
41+
if: ${{ needs.check-bypass.outputs.can-skip != 'true' }}
4142
runs-on:
4243
group: Api-bm
4344
steps:

.github/workflows/_Auto-Parallel.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ defaults:
2828
jobs:
2929
check-bypass:
3030
name: Check bypass
31+
if: ${{ inputs.can-skip != 'true' }}
3132
uses: ./.github/workflows/check-bypass.yml
3233
with:
3334
workflow-name: 'auto-parallel'
@@ -37,7 +38,7 @@ jobs:
3738
parallel-test:
3839
name: Parallel test
3940
needs: check-bypass
40-
if: ${{ inputs.can-skip != 'true' && needs.check-bypass.outputs.can-skip != 'true' }}
41+
if: ${{ needs.check-bypass.outputs.can-skip != 'true' }}
4142
runs-on:
4243
group: Auto-Parallel
4344
steps:

.github/workflows/_Distribute-stable.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ on:
66
docker_distribute_image:
77
type: string
88
required: true
9+
clone-can-skip:
10+
type: string
11+
required: false
12+
default: "false"
913

1014
env:
1115
PR_ID: ${{ github.event.pull_request.number }}
@@ -26,6 +30,7 @@ defaults:
2630
jobs:
2731
build:
2832
name: Build
33+
if: ${{ inputs.clone-can-skip != 'true' }}
2934
outputs:
3035
can-skip: ${{ steps.check-bypass.outputs.can-skip }}
3136
runs-on:

.github/workflows/_Doc-Preview.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ defaults:
2828
jobs:
2929
check-bypass:
3030
name: Check bypass for Doc-Preview
31+
if: ${{ inputs.can-skip != 'true' }}
3132
uses: ./.github/workflows/check-bypass.yml
3233
with:
3334
workflow-name: 'Doc-Preview'
@@ -37,7 +38,7 @@ jobs:
3738
build-doc:
3839
name: Build doc
3940
needs: check-bypass
40-
if: ${{ inputs.can-skip != 'true' && needs.check-bypass.outputs.can-skip != 'true' }}
41+
if: ${{ needs.check-bypass.outputs.can-skip != 'true' }}
4142
runs-on:
4243
group: BD_BJ-V100
4344
steps:

.github/workflows/_Inference.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ on:
66
docker_inference_image:
77
type: string
88
required: true
9+
clone-can-skip:
10+
type: string
11+
required: false
12+
default: "false"
913

1014
env:
1115
PR_ID: ${{ github.event.pull_request.number }}
@@ -25,6 +29,7 @@ defaults:
2529
jobs:
2630
check-bypass:
2731
name: Check bypass
32+
if: ${{ inputs.can-skip != 'true' }}
2833
uses: ./.github/workflows/check-bypass.yml
2934
with:
3035
workflow-name: 'inference'
@@ -34,7 +39,7 @@ jobs:
3439
build:
3540
name: Build
3641
needs: check-bypass
37-
if: ${{ github.repository_owner == 'PaddlePaddle' && needs.check-bypass.outputs.can-skip != 'true' }}
42+
if: ${{ needs.check-bypass.outputs.can-skip != 'true' }}
3843
env:
3944
TASK: paddle-CI-${{ github.event.pull_request.number }}-inference_build
4045
runs-on:

.github/workflows/_Linux-DCU.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ on:
66
docker_dcu_image:
77
type: string
88
required: true
9+
clone-can-skip:
10+
type: string
11+
required: false
12+
default: "false"
913

1014
env:
1115
docker_image: ${{ inputs.docker_dcu_image }}
@@ -27,6 +31,7 @@ defaults:
2731
jobs:
2832
check-bypass:
2933
name: Check bypass
34+
if: ${{ inputs.can-skip != 'true' }}
3035
uses: ./.github/workflows/check-bypass.yml
3136
with:
3237
workflow-name: 'dcu'
@@ -36,7 +41,7 @@ jobs:
3641
build:
3742
name: Build
3843
needs: check-bypass
39-
if: ${{ github.repository_owner == 'PaddlePaddle' && needs.check-bypass.outputs.can-skip != 'true' }}
44+
if: ${{ needs.check-bypass.outputs.can-skip != 'true' }}
4045
env:
4146
TASK: paddle-CI-${{ github.event.pull_request.number }}-dcu_build
4247
runs-on:

.github/workflows/_Linux-NPU.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ env:
2525
jobs:
2626
check-bypass:
2727
name: Check bypass
28+
if: ${{ inputs.can-skip != 'true' }}
2829
uses: ./.github/workflows/check-bypass.yml
2930
with:
3031
workflow-name: 'npu'
@@ -34,7 +35,7 @@ jobs:
3435
test:
3536
name: Test
3637
needs: check-bypass
37-
if: ${{ inputs.can-skip != 'true' && needs.check-bypass.outputs.can-skip != 'true' }}
38+
if: ${{ needs.check-bypass.outputs.can-skip != 'true' }}
3839
runs-on:
3940
group: NPU
4041

.github/workflows/_Linux-XPU.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ on:
66
docker_xpu_image:
77
type: string
88
required: true
9+
clone-can-skip:
10+
type: string
11+
required: false
12+
default: "false"
913

1014
env:
1115
docker_image: ${{ inputs.docker_xpu_image }}
@@ -26,6 +30,7 @@ defaults:
2630
jobs:
2731
check-bypass:
2832
name: Check bypass
33+
if: ${{ inputs.can-skip != 'true' }}
2934
uses: ./.github/workflows/check-bypass.yml
3035
with:
3136
workflow-name: 'xpu'
@@ -35,7 +40,7 @@ jobs:
3540
build:
3641
name: Build
3742
needs: check-bypass
38-
if: ${{ github.repository_owner == 'PaddlePaddle' && needs.check-bypass.outputs.can-skip != 'true' }}
43+
if: ${{ needs.check-bypass.outputs.can-skip != 'true' }}
3944
env:
4045
TASK: paddle-CI-${{ github.event.pull_request.number }}-xpu_build
4146
runs-on:

0 commit comments

Comments
 (0)