Skip to content

Commit d68e3e2

Browse files
authored
Merge branch 'develop' into feature/llguidance
2 parents 19a423d + f25ee3a commit d68e3e2

File tree

157 files changed

+10171
-2693
lines changed

Some content is hidden

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

157 files changed

+10171
-2693
lines changed

.github/workflows/_accuracy_test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ jobs:
143143
-v "${CACHE_DIR}/ConfigDir:/root/.config" \
144144
-e TZ="Asia/Shanghai" \
145145
--gpus '"device='"${DEVICES}"'"' ${docker_image} /bin/bash -xc '
146-
python -m pip install paddlepaddle-gpu==3.3.0.dev20251118 -i https://www.paddlepaddle.org.cn/packages/nightly/cu126/
146+
python -m pip install --pre paddlepaddle-gpu -i https://www.paddlepaddle.org.cn/packages/nightly/cu126/
147147
148148
pip config set global.index-url https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple
149149

.github/workflows/_base_test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ jobs:
143143
-v "${CACHE_DIR}/ConfigDir:/root/.config" \
144144
-e TZ="Asia/Shanghai" \
145145
--gpus '"device='"${DEVICES}"'"' ${docker_image} /bin/bash -xc '
146-
python -m pip install paddlepaddle-gpu==3.3.0.dev20251118 -i https://www.paddlepaddle.org.cn/packages/nightly/cu126/
146+
python -m pip install --pre paddlepaddle-gpu -i https://www.paddlepaddle.org.cn/packages/nightly/cu126/
147147
148148
pip config set global.index-url https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple
149149

