Skip to content

Commit 725b8fe

Browse files
authored
Merge branch 'develop' into enhance_some_logic
2 parents a830470 + de43577 commit 725b8fe

File tree

82 files changed

+6890
-3875
lines changed

Some content is hidden

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

82 files changed

+6890
-3875
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.dev20251112 -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.dev20251112 -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: 1 addition & 1 deletion
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.dev20251112 -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

.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.dev20251112 -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: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ jobs:
8282
FD_ENGINE_QUEUE_PORT=$((8058 + DEVICE_PORT * 100))
8383
FD_METRICS_PORT=$((8078 + DEVICE_PORT * 100))
8484
FD_CACHE_QUEUE_PORT=$((8098 + DEVICE_PORT * 100))
85+
FD_CONTROLLER_PORT=$((8018 + DEVICE_PORT * 100))
8586
FD_ZMQ_RECV_REQUEST_SERVER_PORT=$((8048 + DEVICE_PORT * 100))
8687
FD_ZMQ_SEND_RESPONSE_SERVER_PORT=$((8038 + DEVICE_PORT * 100))
8788
FD_ZMQ_CONTROL_CMD_SERVER_PORTS=$((8028 + DEVICE_PORT * 100))
@@ -92,6 +93,7 @@ jobs:
9293
echo "FD_ENGINE_QUEUE_PORT=${FD_ENGINE_QUEUE_PORT}"
9394
echo "FD_METRICS_PORT=${FD_METRICS_PORT}"
9495
echo "FD_CACHE_QUEUE_PORT=${FD_CACHE_QUEUE_PORT}"
96+
echo "FD_CONTROLLER_PORT=${FD_CONTROLLER_PORT}"
9597
echo "FD_ZMQ_RECV_REQUEST_SERVER_PORT=${FD_ZMQ_RECV_REQUEST_SERVER_PORT}"
9698
echo "FD_ZMQ_SEND_RESPONSE_SERVER_PORT=${FD_ZMQ_SEND_RESPONSE_SERVER_PORT}"
9799
echo "FD_ZMQ_CONTROL_CMD_SERVER_PORTS=${FD_ZMQ_CONTROL_CMD_SERVER_PORTS}"
@@ -143,6 +145,7 @@ jobs:
143145
-e "FD_ENGINE_QUEUE_PORT=${FD_ENGINE_QUEUE_PORT}" \
144146
-e "FD_METRICS_PORT=${FD_METRICS_PORT}" \
145147
-e "FD_CACHE_QUEUE_PORT=${FD_CACHE_QUEUE_PORT}" \
148+
-e "FD_CONTROLLER_PORT=${FD_CONTROLLER_PORT}" \
146149
-e "FLASK_PORT=${FLASK_PORT}" \
147150
-e "FD_ZMQ_RECV_REQUEST_SERVER_PORT=${FD_ZMQ_RECV_REQUEST_SERVER_PORT}" \
148151
-e "FD_ZMQ_SEND_RESPONSE_SERVER_PORT=${FD_ZMQ_SEND_RESPONSE_SERVER_PORT}" \
@@ -151,7 +154,7 @@ jobs:
151154
--gpus "\"device=${DEVICES}\"" ${docker_image} /bin/bash -c '
152155
git config --global --add safe.directory /workspace/FastDeploy
153156
cd FastDeploy
154-
python -m pip install paddlepaddle-gpu==3.3.0.dev20251112 -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/
155158
python -m pip install ${fd_wheel_url}
156159
bash scripts/run_pre_ce.sh
157160
'

.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.dev20251112 -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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ jobs:
173173
git config --global --add safe.directory /workspace/FastDeploy
174174
cd FastDeploy
175175
git diff origin/${BASE_REF}..HEAD --unified=0 > diff.txt
176-
python -m pip install paddlepaddle-gpu==3.3.0.dev20251112 -i https://www.paddlepaddle.org.cn/packages/nightly/cu126/
176+
python -m pip install --pre paddlepaddle-gpu -i https://www.paddlepaddle.org.cn/packages/nightly/cu126/
177177
pip config set global.extra-index-url https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple
178178
179179
python -m pip install -r scripts/unittest_requirement.txt

