[Misc] Clean up more utils by DarkLight1337 · Pull Request #27567 · vllm-project/vllm

DarkLight1337 · 2025-10-27T11:00:10Z

Purpose

Part of #26900

vllm.utils.init_cached_hf_modules -> vllm.utils.import_utils.init_cached_hf_modules
vllm.utils.import_pynvml -> vllm.utils.import_utils.import_pynvml
vllm.utils.get_mp_context -> vllm.utils.system_utils.get_mp_context
vllm.utils.kill_process_tree -> vllm.utils.system_utils.kill_process_tree
vllm.utils.set_ulimit -> vllm.utils.system_utils.set_ulimit
vllm.utils.run_method -> vllm.v1.serial_utils.run_method
vllm.utils.check_use_alibi -> ModelConfig.uses_alibi
vllm.utils.enable_trace_function_call_for_thread -> VllmConfig.enable_trace_function_call_for_thread
vllm.utils.argparse_utils.StoreBoolean is no longer used so I removed it

Test Plan

Test Result

Essential Elements of an Effective PR Description Checklist

The purpose of the PR, such as "Fix some issue (link existing issues this PR will resolve)".
The test plan, such as providing test command.
The test results, such as pasting the results comparison before and after, or e2e results
(Optional) The necessary documentation update, such as updating supported_models.md and examples for a new model.
(Optional) Release notes update. If your change is user facing, please update the release notes draft in the Google Doc.

Signed-off-by: DarkLight1337 <tlleungac@connect.ust.hk>

gemini-code-assist

Code Review

This pull request focuses on cleaning up and reorganizing utility functions within the vLLM project. It involves moving functions from vllm.utils to more specific submodules like vllm.utils.import_utils and vllm.utils.system_utils, removing unused code, and making minor adjustments to improve code clarity and maintainability. I have identified a critical issue where a function is being moved without updating its call site within the same file. This needs to be addressed to ensure the code functions correctly after the changes.

chatgpt-codex-connector

💡 Codex Review

vllm/vllm/v1/worker/worker_base.py

Lines 187 to 194 in 88c0da5

    
           if vllm_config.model_config is not None: 
        
               # it can be None in tests 
        
               trust_remote_code = vllm_config.model_config.trust_remote_code 
        
               if trust_remote_code: 
        
                   # note: lazy import to avoid importing torch before initializing 
        
                   from vllm.utils import init_cached_hf_modules 
        
                   init_cached_hf_modules()

Update init_cached_hf_modules import in worker wrapper

When trust_remote_code is enabled, the worker wrapper lazily executes from vllm.utils import init_cached_hf_modules. This helper was moved into vllm.utils.import_utils and is no longer exported from vllm.utils, so the import now raises ImportError and remote-code initialization fails. The lazy import should target the new module that defines init_cached_hf_modules.

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

vllm/engine/arg_utils.py

Signed-off-by: DarkLight1337 <tlleungac@connect.ust.hk>

hmellor · 2025-10-27T11:36:03Z

requirements/docs.txt

 # Required for argparse hook only
 -f https://download.pytorch.org/whl/cpu
 cachetools
+cloudpickle


Strange that organising the utils would cause this to be required, is the mocking not working properly for this one?

Model executor (imported by docs) now imports serial_utils which in turn imports cloudpickle.

Ok, these are relatively cheap to install, so it's not a big problem.

It'd be nice to figure out how to remove them in future.

Signed-off-by: DarkLight1337 <tlleungac@connect.ust.hk>

### What this PR does / why we need it? adapt vllm-ascend main branch with vllm releases/v0.11.1 fix `forward context not set` in test_vlm.py caused by: vllm-project/vllm#23207 fix import `cdiv round` failed caused by: vllm-project/vllm#27188 fix import `init_cached_hf_modules` failed caused by: vllm-project/vllm#27567 adapt triton kernel `fused_recurrent_gated_delta_rule_fwd_kernel` caused by: vllm-project/vllm#27654 - remove unused code in sigmoid_gating.py - `class FusedRecurrentFunction` , `fused_recurrent_gated_delta_rule`, `fused_recurrent_gated_delta_rule_fwd` ### Does this PR introduce _any_ user-facing change? No ### How was this patch tested? CI - vLLM version: v0.11.0 - vLLM main: vllm-project/vllm@83f478b Signed-off-by: 22dimensions <waitingwind@foxmail.com>

