Skip to content

Commit 9df99be

Browse files
committed
[Iluvatar] Fix FD launch error when specifing CUDA_VISBLE_DEVICE
1 parent 23d488c commit 9df99be

6 files changed

Lines changed: 19 additions & 15 deletions

File tree

.github/workflows/ci_iluvatar.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222

2323
- name: Code Checkout
2424
env:
25-
docker_image: ccr-2vdh3abv-pub.cnc.bj.baidubce.com/device/paddle-ixuca:paddle-ocr-vl-1107
25+
docker_image: ccr-2vdh3abv-pub.cnc.bj.baidubce.com/device/paddle-ixuca:fd-ci
2626
run: |
2727
REPO="https://github.com/${{ github.repository }}.git"
2828
FULL_REPO="${{ github.repository }}"
@@ -55,7 +55,7 @@ jobs:
5555
5656
- name: Run CI unittest
5757
env:
58-
docker_image: ccr-2vdh3abv-pub.cnc.bj.baidubce.com/device/paddle-ixuca:paddle-ocr-vl-1107
58+
docker_image: ccr-2vdh3abv-pub.cnc.bj.baidubce.com/device/paddle-ixuca:fd-ci
5959
run: |
6060
runner_name="${{ runner.name }}"
6161
last_char="${runner_name: -1}"

docs/get_started/installation/iluvatar_gpu.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@
1010
Pull the Docker image
1111

1212
```bash
13-
docker pull ccr-2vdh3abv-pub.cnc.bj.baidubce.com/device/paddle-ixuca:paddle-ocr-vl-1107
13+
docker pull ccr-2vdh3abv-pub.cnc.bj.baidubce.com/device/paddle-ixuca:3.3.0
1414
```
1515

1616
## 3. Container Preparation
1717
### 3.1 Start Container
1818

1919
```bash
20-
docker run -itd --name paddle_infer --network host -v /usr/src:/usr/src -v /lib/modules:/lib/modules -v /dev:/dev -v /home/paddle:/home/paddle --privileged --cap-add=ALL --pid=host ccr-2vdh3abv-pub.cnc.bj.baidubce.com/device/paddle-ixuca:paddle-ocr-vl-1107
20+
docker run -itd --name paddle_infer --network host -v /usr/src:/usr/src -v /lib/modules:/lib/modules -v /dev:/dev -v /home/paddle:/home/paddle --privileged --cap-add=ALL --pid=host ccr-2vdh3abv-pub.cnc.bj.baidubce.com/device/paddle-ixuca:3.3.0
2121
docker exec -it paddle_infer bash
2222
```
2323

@@ -26,8 +26,8 @@ docker exec -it paddle_infer bash
2626
### 3.2 Install paddle
2727

2828
```bash
29-
pip3 install paddlepaddle==3.3.0.dev20251103 -i https://www.paddlepaddle.org.cn/packages/nightly/cpu/
30-
pip3 install paddle-iluvatar-gpu==3.0.0.dev20251107 -i https://www.paddlepaddle.org.cn/packages/nightly/ixuca/
29+
pip3 install paddlepaddle==3.3.0.dev20251219 -i https://www.paddlepaddle.org.cn/packages/nightly/cpu/
30+
pip3 install paddle-iluvatar-gpu==3.0.0.dev20251223 -i https://www.paddlepaddle.org.cn/packages/nightly/ixuca/
3131
```
3232

