Move `ModelConfig` from `config/init.py` to `config/model.py` #25252

hmellor · 2025-09-19T12:26:05Z

Notable changes:

RunnerType belongs to the scheduler now (that's where the field actually lives)
ModelImpl and LogprobsMode both converted to Literal for easier handling (i.e. ModelImpl.VLLM or ModelImplVLLM.value? Is not a question we need to cate about anymore)
A few fuctions that are not directly related to any config have been moved to utils.py

Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>

gemini-code-assist

Code Review

This pull request refactors the configuration-related code by moving ModelConfig and its helper functions from vllm/config/__init__.py to a new vllm/config/model.py file. It also moves RunnerType to vllm/config/scheduler.py and some utility functions to vllm/config/utils.py. Additionally, ModelImpl and LogprobsMode are converted from Enum to Literal types for easier handling. The changes are consistently applied across the codebase, and the refactoring improves code organization and separation of concerns. I have reviewed the changes and found no issues.

Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>

vllm/config/utils.py

DarkLight1337 · 2025-09-19T12:46:28Z

vllm/config/model.py

+from vllm.config.multimodal import (MMCacheType, MMEncoderTPMode,
+                                    MultiModalConfig)
+from vllm.config.pooler import PoolerConfig
+from vllm.config.utils import assert_hashable, config


Would using relative imports here lead to circular import issues?

They're not circular because multimodal/pooler/utils doesn't import anything from model

DarkLight1337 · 2025-09-19T12:47:30Z

vllm/config/model.py

+    from vllm.model_executor.layers.quantization import QuantizationMethods
+    from vllm.v1.sample.logits_processor import LogitsProcessor
+
+    HfOverrides = Union[dict, Callable[[type], type]]


Why does this need to be in the TYPE_CHECKING guard?

Not sure, I just copied what was done in __init__.py, I can try taking it out to see what happens?

Yeah let's try that

Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>

DarkLight1337 · 2025-09-19T13:11:42Z

PTAL at the doc build failure

Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>

…lm-project#25252) Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>

### What this PR does / why we need it? Bump main to vllm-project/vllm@c60e613 - Updated imports in `vllm.config` to `vllm.config.model`(vllm-project/vllm@aed1687) vllm-project/vllm#25252 - Refactored `vllm_ascend/sample/sampler.py` to use string values for `logprobs_mode` instead of the `LogprobsMode` enum, simplifying logprobs mode handling and improving compatibility with recent vLLM changes (vllm-project/vllm@aed1687) vllm-project/vllm#25252 ### Does this PR introduce _any_ user-facing change? No ### How was this patch tested? CI passed - vLLM version: v0.10.2 - vLLM main: vllm-project/vllm@6d8246a --------- Signed-off-by: Yikun Jiang <yikunkero@gmail.com>

…m-project#3067) ### What this PR does / why we need it? Bump main to vllm-project/vllm@c60e613 - Updated imports in `vllm.config` to `vllm.config.model`(vllm-project/vllm@aed1687) vllm-project/vllm#25252 - Refactored `vllm_ascend/sample/sampler.py` to use string values for `logprobs_mode` instead of the `LogprobsMode` enum, simplifying logprobs mode handling and improving compatibility with recent vLLM changes (vllm-project/vllm@aed1687) vllm-project/vllm#25252 ### Does this PR introduce _any_ user-facing change? No ### How was this patch tested? CI passed - vLLM version: v0.10.2 - vLLM main: vllm-project/vllm@6d8246a --------- Signed-off-by: Yikun Jiang <yikunkero@gmail.com>

…m-project#3067) ### What this PR does / why we need it? Bump main to vllm-project/vllm@c60e613 - Updated imports in `vllm.config` to `vllm.config.model`(vllm-project/vllm@aed1687) vllm-project/vllm#25252 - Refactored `vllm_ascend/sample/sampler.py` to use string values for `logprobs_mode` instead of the `LogprobsMode` enum, simplifying logprobs mode handling and improving compatibility with recent vLLM changes (vllm-project/vllm@aed1687) vllm-project/vllm#25252 ### Does this PR introduce _any_ user-facing change? No ### How was this patch tested? CI passed - vLLM version: v0.10.2 - vLLM main: vllm-project/vllm@6d8246a --------- Signed-off-by: Yikun Jiang <yikunkero@gmail.com> Signed-off-by: Che Ruan <cr623@ic.ac.uk>

…lm-project#25252) Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>

…lm-project#25252) Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com> Signed-off-by: charlifu <charlifu@amd.com>

…lm-project#25252) Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com> Signed-off-by: xuebwang-amd <xuebwang@amd.com>

…lm-project#25252) Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>

…m-project#3067) ### What this PR does / why we need it? Bump main to vllm-project/vllm@c60e613 - Updated imports in `vllm.config` to `vllm.config.model`(vllm-project/vllm@aed1687) vllm-project/vllm#25252 - Refactored `vllm_ascend/sample/sampler.py` to use string values for `logprobs_mode` instead of the `LogprobsMode` enum, simplifying logprobs mode handling and improving compatibility with recent vLLM changes (vllm-project/vllm@aed1687) vllm-project/vllm#25252 ### Does this PR introduce _any_ user-facing change? No ### How was this patch tested? CI passed - vLLM version: v0.10.2 - vLLM main: vllm-project/vllm@6d8246a --------- Signed-off-by: Yikun Jiang <yikunkero@gmail.com>

…lm-project#25252) Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com> Signed-off-by: xuebwang-amd <xuebwang@amd.com>

Move ModelConfig from config/__init__.py to config/model.py

974c2d8

Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>

hmellor requested review from 22quinn, DarkLight1337, ProExpertProg, WoosukKwon, alexm-redhat, comaniac, houseroad, mgoin, njhill, robertgshaw2-redhat, simon-mo, tlrmchlsmth, yewentao256, youkaichao and ywang96 as code owners September 19, 2025 12:26

mergify bot added new-model Requests to new models v1 labels Sep 19, 2025

gemini-code-assist bot reviewed Sep 19, 2025

View reviewed changes

hmellor mentioned this pull request Sep 19, 2025

Move ModelConfig from config/__init__.py to config/model.py #24978

Closed

5 tasks

Add missing imports

48c0ca9

Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>

DarkLight1337 reviewed Sep 19, 2025

View reviewed changes

hmellor added 5 commits September 19, 2025 14:54

Fix missing import from docs build

51f0835

Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>

Type hint utils

b4e69b6

Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>

Add missing objects that are imported from vllm.config

00dc0c9

Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>

Use canonical imports in tests that import private members

13fa4b3

Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>

Don't have conditional HfOverrides

472245c

Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>

DarkLight1337 approved these changes Sep 19, 2025

View reviewed changes

Fix missing import for docs

1ee4ac2

Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>

hmellor enabled auto-merge (squash) September 19, 2025 13:57

github-actions bot added the ready ONLY add when PR is ready to merge/full CI is needed label Sep 19, 2025

hmellor added the ci-no-fail-fast Disable fail-fast behavior of CI tests (continue with remaining tests after failures). label Sep 19, 2025

hmellor mentioned this pull request Sep 19, 2025

Add Enum support to argument parsing utilities #23583

Closed

hmellor merged commit aed1687 into vllm-project:main Sep 19, 2025
55 of 57 checks passed

hmellor deleted the extract-model-config branch September 19, 2025 16:22

debroy-rh pushed a commit to debroy-rh/vllm that referenced this pull request Sep 19, 2025

Move ModelConfig from config/__init__.py to config/model.py (vl…

059b007

…lm-project#25252) Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>

Yikun mentioned this pull request Sep 20, 2025

[CI] Upgrade vLLM to 20250920 (c60e613) and address config break vllm-project/vllm-ascend#3067

Merged

FeiDaLI pushed a commit to FeiDaLI/vllm that referenced this pull request Sep 25, 2025

Move ModelConfig from config/__init__.py to config/model.py (vl…

dfbea0e

…lm-project#25252) Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>

choprahetarth pushed a commit to Tandemn-Labs/vllm that referenced this pull request Oct 11, 2025

Move ModelConfig from config/__init__.py to config/model.py (vl…

b100101

…lm-project#25252) Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>

lywa1998 pushed a commit to lywa1998/vllm that referenced this pull request Oct 20, 2025

Move ModelConfig from config/__init__.py to config/model.py (vl…

3ec623d

…lm-project#25252) Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Move `ModelConfig` from `config/init.py` to `config/model.py` #25252

Move `ModelConfig` from `config/init.py` to `config/model.py` #25252

Uh oh!

hmellor commented Sep 19, 2025

Uh oh!

gemini-code-assist bot left a comment

Uh oh!

Uh oh!

DarkLight1337 Sep 19, 2025

Uh oh!

hmellor Sep 19, 2025

Uh oh!

DarkLight1337 Sep 19, 2025

Uh oh!

hmellor Sep 19, 2025

Uh oh!

DarkLight1337 Sep 19, 2025

Uh oh!

DarkLight1337 commented Sep 19, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Uh oh!

Move ModelConfig from config/__init__.py to config/model.py #25252

Move ModelConfig from config/__init__.py to config/model.py #25252

Uh oh!

Conversation

hmellor commented Sep 19, 2025

Uh oh!

gemini-code-assist bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

Uh oh!

DarkLight1337 Sep 19, 2025

Choose a reason for hiding this comment

Uh oh!

hmellor Sep 19, 2025

Choose a reason for hiding this comment

Uh oh!

DarkLight1337 Sep 19, 2025

Choose a reason for hiding this comment

Uh oh!

hmellor Sep 19, 2025

Choose a reason for hiding this comment

Uh oh!

DarkLight1337 Sep 19, 2025

Choose a reason for hiding this comment

Uh oh!

DarkLight1337 commented Sep 19, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Move `ModelConfig` from `config/init.py` to `config/model.py` #25252

Move `ModelConfig` from `config/init.py` to `config/model.py` #25252