Skip to content

Improve configs - TokenizerPoolConfig + DeviceConfig#16603

Merged
DarkLight1337 merged 15 commits intovllm-project:mainfrom
hmellor:improve-tokenizer-and-device-config
Apr 17, 2025
Merged

Improve configs - TokenizerPoolConfig + DeviceConfig#16603
DarkLight1337 merged 15 commits intovllm-project:mainfrom
hmellor:improve-tokenizer-and-device-config

Conversation

@hmellor
Copy link
Member

@hmellor hmellor commented Apr 14, 2025

Follows #16332, #16422, #16533

Notable changes:

  • Correctly handle default_factory=dict
  • Better type hint for get_kwargs in args_utils.py

hmellor added 4 commits April 14, 2025 11:30
@hmellor
Improve TokenizerPoolConfig
caf1446 
Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>
@hmellor
Improve DeviceConfig
51ec40e 
Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>
@hmellor
Better type hint for get_kwargs
b5781e6 
Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>
@hmellor
Fix default_factory defaults and use for extra_config
d7c2d11 
Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>
@github-actions
Copy link

github-actions bot commented Apr 14, 2025

👋 Hi! Thank you for contributing to the vLLM project.

💬 Join our developer Slack at https://slack.vllm.ai to discuss your PR in #pr-reviews, coordinate on features in #feat- channels, or join special interest groups in #sig- channels.

Just a reminder: PRs would not trigger full CI run by default. Instead, it would only run fastcheck CI which starts running only a small and essential subset of CI tests to quickly catch errors. You can run other CI tests on top of those by going to your fastcheck build on Buildkite UI (linked in the PR checks section) and unblock them. If you do not have permission to unblock, ping simon-mo or khluu to add you in our Buildkite org.

Once the PR is approved and ready to go, your PR reviewer(s) can run CI to test the changes comprehensively before merging.

To run CI, PR reviewers can either: Add ready label to the PR or enable auto-merge.

🚀

hmellor added 8 commits April 14, 2025 20:03
@hmellor
Add dict parsing
cdce5e4 
Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>
@hmellor
model_loader_extra_config can no longer be None
1eb5233 
Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>
@hmellor
Fix errors
cd81a46 
Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>
@hmellor
Fix error
0e778b8 
Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>
@hmellor
Fix get_default to get the field instead for proper `default_factor…
88932e5 
…y` handling

Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>
@hmellor
Create new field to handle when field names are different
7628722 
Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>
@hmellor
Make mypy happy
5a9a7ec 
Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>
@hmellor
Improve docstring
dada73d 
Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>
DarkLight1337
DarkLight1337 reviewed Apr 16, 2025
View reviewed changes
DarkLight1337
DarkLight1337 reviewed Apr 16, 2025
View reviewed changes
vllm/config.py
return self.num_scheduler_steps > 1


Device = Literal["auto", "cuda", "neuron", "cpu", "tpu", "xpu", "hpu"]
Copy link
Member

@DarkLight1337 DarkLight1337 Apr 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can't really hard code this because OOT platforms may use different names

Copy link
Member Author

@hmellor hmellor Apr 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is already hard coded by EngineArgs using choices=DEVICE_OPTIONS

Copy link
Member

@DarkLight1337 DarkLight1337 Apr 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cc @youkaichao is that intended?

Copy link
Member Author

@hmellor hmellor Apr 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To summarise:

  • The argparser behaviour is unchanged
  • In the config we have Literal type hinting (no validation of the input occurrs)

Copy link
Member

@youkaichao youkaichao Apr 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is already hard coded by EngineArgs using choices=DEVICE_OPTIONS

usually people just use device="auto" and let the current_platform resolve the device, so i think it should be fine.

i don't see lots of usage with explicitly adding --device=xxx

DarkLight1337
DarkLight1337 reviewed Apr 16, 2025
View reviewed changes
DarkLight1337
DarkLight1337 reviewed Apr 16, 2025
View reviewed changes
hmellor added 3 commits April 16, 2025 10:36
@hmellor
Add whitespace
3b08655 
Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>
@hmellor
Better typing for optional_arg
f2786af 
Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>
@hmellor
get_default_factory_field -> get_field and add test
91279d5 
Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>
DarkLight1337
DarkLight1337 approved these changes Apr 17, 2025
View reviewed changes
Copy link
Member

@DarkLight1337 DarkLight1337 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well, he seems busy so I'll just approve this for now

@DarkLight1337 DarkLight1337 enabled auto-merge (squash) April 17, 2025 09:39
@github-actions github-actions bot added the ready ONLY add when PR is ready to merge/full CI is needed label Apr 17, 2025
@DarkLight1337 DarkLight1337 merged commit d27ea94 into vllm-project:main Apr 17, 2025
62 checks passed
lionelvillard pushed a commit to lionelvillard/vllm that referenced this pull request Apr 17, 2025
@hmellor @lionelvillard
Improve configs - TokenizerPoolConfig + DeviceConfig (vllm-projec…
8363057 
…t#16603)

Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>
@hmellor hmellor mentioned this pull request Apr 17, 2025
Merged
@hmellor hmellor deleted the improve-tokenizer-and-device-config branch April 17, 2025 14:33
@hmellor hmellor mentioned this pull request Apr 18, 2025
Merged
yangw-dev pushed a commit to yangw-dev/vllm that referenced this pull request Apr 21, 2025
@hmellor @yangw-dev
Improve configs - TokenizerPoolConfig + DeviceConfig (vllm-projec…
57a83b0 
…t#16603)

Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>
Signed-off-by: Yang Wang <elainewy@meta.com>
@hmellor hmellor mentioned this pull request Apr 22, 2025
Merged
This was referenced Apr 22, 2025
Merged
Merged
jikunshang pushed a commit to jikunshang/vllm that referenced this pull request Apr 29, 2025
@hmellor
Improve configs - TokenizerPoolConfig + DeviceConfig (vllm-projec…
3f61bd0 
…t#16603)

Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>
lk-chen pushed a commit to lk-chen/vllm that referenced this pull request Apr 29, 2025
@hmellor @lk-chen
Improve configs - TokenizerPoolConfig + DeviceConfig (vllm-projec…
4b258f4 
…t#16603)

Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>
adobrzyn pushed a commit to HabanaAI/vllm-fork that referenced this pull request Apr 30, 2025
@hmellor @adobrzyn
Improve configs - TokenizerPoolConfig + DeviceConfig (vllm-projec…
780ed9e 
…t#16603)

Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>
Signed-off-by: Agata Dobrzyniewicz <adobrzyniewicz@habana.ai>
@hmellor hmellor mentioned this pull request Apr 30, 2025
Merged
RichardoMrMu pushed a commit to RichardoMrMu/vllm that referenced this pull request May 12, 2025
@hmellor
Improve configs - TokenizerPoolConfig + DeviceConfig (vllm-projec…
7224342 
…t#16603)

Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>
Signed-off-by: Mu Huai <tianbowen.tbw@antgroup.com>
@ckhordiasma ckhordiasma mentioned this pull request May 14, 2025
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@youkaichao youkaichao youkaichao left review comments

@DarkLight1337 DarkLight1337 DarkLight1337 approved these changes

Assignees

No one assigned

Labels

ready ONLY add when PR is ready to merge/full CI is needed

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@hmellor @youkaichao @DarkLight1337