### What this PR does / why we need it? adapt vllm-ascend main branch with vllm releases/v0.11.1 fix `forward context not set` in test_vlm.py caused by: vllm-project/vllm#23207 fix import `cdiv round` failed caused by: vllm-project/vllm#27188 fix import `init_cached_hf_modules` failed caused by: vllm-project/vllm#27567 adapt triton kernel `fused_recurrent_gated_delta_rule_fwd_kernel` caused by: vllm-project/vllm#27654 - remove unused code in sigmoid_gating.py - `class FusedRecurrentFunction` , `fused_recurrent_gated_delta_rule`, `fused_recurrent_gated_delta_rule_fwd` ### Does this PR introduce _any_ user-facing change? No ### How was this patch tested? CI - vLLM version: v0.11.0 - vLLM main: vllm-project/vllm@83f478b Signed-off-by: 22dimensions <waitingwind@foxmail.com> Signed-off-by: luolun <luolun1995@cmbchina.com>

### What this PR does / why we need it? adapt vllm-ascend main branch with vllm releases/v0.11.1 fix `forward context not set` in test_vlm.py caused by: vllm-project/vllm#23207 fix import `cdiv round` failed caused by: vllm-project/vllm#27188 fix import `init_cached_hf_modules` failed caused by: vllm-project/vllm#27567 adapt triton kernel `fused_recurrent_gated_delta_rule_fwd_kernel` caused by: vllm-project/vllm#27654 - remove unused code in sigmoid_gating.py - `class FusedRecurrentFunction` , `fused_recurrent_gated_delta_rule`, `fused_recurrent_gated_delta_rule_fwd` ### Does this PR introduce _any_ user-facing change? No ### How was this patch tested? CI - vLLM version: v0.11.0 - vLLM main: vllm-project/vllm@83f478b Signed-off-by: 22dimensions <waitingwind@foxmail.com> Signed-off-by: hwhaokun <haokun0405@163.com>

### What this PR does / why we need it? adapt vllm-ascend main branch with vllm releases/v0.11.1 fix `forward context not set` in test_vlm.py caused by: vllm-project/vllm#23207 fix import `cdiv round` failed caused by: vllm-project/vllm#27188 fix import `init_cached_hf_modules` failed caused by: vllm-project/vllm#27567 adapt triton kernel `fused_recurrent_gated_delta_rule_fwd_kernel` caused by: vllm-project/vllm#27654 - remove unused code in sigmoid_gating.py - `class FusedRecurrentFunction` , `fused_recurrent_gated_delta_rule`, `fused_recurrent_gated_delta_rule_fwd` ### Does this PR introduce _any_ user-facing change? No ### How was this patch tested? CI - vLLM version: v0.11.0 - vLLM main: vllm-project/vllm@83f478b Signed-off-by: 22dimensions <waitingwind@foxmail.com> Signed-off-by: nsdie <yeyifan@huawei.com>

Signed-off-by: DarkLight1337 <tlleungac@connect.ust.hk>

### What this PR does / why we need it? adapt vllm-ascend main branch with vllm releases/v0.11.1 fix `forward context not set` in test_vlm.py caused by: vllm-project/vllm#23207 fix import `cdiv round` failed caused by: vllm-project/vllm#27188 fix import `init_cached_hf_modules` failed caused by: vllm-project/vllm#27567 adapt triton kernel `fused_recurrent_gated_delta_rule_fwd_kernel` caused by: vllm-project/vllm#27654 - remove unused code in sigmoid_gating.py - `class FusedRecurrentFunction` , `fused_recurrent_gated_delta_rule`, `fused_recurrent_gated_delta_rule_fwd` ### Does this PR introduce _any_ user-facing change? No ### How was this patch tested? CI - vLLM version: v0.11.0 - vLLM main: vllm-project/vllm@83f478b Signed-off-by: 22dimensions <waitingwind@foxmail.com>

[Misc] Clean up more utils

88c0da5

Signed-off-by: DarkLight1337 <tlleungac@connect.ust.hk>

DarkLight1337 added the ready ONLY add when PR is ready to merge/full CI is needed label Oct 27, 2025

DarkLight1337 requested review from NickLucche, ProExpertProg, WoosukKwon, aarnphm, chaunceyjiang, hmellor, houseroad, mgoin, robertgshaw2-redhat, simon-mo, tlrmchlsmth, yewentao256 and youkaichao as code owners October 27, 2025 11:00