.github/workflows/ci_hpu.yml

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
name: CI_HPU
2+
3+
on:
4+
pull_request:
5+
branches:
6+
- develop
7+
- 'release/*'
8+
workflow_dispatch:
9+
10+
concurrency:
11+
group: ${{ github.event.pull_request.number }}-hpu-ci
12+
cancel-in-progress: true
13+
14+
jobs:
15+
CI_HPU:
16+
runs-on: [self-hosted, HPU-8Card]
17+
steps:
18+
- name: Print current runner name
19+
run: |
20+
echo "Current runner name: ${{ runner.name }}"
21+
22+
- name: Code Checkout
23+
env:
24+
docker_image: ccr-2vdh3abv-pub.cnc.bj.baidubce.com/paddlepaddle/fastdeploy-hpu:latest
25+
run: |
26+
REPO="https://github.com/${{ github.repository }}.git"
27+
FULL_REPO="${{ github.repository }}"
28+
REPO_NAME="${FULL_REPO##*/}"
29+
BASE_BRANCH="${{ github.base_ref }}"
30+
# Clean the repository directory before starting
31+
docker run --rm --net=host -v $(pwd):/workspace -w /workspace \
32+
-e "REPO_NAME=${REPO_NAME}" \
33+
-e "BASE_BRANCH=${BASE_BRANCH}" \
34+
${docker_image} /bin/bash -c '
35+
if [ -d ${REPO_NAME} ]; then
36+
echo "Directory ${REPO_NAME} exists, removing it..."
37+
rm -rf ${REPO_NAME}
38+
fi
39+
'
40+
git config --global user.name "FastDeployCI"
41+
git config --global user.email "[email protected]"
42+
git clone ${REPO} ${REPO_NAME} -b ${BASE_BRANCH}
43+
cd FastDeploy
44+
if [ "${{ github.event_name }}" = "pull_request" ]; then
45+
git fetch origin pull/${{ github.event.pull_request.number }}/head:pr/${{ github.event.pull_request.number }}
46+
git merge pr/${{ github.event.pull_request.number }}
47+
git log -n 3 --oneline
48+
else
49+
git checkout ${{ github.sha }}
50+
git log -n 3 --oneline
51+
fi
52+
53+
- name: Run CI unittest
54+
env:
55+
docker_image: ccr-2vdh3abv-pub.cnc.bj.baidubce.com/paddlepaddle/fastdeploy-hpu:latest
56+
run: |
57+
runner_name="${{ runner.name }}"
58+
last_char="${runner_name: -1}"
59+
60+
if [[ "$last_char" =~ [0-3] ]]; then
61+
hpu_id="$last_char"
62+
else
63+
hpu_id="0"
64+
fi
65+
FD_API_PORT=8388
66+
FD_ENGINE_QUEUE_PORT=8902
67+
FD_METRICS_PORT=8202
68+
69+
PARENT_DIR=$(dirname "$WORKSPACE")
70+
echo "PARENT_DIR:$PARENT_DIR"
71+
docker run --rm --net=host --cap-add=SYS_PTRACE --privileged --shm-size=64G \
72+
-v $(pwd):/workspace -w /workspace \
73+
-v "/ssd1:/ssd1" \
74+
-e "MODEL_PATH=/ssd1" \
75+
-e "http_proxy=$(git config --global --get http.proxy)" \
76+
-e "https_proxy=$(git config --global --get https.proxy)" \
77+
-e "no_proxy=bcebos.com,mirrors.tuna.tsinghua.edu.cn,localhost,127.0.0.1,0.0.0.0,10.0.0.0/8,192.168.1.0/24" \
78+
-e "FD_API_PORT=${FD_API_PORT}" \
79+
-e "FD_ENGINE_QUEUE_PORT=${FD_ENGINE_QUEUE_PORT}" \
80+
-e "FD_METRICS_PORT=${FD_METRICS_PORT}" \
81+
${docker_image} /bin/bash -c "
82+
git config --global --add safe.directory /workspace/FastDeploy
83+
cd FastDeploy
84+
bash scripts/run_ci_hpu.sh
85+
"

.github/workflows/rerun.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,16 @@ jobs:
5656
REPO: ${{ github.event.repository.name }}
5757
JOB_NAME: 'CI_XPU'
5858

59+
- name: Rerun Check PR Template
60+
if: ${{ contains(github.event.comment.body, 'check_pr_template') }}
61+
uses: ./.github/actions/rerun-workflow
62+
with:
63+
PR_ID: ${{ github.event.issue.number }}
64+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
65+
OWNER: ${{ github.repository_owner }}
66+
REPO: ${{ github.event.repository.name }}
67+
JOB_NAME: 'Check PR Template'
68+
5969
- name: Rerun Codestyle-check
6070
if: ${{ contains(github.event.comment.body, 'codestyle') || contains(github.event.comment.body, 'pre_commit') }}
6171
uses: ./.github/actions/rerun-workflow
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
max_model_len: 131072
2+
tensor_parallel_size: 1
3+
quantization: wint8
4+
max_num_seqs: 32
5+
reasoning_parser: ernie-45-vl-thinking
6+
tool_call_parser: ernie-45-vl-thinking
7+
load_choices: "default_v1"
8+
mm-processor-kwargs: '{"image_max_pixels": 12845056 }'

0 commit comments

Comments
 (0)