Skip to content

Commit 22cd249

Browse files
committed
[fix]: use env varibles to enable dbo model
Signed-off-by: zhuohuan <zxdu1997@gmail.com>
1 parent f9230b3 commit 22cd249

File tree

3 files changed

+24
-28
lines changed

3 files changed

+24
-28
lines changed

examples/offline_dualbatch_overlap_npu.py

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -15,24 +15,20 @@
1515

1616
def main():
1717
# Create an LLM.
18-
llm = LLM(
19-
model="deepseek-ai/DeepSeek-V3-Lite-base-latest-w8a8-dynamic",
20-
hf_overrides={
21-
"architectures": ["DeepseekDBOForCausalLM"],
22-
}, # override the model arch to run the dbo model
23-
enforce_eager=True,
24-
tensor_parallel_size=2,
25-
max_model_len=4096,
26-
trust_remote_code=True,
27-
additional_config={
28-
"torchair_graph_config": {
29-
"enabled": False
30-
},
31-
"ascend_scheduler_config": {
32-
"enabled": True
33-
},
34-
"expert_tensor_parallel_size": 1
35-
})
18+
llm = LLM(model="deepseek-ai/DeepSeek-V3-Lite-base-latest-w8a8-dynamic",
19+
enforce_eager=True,
20+
tensor_parallel_size=2,
21+
max_model_len=4096,
22+
trust_remote_code=True,
23+
additional_config={
24+
"torchair_graph_config": {
25+
"enabled": False
26+
},
27+
"ascend_scheduler_config": {
28+
"enabled": True
29+
},
30+
"expert_tensor_parallel_size": 1
31+
})
3632

3733
# Generate texts from the prompts. The output is a list of RequestOutput
3834
# objects that contain the prompt, generated text, and other information.

tests/multicard/test_offline_inference_distributed.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,5 @@ def test_models_distributed_DeepSeek_dbo():
9393
dtype=dtype,
9494
tensor_parallel_size=4,
9595
distributed_executor_backend="mp",
96-
hf_overrides={
97-
"architectures": ["DeepseekDBOForCausalLM"],
98-
} # override the model arch to the dbo version
9996
) as vllm_model:
10097
vllm_model.generate(example_prompts, sampling_params)

vllm_ascend/models/__init__.py

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
from vllm import ModelRegistry
22

3+
import vllm_ascend.envs as envs
4+
35

46
def register_model():
57
from .deepseek_dbo import CustomDeepseekDBOForCausalLM # noqa: F401
@@ -23,9 +25,14 @@ def register_model():
2325
"vllm_ascend.models.qwen2_5_vl:AscendQwen2_5_VLForConditionalGeneration"
2426
)
2527

26-
ModelRegistry.register_model(
27-
"DeepseekV2ForCausalLM",
28-
"vllm_ascend.models.deepseek_v2:CustomDeepseekV2ForCausalLM")
28+
if envs.VLLM_ASCEND_ENABLE_DBO:
29+
ModelRegistry.register_model(
30+
"DeepseekV2ForCausalLM",
31+
"vllm_ascend.models.deepseek_dbo:CustomDeepseekDBOForCausalLM")
32+
else:
33+
ModelRegistry.register_model(
34+
"DeepseekV2ForCausalLM",
35+
"vllm_ascend.models.deepseek_v2:CustomDeepseekV2ForCausalLM")
2936

3037
ModelRegistry.register_model(
3138
"DeepseekV3ForCausalLM",
@@ -34,7 +41,3 @@ def register_model():
3441
ModelRegistry.register_model(
3542
"Qwen3MoeForCausalLM",
3643
"vllm_ascend.models.qwen3_moe:CustomQwen3MoeForCausalLM")
37-
38-
ModelRegistry.register_model(
39-
"DeepseekDBOForCausalLM",
40-
"vllm_ascend.models.deepseek_dbo:CustomDeepseekDBOForCausalLM")

0 commit comments

Comments
 (0)