.github/workflows/_build_linux.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ jobs:
155155
elif [[ "${PADDLEVERSION}" != "" ]];then
156156
python -m pip install paddlepaddle-gpu==${PADDLEVERSION} -i https://www.paddlepaddle.org.cn/packages/stable/cu126/
157157
else
158-
python -m pip install paddlepaddle-gpu==3.3.0.dev20251118 -i https://www.paddlepaddle.org.cn/packages/nightly/cu126/
158+
python -m pip install --pre paddlepaddle-gpu -i https://www.paddlepaddle.org.cn/packages/nightly/cu126/
159159
fi
160160
161161
pip config set global.index-url https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple
@@ -164,7 +164,7 @@ jobs:
164164
python -m pip install -r requirements.txt
165165
python -m pip install wheel
166166
# 编译RDMA
167-
export ENABLE_FD_RDMA=1
167+
export FD_ENABLE_RDMA_COMPILE=1
168168
bash build.sh 1 python false [${COMPILE_ARCH}]
169169
ls ./dist/*.whl
170170
'

.github/workflows/_logprob_test_linux.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ jobs:
134134
-v "${CACHE_DIR}/ConfigDir:/root/.config" \
135135
-e TZ="Asia/Shanghai" \
136136
--gpus '"device='"${DEVICES}"'"' ${docker_image} /bin/bash -xc '
137-
python -m pip install paddlepaddle-gpu==3.3.0.dev20251118 -i https://www.paddlepaddle.org.cn/packages/nightly/cu126/
137+
python -m pip install --pre paddlepaddle-gpu -i https://www.paddlepaddle.org.cn/packages/nightly/cu126/
138138
139139
pip config set global.index-url https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple
140140

.github/workflows/_pre_ce_test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ jobs:
154154
--gpus "\"device=${DEVICES}\"" ${docker_image} /bin/bash -c '
155155
git config --global --add safe.directory /workspace/FastDeploy
156156
cd FastDeploy
157-
python -m pip install paddlepaddle-gpu==3.3.0.dev20251118 -i https://www.paddlepaddle.org.cn/packages/nightly/cu126/
157+
python -m pip install --pre paddlepaddle-gpu -i https://www.paddlepaddle.org.cn/packages/nightly/cu126/
158158
python -m pip install ${fd_wheel_url}
159159
bash scripts/run_pre_ce.sh
160160
'

.github/workflows/_stable_test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ jobs:
146146
-v "${CACHE_DIR}/ConfigDir:/root/.config" \
147147
-e TZ="Asia/Shanghai" \
148148
--gpus '"device='"${DEVICES}"'"' ${docker_image} /bin/bash -xc '
149-
python -m pip install paddlepaddle-gpu==3.3.0.dev20251118 -i https://www.paddlepaddle.org.cn/packages/nightly/cu126/
149+
python -m pip install --pre paddlepaddle-gpu -i https://www.paddlepaddle.org.cn/packages/nightly/cu126/
150150
151151
pip config set global.index-url https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple
152152

.github/workflows/_unit_test_coverage.yml

Lines changed: 31 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
needs: check_cov_skip
4646
if: needs.check_cov_skip.outputs.can-skip != 'true'
4747
outputs:
48-
diff_cov_file_url: ${{ steps.cov_upload.outputs.diff_cov_file_url }}
48+
all_cov_file_url: ${{ steps.cov_upload.outputs.all_cov_file_url }}
4949
unittest_failed_url: ${{ steps.cov_upload.outputs.unittest_failed_url }}
5050
diff_cov_result_json_url: ${{ steps.cov_upload.outputs.diff_cov_result_json_url }}
5151
steps:
@@ -174,7 +174,7 @@ jobs:
174174
git config --global --add safe.directory /workspace/FastDeploy
175175
cd FastDeploy
176176
git diff origin/${BASE_REF}..HEAD --unified=0 > diff.txt
177-
python -m pip install paddlepaddle-gpu==3.3.0.dev20251118 -i https://www.paddlepaddle.org.cn/packages/nightly/cu126/
177+
python -m pip install --pre paddlepaddle-gpu -i https://www.paddlepaddle.org.cn/packages/nightly/cu126/
178178
pip config set global.extra-index-url https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple
179179
180180
python -m pip install -r scripts/unittest_requirement.txt
@@ -202,7 +202,7 @@ jobs:
202202
if [[ "$IS_PR" == "true" ]]; then
203203
echo "Running diff coverage for PR..."
204204
diff-cover python_coverage_all.xml --diff-file=diff.txt --fail-under=80 --json-report diff_coverage.json || COVERAGE_EXIT_CODE=9
205-
python scripts/generate_diff_coverage_xml.py diff.txt python_coverage_all.xml
205+
# python scripts/generate_diff_coverage_xml.py diff.txt python_coverage_all.xml
206206
else
207207
echo "Running full coverage"
208208
coverage report -m > full_coverage_report.txt
@@ -250,15 +250,15 @@ jobs:
250250
251251
target_path_stripped="${target_path#paddle-github-action/}"
252252
253-
if [[ "$IS_PR" == "true" ]]; then
254-
diff_cov_file="diff_coverage.xml"
255-
if [ -f ${diff_cov_file} ]; then
256-
python ${push_file} ${diff_cov_file} ${target_path}/CoverageData
257-
DIFF_COV_FILE_URL=https://paddle-github-action.bj.bcebos.com/${target_path_stripped}/CoverageData/${diff_cov_file}
258-
echo "diff_cov_file_url=${DIFF_COV_FILE_URL}" >> $GITHUB_OUTPUT
259-
echo "diff_cov_file_url=${DIFF_COV_FILE_URL}" >> $GITHUB_ENV
260-
fi
253+
all_coverage_file="python_coverage_all.xml"
254+
if [ -f ${all_coverage_file} ]; then
255+
python ${push_file} ${all_coverage_file} ${target_path}/CoverageData
256+
ALL_COV_FILE_URL=https://paddle-github-action.bj.bcebos.com/${target_path_stripped}/CoverageData/${all_coverage_file}
257+
echo "all_cov_file_url=${ALL_COV_FILE_URL}" >> $GITHUB_OUTPUT
258+
echo "all_cov_file_url=${ALL_COV_FILE_URL}" >> $GITHUB_ENV
259+
fi
261260
261+
if [[ "$IS_PR" == "true" ]]; then
262262
diff_cov_result_json="diff_coverage.json"
263263
if [ -f ${diff_cov_result_json} ]; then
264264
python ${push_file} ${diff_cov_result_json} ${target_path}/CoverageData
@@ -352,28 +352,33 @@ jobs:
352352
runs-on: ubuntu-latest
353353
timeout-minutes: 15
354354
env:
355-
fd_archive_url: ${{ inputs.FASTDEPLOY_ARCHIVE_URL }}
355+
all_cov_file_url: ${{ needs.run_tests_with_coverage.outputs.all_cov_file_url }}
356356
steps:
357-
- name: coverage diff file download
357+
- name: Clone FastDeploy
358+
uses: actions/checkout@v4
359+
with:
360+
fetch-depth: 0
361+
- uses: actions/setup-python@v5
362+
with:
363+
python-version: '3.10'
364+
- name: Download diff coverage file
358365
shell: bash
359-
env:
360-
diff_cov_file_url: ${{ needs.run_tests_with_coverage.outputs.diff_cov_file_url }}
361366
run: |
362-
wget -q --no-proxy ${fd_archive_url}
363-
tar -xf FastDeploy.tar.gz
364-
cd FastDeploy
365-
if [ -z "${diff_cov_file_url}" ]; then
366-
echo "No diff coverage file URL provided."
367+
echo "Downloading all coverage file..."
368+
if ! wget --no-proxy "${all_cov_file_url}" -O python_coverage_all.xml; then
369+
echo "Download failed, skipping upload."
367370
exit 0
368371
fi
369-
wget "${diff_cov_file_url}" -O ./diff_coverage.xml || echo "Download cov file failed, but continuing..."
372+
373+
sed -i 's|<source>/workspace/FastDeploy/fastdeploy</source>|<source>fastdeploy</source>|' python_coverage_all.xml
374+
370375
- name: Upload diff coverage report
371-
if: ${{ needs.run_tests_with_coverage.outputs.diff_cov_file_url != null && needs.run_tests_with_coverage.outputs.diff_cov_file_url != '' }}
372-
uses: codecov/codecov-action@v5
376+
if: always() && hashFiles('python_coverage_all.xml') != ''
377+
uses: codecov/codecov-action@v4
373378
with:
374-
files: ./FastDeploy/diff_coverage.xml
379+
files: ./python_coverage_all.xml
380+
flags: GPU
375381
name: python diff coverage
382+
fail_ci_if_error: false
376383
verbose: true
377384
disable_search: true
378-
commit_parent: false
379-
flags: diff

.github/workflows/ci_xpu.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ concurrency:
1616

1717
jobs:
1818
CI_XPU:
19+
timeout-minutes: 60
1920
runs-on: [self-hosted, XPU-P800-8Card]
2021
steps:
2122
- name: Print current runner name
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
max_model_len: 32768
22
max_num_seqs: 96
3-
gpu_memory_utilization: 0.85
3+
gpu_memory_utilization: 0.8
44
kv_cache_ratio: 0.71
55
tensor_parallel_size: 4
66
quantization: wint4
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
max_model_len: 32768
2+
max_num_seqs: 32
3+
data_parallel_size: 4
4+
tensor_parallel_size: 1
5+
enable_expert_parallel: True
6+
enable_prefix_caching: False
7+
splitwise_role: decode
8+
cache_transfer_protocol: "rdma"
9+
rdma_comm_ports: "7671,7672,7673,7674"
10+
pd_comm_port: "2335"
11+
engine_worker_queue_port: "4582,4583,4584,4585"
12+
graph_optimization_config:
13+
use_cudagraph: False

0 commit comments

Comments
 (0)