|
19 | 19 | import vllm.envs as envs
|
20 | 20 | from vllm.config import (BlockSize, CacheConfig, CacheDType, CompilationConfig,
|
21 | 21 | ConfigFormat, ConfigType, DecodingConfig,
|
22 |
| - DetailedTraceModules, Device, DeviceConfig, |
| 22 | + DetailedTraceModules, DeviceConfig, |
23 | 23 | DistributedExecutorBackend, GuidedDecodingBackend,
|
24 | 24 | GuidedDecodingBackendV1, HfOverrides, KVEventsConfig,
|
25 | 25 | KVTransferConfig, LoadConfig, LoadFormat, LoRAConfig,
|
@@ -354,7 +354,6 @@ class EngineArgs:
|
354 | 354 | max_prompt_adapter_token: int = \
|
355 | 355 | PromptAdapterConfig.max_prompt_adapter_token
|
356 | 356 |
|
357 |
| - device: Device = DeviceConfig.device |
358 | 357 | num_scheduler_steps: int = SchedulerConfig.num_scheduler_steps
|
359 | 358 | multi_step_stream_outputs: bool = SchedulerConfig.multi_step_stream_outputs
|
360 | 359 | ray_workers_use_nsight: bool = ParallelConfig.ray_workers_use_nsight
|
@@ -731,14 +730,6 @@ def add_cli_args(parser: FlexibleArgumentParser) -> FlexibleArgumentParser:
|
731 | 730 | "--max-prompt-adapter-token",
|
732 | 731 | **prompt_adapter_kwargs["max_prompt_adapter_token"])
|
733 | 732 |
|
734 |
| - # Device arguments |
735 |
| - device_kwargs = get_kwargs(DeviceConfig) |
736 |
| - device_group = parser.add_argument_group( |
737 |
| - title="DeviceConfig", |
738 |
| - description=DeviceConfig.__doc__, |
739 |
| - ) |
740 |
| - device_group.add_argument("--device", **device_kwargs["device"]) |
741 |
| - |
742 | 733 | # Speculative arguments
|
743 | 734 | speculative_group = parser.add_argument_group(
|
744 | 735 | title="SpeculativeConfig",
|
@@ -977,7 +968,7 @@ def create_engine_config(
|
977 | 968 | from vllm.platforms import current_platform
|
978 | 969 | current_platform.pre_register_and_update()
|
979 | 970 |
|
980 |
| - device_config = DeviceConfig(device=self.device) |
| 971 | + device_config = DeviceConfig(device=current_platform.device_type) |
981 | 972 | model_config = self.create_model_config()
|
982 | 973 |
|
983 | 974 | # * If VLLM_USE_V1 is unset, we enable V1 for "supported features"
|
|
0 commit comments