Skip to content

Commit c8f2eec

Browse files
zeroRainszeroRains
committed
fix conflict
2 parents 1021878 + b4b579a commit c8f2eec

File tree

120 files changed

+4448
-559
lines changed

Some content is hidden

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

120 files changed

+4448
-559
lines changed

‎.github/workflows/_accuracy_test.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
fi
5656
'
5757
58-
wget -q ${fd_archive_url}
58+
wget -q --no-proxy ${fd_archive_url}
5959
tar -xf FastDeploy.tar.gz
6060
rm -rf FastDeploy.tar.gz
6161
cd FastDeploy

‎.github/workflows/_base_test.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
fi
5656
'
5757
58-
wget -q ${fd_archive_url}
58+
wget -q --no-proxy ${fd_archive_url}
5959
tar -xf FastDeploy.tar.gz
6060
rm -rf FastDeploy.tar.gz
6161
cd FastDeploy

‎.github/workflows/_build_linux.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ jobs:
8282
fi
8383
'
8484
85-
wget -q ${fd_archive_url}
85+
wget -q --no-proxy ${fd_archive_url}
8686
tar -xf FastDeploy.tar.gz
8787
rm -rf FastDeploy.tar.gz
8888
cd FastDeploy

‎.github/workflows/ci_gcu.yml‎ renamed to ‎.github/workflows/_ci_gcu.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
name: CI_GCU
22

33
on:
4-
pull_request:
5-
branches:
6-
- develop
7-
- 'release/*'
4+
#pull_request:
5+
#branches:
6+
#- develop
7+
#- 'release/*'
88
workflow_dispatch:
99

1010
concurrency:

‎.github/workflows/_ci_image_build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
fi
5454
'
5555
56-
wget -q ${fd_archive_url}
56+
wget -q --no-proxy ${fd_archive_url}
5757
tar -xf FastDeploy.tar.gz
5858
rm -rf FastDeploy.tar.gz
5959
cd FastDeploy

‎.github/workflows/_logprob_test_linux.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ on:
3232
jobs:
3333
run_tests_logprob:
3434
runs-on: [self-hosted, GPU-h20-1Cards]
35+
timeout-minutes: 60
3536
steps:
3637
- name: Code Prepare
3738
shell: bash
@@ -47,7 +48,7 @@ jobs:
4748
${docker_image} /bin/bash -c '
4849
rm -rf /workspace/*
4950
'
50-
wget -q ${paddletest_archive_url}
51+
wget -q --no-proxy ${paddletest_archive_url}
5152
tar -xf PaddleTest.tar.gz
5253
rm -rf PaddleTest.tar.gz
5354
cd PaddleTest

‎.github/workflows/_pre_ce_test.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
fi
5858
'
5959
60-
wget -q ${fd_archive_url}
60+
wget -q --no-proxy ${fd_archive_url}
6161
tar -xf FastDeploy.tar.gz
6262
rm -rf FastDeploy.tar.gz
6363
cd FastDeploy
@@ -145,7 +145,8 @@ jobs:
145145
--gpus "\"device=${DEVICES}\"" ${docker_image} /bin/bash -c '
146146
git config --global --add safe.directory /workspace/FastDeploy
147147
cd FastDeploy
148-
python -m pip install --pre paddlepaddle-gpu -i https://www.paddlepaddle.org.cn/packages/nightly/cu126/
148+
# python -m pip install --pre paddlepaddle-gpu -i https://www.paddlepaddle.org.cn/packages/nightly/cu126/
149+
python -m pip install paddlepaddle-gpu==3.3.0.dev20251012 -i https://www.paddlepaddle.org.cn/packages/nightly/cu126/
149150
python -m pip install ${fd_wheel_url}
150151
bash scripts/run_pre_ce.sh
151152
'

‎.github/workflows/_stable_test.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
fi
5656
'
5757
58-
wget -q ${fd_archive_url}
58+
wget -q --no-proxy ${fd_archive_url}
5959
tar -xf FastDeploy.tar.gz
6060
rm -rf FastDeploy.tar.gz
6161
cd FastDeploy

‎.github/workflows/_unit_test_coverage.yml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ jobs:
7171
fi
7272
'
7373
74-
wget -q ${fd_archive_url}
74+
wget -q --no-proxy ${fd_archive_url}
7575
tar -xf FastDeploy.tar.gz
7676
rm -rf FastDeploy.tar.gz
7777
cd FastDeploy
@@ -168,7 +168,8 @@ jobs:
168168
git config --global --add safe.directory /workspace/FastDeploy
169169
cd FastDeploy
170170
git diff origin/${BASE_REF}..HEAD --unified=0 > diff.txt
171-
python -m pip install --pre paddlepaddle-gpu -i https://www.paddlepaddle.org.cn/packages/nightly/cu126/
171+
# python -m pip install --pre paddlepaddle-gpu -i https://www.paddlepaddle.org.cn/packages/nightly/cu126/
172+
python -m pip install paddlepaddle-gpu==3.3.0.dev20251012 -i https://www.paddlepaddle.org.cn/packages/nightly/cu126/
172173
pip config set global.extra-index-url https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple
173174
174175
python -m pip install -r scripts/unittest_requirement.txt
@@ -299,7 +300,7 @@ jobs:
299300
env:
300301
diff_cov_file_url: ${{ needs.run_tests_with_coverage.outputs.diff_cov_file_url }}
301302
run: |
302-
wget ${fd_archive_url}
303+
wget -q --no-proxy ${fd_archive_url}
303304
tar -xf FastDeploy.tar.gz
304305
cd FastDeploy
305306
if [ -z "${diff_cov_file_url}" ]; then

‎.github/workflows/publish_job.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ jobs:
302302
rm -rf ${REPO_NAME}*
303303
fi
304304
'
305-
wget -q ${fd_archive_url}
305+
wget -q --no-proxy ${fd_archive_url}
306306
tar -xf FastDeploy.tar.gz
307307
rm -rf FastDeploy.tar.gz
308308
cd FastDeploy

0 commit comments

Comments
 (0)