Skip to content

Commit e87813c

Browse files
xiaoguoguo626807xiaoguoguo626807
committed
Merge commit 'refs/pull/7752/head' of https://github.com/PaddlePaddle/FastDeploy into updatefleet
2 parents 8a4ac65 + 567f41f commit e87813c

8 files changed

Lines changed: 25 additions & 14 deletions

‎.github/workflows/_accuracy_test.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,11 +180,12 @@ jobs:
180180
-e TZ="Asia/Shanghai" \
181181
-e "no_proxy=localhost,127.0.0.1,0.0.0.0,bcebos.com,.bcebos.com,bj.bcebos.com,su.bcebos.com,paddle-ci.gz.bcebos.com,apiin.im.baidu.com,baidu-int.com,.baidu.com,aliyun.com,gitee.com,pypi.tuna.tsinghua.edu.cn,.tuna.tsinghua.edu.cn" \
182182
--gpus '"device='"${DEVICES}"'"' ${docker_image} /bin/bash -xc '
183-
python -m pip install --pre paddlepaddle-gpu -i https://www.paddlepaddle.org.cn/packages/nightly/cu126/
184-
185183
pip config set global.index-url https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple
186184
187185
python -m pip install ${fastdeploy_wheel_url}
186+
python -m pip install paddleformers[paddlefleet]==1.1.0.dev20260507 --extra-index-url https://www.paddlepaddle.org.cn/packages/stable/cu126/ --extra-index-url https://www.paddlepaddle.org.cn/packages/nightly/cu126/
187+
python -m pip uninstall paddlepaddle-gpu -y || true
188+
python -m pip install --pre paddlepaddle-gpu -i https://www.paddlepaddle.org.cn/packages/nightly/cu126/
188189
python -m pip install pytest
189190
190191
wget --no-proxy https://paddle-qa.bj.bcebos.com/zhengtianyu/tools/llm-deploy-linux-amd64

‎.github/workflows/_base_test.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -213,11 +213,12 @@ jobs:
213213
-e TZ="Asia/Shanghai" \
214214
-e "no_proxy=localhost,127.0.0.1,0.0.0.0,bcebos.com,.bcebos.com,bj.bcebos.com,su.bcebos.com,paddle-ci.gz.bcebos.com,apiin.im.baidu.com,baidu-int.com,.baidu.com,aliyun.com,gitee.com,pypi.tuna.tsinghua.edu.cn,.tuna.tsinghua.edu.cn" \
215215
--gpus '"device='"${DEVICES}"'"' ${docker_image} /bin/bash -xc '
216-
python -m pip install --pre paddlepaddle-gpu -i https://www.paddlepaddle.org.cn/packages/nightly/cu126/
217-
218216
pip config set global.index-url https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple
219217
220218
python -m pip install ${fastdeploy_wheel_url}
219+
python -m pip install paddleformers[paddlefleet]==1.1.0.dev20260507 --extra-index-url https://www.paddlepaddle.org.cn/packages/stable/cu126/ --extra-index-url https://www.paddlepaddle.org.cn/packages/nightly/cu126/
220+
python -m pip uninstall paddlepaddle-gpu -y || true
221+
python -m pip install --pre paddlepaddle-gpu -i https://www.paddlepaddle.org.cn/packages/nightly/cu126/
221222
python -m pip install pytest
222223
223224
wget --no-proxy https://paddle-qa.bj.bcebos.com/zhengtianyu/tools/llm-deploy-linux-amd64