mergify bot added frontend v1 tpu Related to Google TPUs labels Oct 27, 2025

gemini-code-assist bot reviewed Oct 27, 2025

View reviewed changes

chatgpt-codex-connector bot reviewed Oct 27, 2025

View reviewed changes

vllm/engine/arg_utils.py Outdated Show resolved Hide resolved

DarkLight1337 added 6 commits October 27, 2025 11:05

Address comment

9329f7a

Signed-off-by: DarkLight1337 <tlleungac@connect.ust.hk>

Reorder

5b664b5

Signed-off-by: DarkLight1337 <tlleungac@connect.ust.hk>

Fix

7c41623

Signed-off-by: DarkLight1337 <tlleungac@connect.ust.hk>

Clean

ccc69a5

Signed-off-by: DarkLight1337 <tlleungac@connect.ust.hk>

Update

d390ab3

Signed-off-by: DarkLight1337 <tlleungac@connect.ust.hk>

Just include it

2b7f40a

Signed-off-by: DarkLight1337 <tlleungac@connect.ust.hk>

mergify bot added the ci/build label Oct 27, 2025

noooop approved these changes Oct 27, 2025

View reviewed changes

hmellor reviewed Oct 27, 2025

View reviewed changes

More

4056252

Signed-off-by: DarkLight1337 <tlleungac@connect.ust.hk>

DarkLight1337 enabled auto-merge (squash) October 27, 2025 12:03

hmellor approved these changes Oct 27, 2025

View reviewed changes

Keep deprecation

b8d3fd3

Signed-off-by: DarkLight1337 <tlleungac@connect.ust.hk>

DarkLight1337 merged commit 6ebffaf into vllm-project:main Oct 27, 2025
51 checks passed

DarkLight1337 deleted the cleanup-utils branch October 27, 2025 15:30

ilmarkov pushed a commit to neuralmagic/vllm that referenced this pull request Nov 7, 2025

[Misc] Clean up more utils (vllm-project#27567)

e588d33

Signed-off-by: DarkLight1337 <tlleungac@connect.ust.hk>

ZhengHongming888 pushed a commit to ZhengHongming888/vllm that referenced this pull request Nov 8, 2025

[Misc] Clean up more utils (vllm-project#27567)

7958462

Signed-off-by: DarkLight1337 <tlleungac@connect.ust.hk>

rtourgeman pushed a commit to rtourgeman/vllm that referenced this pull request Nov 10, 2025

[Misc] Clean up more utils (vllm-project#27567)

da102a7

Signed-off-by: DarkLight1337 <tlleungac@connect.ust.hk>

22dimensions mentioned this pull request Nov 11, 2025

Upgrade to 0.11.1 newest vllm commit vllm-project/vllm-ascend#3982

Merged

devpatelio pushed a commit to SumanthRH/vllm that referenced this pull request Nov 29, 2025

[Misc] Clean up more utils (vllm-project#27567)

7c1c857

Signed-off-by: DarkLight1337 <tlleungac@connect.ust.hk>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[Misc] Clean up more utils#27567

[Misc] Clean up more utils#27567
DarkLight1337 merged 9 commits intovllm-project:mainfrom
DarkLight1337:cleanup-utils

DarkLight1337 commented Oct 27, 2025 •

edited by github-actions bot

Loading

Uh oh!

gemini-code-assist bot left a comment

Uh oh!

chatgpt-codex-connector bot left a comment

Uh oh!

Uh oh!

hmellor Oct 27, 2025

Uh oh!

DarkLight1337 Oct 27, 2025

Uh oh!

hmellor Oct 27, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

	if vllm_config.model_config is not None:
	# it can be None in tests
	trust_remote_code = vllm_config.model_config.trust_remote_code
	if trust_remote_code:
	# note: lazy import to avoid importing torch before initializing
	from vllm.utils import init_cached_hf_modules

	init_cached_hf_modules()

Uh oh!

Conversation

DarkLight1337 commented Oct 27, 2025 • edited by github-actions bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Purpose

Test Plan

Test Result

Uh oh!

gemini-code-assist bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

hmellor Oct 27, 2025

Choose a reason for hiding this comment

Uh oh!

DarkLight1337 Oct 27, 2025

Choose a reason for hiding this comment

Uh oh!

hmellor Oct 27, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

DarkLight1337 commented Oct 27, 2025 •

edited by github-actions bot

Loading