3333
### 3.3 Install or build FastDeploy
@@ -480,7 +480,7 @@ python3 -m fastdeploy.entrypoints.openai.api_server \
480480
--cache-queue-port 55660 \
481481
--max-model-len 16384 \
482482
--max-num-batched-tokens 16384 \
483-
--max-num-seqs 32 \
483+
--max-num-seqs 64 \
484484
--workers 2 \
485485
--block-size 16
486486
```

docs/zh/get_started/installation/iluvatar_gpu.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@
1010
Pull the Docker image
1111

1212
```bash
13-
docker pull ccr-2vdh3abv-pub.cnc.bj.baidubce.com/device/paddle-ixuca:paddle-ocr-vl-1107
13+
docker pull ccr-2vdh3abv-pub.cnc.bj.baidubce.com/device/paddle-ixuca:3.3.0
1414
```
1515

1616
## 3. 准备容器
1717
### 3.1 启动容器
1818

1919
```bash
20-
docker run -itd --name paddle_infer --network host -v /usr/src:/usr/src -v /lib/modules:/lib/modules -v /dev:/dev -v /home/paddle:/home/paddle --privileged --cap-add=ALL --pid=host ccr-2vdh3abv-pub.cnc.bj.baidubce.com/device/paddle-ixuca:paddle-ocr-vl-1107
20+
docker run -itd --name paddle_infer --network host -v /usr/src:/usr/src -v /lib/modules:/lib/modules -v /dev:/dev -v /home/paddle:/home/paddle --privileged --cap-add=ALL --pid=host ccr-2vdh3abv-pub.cnc.bj.baidubce.com/device/paddle-ixuca:3.3.0
2121
docker exec -it paddle_infer bash
2222
```
2323

@@ -26,8 +26,8 @@ docker exec -it paddle_infer bash
2626
### 3.2 安装paddle
2727

2828
```bash
29-
pip3 install paddlepaddle==3.3.0.dev20251103 -i https://www.paddlepaddle.org.cn/packages/nightly/cpu/
30-
pip3 install paddle-iluvatar-gpu==3.0.0.dev20251107 -i https://www.paddlepaddle.org.cn/packages/nightly/ixuca/
29+
pip3 install paddlepaddle==3.3.0.dev20251219 -i https://www.paddlepaddle.org.cn/packages/nightly/cpu/
30+
pip3 install paddle-iluvatar-gpu==3.0.0.dev20251223 -i https://www.paddlepaddle.org.cn/packages/nightly/ixuca/
3131
```
3232

3333
### 3.3 安装fastdeploy
@@ -480,7 +480,7 @@ python3 -m fastdeploy.entrypoints.openai.api_server \
480480
--cache-queue-port 55660 \
481481
--max-model-len 16384 \
482482
--max-num-batched-tokens 16384 \
483-
--max-num-seqs 32 \
483+
--max-num-seqs 64 \
484484
--workers 2 \
485485
--block-size 16
486486
```

fastdeploy/engine/engine.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -577,6 +577,10 @@ def _start_worker_service(self):
577577
if self.cfg.structured_outputs_config.logits_processors is not None:
578578
arguments += f" --logits-processors {' '.join(self.cfg.structured_outputs_config.logits_processors)}"
579579

580+
# TODO (iluvatar): remove aftet paddle fix launch error
581+
if current_platform.is_iluvatar() and "CUDA_VISIBLE_DEVICES" in os.environ:
582+
arguments = arguments.replace(f"--devices {self.cfg.parallel_config.device_ids}", "")
583+
580584
worker_store_true_flag = {
581585
"enable_expert_parallel": self.cfg.parallel_config.enable_expert_parallel,
582586
"enable_chunked_moe": self.cfg.parallel_config.enable_chunked_moe,

fastdeploy/model_executor/ops/iluvatar/moe_ops.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
from typing import Optional
1818

1919
import paddle
20-
from paddle.incubate.nn.functional import swiglu
20+
from paddle.nn.functional import swiglu
2121
from paddle.nn.quant import weight_only_linear
2222

2323
try:

scripts/run_ci_iluvatar.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ ln -sf /usr/local/bin/python3 /usr/local/bin/python
1414
echo "pip requirements"
1515
python -m pip install -r requirements_iluvatar.txt
1616
echo "install paddle cpu and custom device"
17-
python -m pip install paddlepaddle==3.3.0.dev20251103 -i https://www.paddlepaddle.org.cn/packages/nightly/cpu/
18-
python -m pip install paddle-iluvatar-gpu==3.0.0.dev20251107 -i https://www.paddlepaddle.org.cn/packages/nightly/ixuca/
17+
python -m pip install paddlepaddle==3.3.0.dev20251219 -i https://www.paddlepaddle.org.cn/packages/nightly/cpu/
18+
python -m pip install paddle-iluvatar-gpu==3.0.0.dev20251223 -i https://www.paddlepaddle.org.cn/packages/nightly/ixuca/
1919
echo "build whl"
2020
bash build.sh || exit 1
2121

0 commit comments

Comments
 (0)