‎.github/workflows/_golang_router_test.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -211,15 +211,16 @@ jobs:
211211
212212
git config --global --add safe.directory /workspace/FastDeploy
213213
cd FastDeploy
214-
215-
python -m pip install --pre paddlepaddle-gpu -i https://www.paddlepaddle.org.cn/packages/nightly/cu126/
216214
pip config set global.extra-index-url https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple
217215
218216
python -m pip install -r scripts/unittest_requirement.txt
219217
python -m pip install ${fd_wheel_url}
220218
rm -rf fastdeploy
221219
python -m pip install ${fd_wheel_url} --no-deps --target=/workspace/FastDeploy
222220
export PYTHONPATH=/workspace/FastDeploy/
221+
python -m pip install paddleformers[paddlefleet]==1.1.0.dev20260507 --extra-index-url https://www.paddlepaddle.org.cn/packages/stable/cu126/ --extra-index-url https://www.paddlepaddle.org.cn/packages/nightly/cu126/
222+
python -m pip uninstall paddlepaddle-gpu -y || true
223+
python -m pip install --pre paddlepaddle-gpu -i https://www.paddlepaddle.org.cn/packages/nightly/cu126/
223224
224225
# download fd-router binary
225226
wget -q --no-proxy ${fd_router_url} -O /usr/local/bin/fd-router

‎.github/workflows/_gpu_4cards_case_test.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -217,15 +217,16 @@ jobs:
217217
git config --global --add safe.directory /workspace/FastDeploy
218218
cd FastDeploy
219219
git diff origin/${BASE_REF}..HEAD --unified=0 > diff.txt
220-
221-
python -m pip install --pre paddlepaddle-gpu -i https://www.paddlepaddle.org.cn/packages/nightly/cu126/
222220
pip config set global.extra-index-url https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple
223221
224222
python -m pip install -r scripts/unittest_requirement.txt
225223
python -m pip install ${fd_wheel_url}
226224
rm -rf fastdeploy
227225
python -m pip install ${fd_wheel_url} --no-deps --target=/workspace/FastDeploy
228226
export PYTHONPATH=/workspace/FastDeploy/
227+
python -m pip install paddleformers[paddlefleet]==1.1.0.dev20260507 --extra-index-url https://www.paddlepaddle.org.cn/packages/stable/cu126/ --extra-index-url https://www.paddlepaddle.org.cn/packages/nightly/cu126/
228+
python -m pip uninstall paddlepaddle-gpu -y || true
229+
python -m pip install --pre paddlepaddle-gpu -i https://www.paddlepaddle.org.cn/packages/nightly/cu126/
229230
230231
export CUDA_VISIBLE_DEVICES=0,1,2,3
231232
bash scripts/run_gpu_4cards.sh

‎.github/workflows/_logprob_test_linux.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,11 +189,12 @@ jobs:
189189
-e TZ="Asia/Shanghai" \
190190
-e "no_proxy=localhost,127.0.0.1,0.0.0.0,bcebos.com,.bcebos.com,bj.bcebos.com,su.bcebos.com,paddle-ci.gz.bcebos.com,apiin.im.baidu.com,baidu-int.com,.baidu.com,aliyun.com,gitee.com,pypi.tuna.tsinghua.edu.cn,.tuna.tsinghua.edu.cn" \
191191
--gpus '"device='"${DEVICES}"'"' ${docker_image} /bin/bash -xc '
192-
python -m pip install --pre paddlepaddle-gpu -i https://www.paddlepaddle.org.cn/packages/nightly/cu126/
193-
194192
pip config set global.index-url https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple
195193
196194
python -m pip install ${fastdeploy_wheel_url}
195+
python -m pip install paddleformers[paddlefleet]==1.1.0.dev20260507 --extra-index-url https://www.paddlepaddle.org.cn/packages/stable/cu126/ --extra-index-url https://www.paddlepaddle.org.cn/packages/nightly/cu126/
196+
python -m pip uninstall paddlepaddle-gpu -y || true
197+
python -m pip install --pre paddlepaddle-gpu -i https://www.paddlepaddle.org.cn/packages/nightly/cu126/
197198
198199
wget --no-proxy https://paddle-qa.bj.bcebos.com/zhengtianyu/tools/llm-deploy-linux-amd64
199200
chmod +x ./llm-deploy-linux-amd64

