Skip to content

Commit 718ef0a

Browse files
zeroRainszeroRains
committed
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into tensor
2 parents 2a46d38 + 6e31ae0 commit 718ef0a

File tree

142 files changed

+7377
-1165
lines changed

Some content is hidden

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

142 files changed

+7377
-1165
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
permissions: read-all
99

1010
concurrency:
11-
group: ${{ github.event.pull_request.number }}-Windows
11+
group: ${{ github.event.pull_request.number }}-${{ github.workflow }}
1212
cancel-in-progress: true
1313

1414
env:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ jobs:
176176
pip config set global.cache-dir "$CACHE_DIR/pip"
177177
pip config set global.index-url https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple
178178
python -m pip install pip --upgrade
179-
pip install /paddlepaddle_gpu-0.0.0-cp310-cp310-linux_x86_64.whl
179+
pip install /paddlepaddle_gpu-0.0.0-cp310-cp310-linux_x86_64.whl --no-index --no-deps
180180
pip install -r /PaddleTest/inference/python_api_test/requirements.txt
181181
'
182182
@@ -275,7 +275,7 @@ jobs:
275275
pip config set global.cache-dir "${CFS_DIR}/.cache/pip"
276276
pip config set global.index-url https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple
277277
pip install sympy
278-
pip install /paddlepaddle_gpu-0.0.0-cp310-cp310-linux_x86_64.whl
278+
pip install /paddlepaddle_gpu-0.0.0-cp310-cp310-linux_x86_64.whl --no-index --no-deps
279279
'
280280
281281
- name: Check

‎.github/workflows/cancel-CI-build.yml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: CI-Build
2+
3+
on:
4+
pull_request:
5+
types: [closed]
6+
branches: [develop, release/**]
7+
8+
permissions: read-all
9+
10+
concurrency:
11+
group: ${{ github.event.pull_request.number }}-${{ github.workflow }}
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+
cancel:
20+
name: Cancel CI-Build for ${{ github.event.pull_request.number }}
21+
runs-on: ubuntu-latest
22+
steps:
23+
- name: Cancel CI-build
24+
run: |
25+
exit 0

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

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: CI
2+
3+
on:
4+
pull_request:
5+
types: [closed]
6+
branches: [develop, release/**]
7+
8+
permissions: read-all
9+
10+
concurrency:
11+
group: ${{ github.event.pull_request.number }}-${{ github.workflow }}
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+
cancel:
20+
name: Cancel CI for ${{ github.event.pull_request.number }}
21+
runs-on: ubuntu-latest
22+
steps:
23+
- name: Cancel CI
24+
run: |
25+
exit 0

‎.github/workflows/cancel-coverage.yml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: Coverage
2+
3+
on:
4+
pull_request:
5+
types: [closed]
6+
branches: [develop, release/**]
7+
8+
permissions: read-all
9+
10+
concurrency:
11+
group: ${{ github.event.pull_request.number }}-${{ github.workflow }}
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+
cancel:
20+
name: Cancel Coverage for ${{ github.event.pull_request.number }}
21+
runs-on: ubuntu-latest
22+
steps:
23+
- name: Cancel Coverage
24+
run: |
25+
exit 0

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

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: CI-Windows
2+
3+
on:
4+
pull_request:
5+
types: [closed]
6+
branches: [develop, release/**]
7+
8+
permissions: read-all
9+
10+
concurrency:
11+
group: ${{ github.event.pull_request.number }}-${{ github.workflow }}
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+
cancel:
20+
name: Cancel CI-Windows for ${{ github.event.pull_request.number }}
21+
runs-on: ubuntu-latest
22+
steps:
23+
- name: Cancel CI-Windows
24+
run: |
25+
exit 0

‎ci/utils.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1219,9 +1219,9 @@ function generate_api_spec() {
12191219
pip install -r $REQUIREMENTS_PATH
12201220

12211221
if [ -d "${PADDLE_ROOT}/build/python/dist/" ]; then
1222-
pip install ${PADDLE_ROOT}/build/python/dist/*whl
1222+
pip install ${PADDLE_ROOT}/build/python/dist/*whl --no-index --no-deps
12231223
elif [ -d "${PADDLE_ROOT}/dist/" ];then
1224-
pip install ${PADDLE_ROOT}/dist/*whl
1224+
pip install ${PADDLE_ROOT}/dist/*whl --no-index --no-deps
12251225
mkdir ${PADDLE_ROOT}/build/python/dist/ && mv ${PADDLE_ROOT}/dist/*whl ${PADDLE_ROOT}/build/python/dist/
12261226
fi
12271227
spec_path=${PADDLE_ROOT}/paddle/fluid/API_${spec_kind}.spec

‎ci/windows/build.bat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ rem install ninja if GENERATOR is Ninja
8888
if "%GENERATOR%" == "Ninja" (
8989
rem Set the default generator for cmake to Ninja
9090
setx CMAKE_GENERATOR Ninja
91-
pip install ninja
91+
pip install ninja==1.11.1.4
9292
if %errorlevel% NEQ 0 (
9393
echo pip install ninja failed!
9494
exit /b 5

0 commit comments

Comments
 (0)