‎.github/workflows/_pre_ce_test.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,8 +201,10 @@ jobs:
201201
--gpus "\"device=${DEVICES}\"" ${docker_image} /bin/bash -c '
202202
git config --global --add safe.directory /workspace/FastDeploy
203203
cd FastDeploy
204-
python -m pip install --pre paddlepaddle-gpu -i https://www.paddlepaddle.org.cn/packages/nightly/cu126/
205204
python -m pip install ${fd_wheel_url}
205+
python -m pip install paddleformers[paddlefleet]==1.1.0.dev20260507 --extra-index-url https://www.paddlepaddle.org.cn/packages/stable/cu126/ --extra-index-url https://www.paddlepaddle.org.cn/packages/nightly/cu126/
206+
python -m pip uninstall paddlepaddle-gpu -y || true
207+
python -m pip install --pre paddlepaddle-gpu -i https://www.paddlepaddle.org.cn/packages/nightly/cu126/
206208
bash scripts/run_pre_ce.sh
207209
'
208210

‎.github/workflows/_stable_test.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -193,11 +193,12 @@ jobs:
193193
-e TZ="Asia/Shanghai" \
194194
-e "no_proxy=localhost,127.0.0.1,0.0.0.0,bcebos.com,.bcebos.com,bj.bcebos.com,su.bcebos.com,paddle-ci.gz.bcebos.com,apiin.im.baidu.com,baidu-int.com,.baidu.com,aliyun.com,gitee.com,pypi.tuna.tsinghua.edu.cn,.tuna.tsinghua.edu.cn" \
195195
--gpus '"device='"${DEVICES}"'"' ${docker_image} /bin/bash -xc '
196-
python -m pip install --pre paddlepaddle-gpu -i https://www.paddlepaddle.org.cn/packages/nightly/cu126/
197-
198196
pip config set global.index-url https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple
199197
200198
python -m pip install ${fastdeploy_wheel_url}
199+
python -m pip install paddleformers[paddlefleet]==1.1.0.dev20260507 --extra-index-url https://www.paddlepaddle.org.cn/packages/stable/cu126/ --extra-index-url https://www.paddlepaddle.org.cn/packages/nightly/cu126/
200+
python -m pip uninstall paddlepaddle-gpu -y || true
201+
python -m pip install --pre paddlepaddle-gpu -i https://www.paddlepaddle.org.cn/packages/nightly/cu126/
201202
python -m pip install pytest
202203
203204
git config --global --add safe.directory /workspace/FastDeploy

‎.github/workflows/_unit_test_coverage.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,6 @@ jobs:
224224
git config --global --add safe.directory /workspace/FastDeploy
225225
cd FastDeploy
226226
git diff origin/${BASE_REF}..HEAD --unified=0 > diff.txt
227-
python -m pip install --pre paddlepaddle-gpu -i https://www.paddlepaddle.org.cn/packages/nightly/cu126/
228227
pip config set global.extra-index-url https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple
229228
230229
python -m pip install -r scripts/unittest_requirement.txt
@@ -240,6 +239,10 @@ jobs:
240239
else
241240
echo "Warning: tests/plugins directory not found, skipping setup.py install"
242241
fi
242+
python -m pip install paddleformers[paddlefleet]==1.1.0.dev20260507 --extra-index-url https://www.paddlepaddle.org.cn/packages/stable/cu126/ --extra-index-url https://www.paddlepaddle.org.cn/packages/nightly/cu126/
243+
python -m pip uninstall paddlepaddle-gpu -y || true
244+
python -m pip install --pre paddlepaddle-gpu -i https://www.paddlepaddle.org.cn/packages/nightly/cu126/
245+
243246
export COVERAGE_FILE=/workspace/FastDeploy/coveragedata/.coverage
244247
export COVERAGE_RCFILE=/workspace/FastDeploy/scripts/.coveragerc
245248
TEST_EXIT_CODE=0

0 commit comments

Comments
 (0)