Skip to content

[Misc] Reorganize inputs#35182

Merged
vllm-bot merged 36 commits intovllm-project:mainfrom
DarkLight1337:mv-inputs
Mar 25, 2026
Merged

[Misc] Reorganize inputs#35182
vllm-bot merged 36 commits intovllm-project:mainfrom
DarkLight1337:mv-inputs

Conversation

@DarkLight1337
Copy link
Copy Markdown
Member

@DarkLight1337 DarkLight1337 commented Feb 24, 2026

Purpose

  • Renamed ProcessorInputs -> EngineInput to avoid confusion about where it should be inputted.
    • Standardized engine input naming, e.g.:
      • TokenInputs -> TokensInput
      • token_inputs-> tokens_input
      • EmbedsInputs -> EmbedsInput
      • SingletonInputs -> SingletonInput
  • Split up vllm.inputs.data.
    • LLM API inputs go into vllm.inputs.llm.
    • Engine inputs go into vllm.inputs.engine.
    • Moved vllm.inputs.parse.split_enc_dec_inputs -> vllm.inputs.engine.split_enc_dec_input.
  • Moved the following MM input definitions to avoid circular imports and also make them more accessible to users:
    • vllm.multimodal.inputs.ModalityData -> vllm.inputs.llm.ModalityData
    • vllm.multimodal.inputs.MultiModalDataBuiltins -> vllm.inputs.llm.MultiModalDataBuiltins
    • vllm.multimodal.inputs.MultiModalDataDict -> vllm.inputs.llm.MultiModalDataDict
    • vllm.multimodal.inputs.MultiModalUUIDDict -> vllm.inputs.llm.MultiModalUUIDDict
    • vllm.multimodal.inputs.MultiModalHashes -> vllm.inputs.engine.MultiModalHashes
    • vllm.multimodal.inputs.MultiModalPlaceholderDict -> vllm.inputs.engine.MultiModalPlaceholders
    • vllm.multimodal.inputs.MultiModalInputs -> vllm.inputs.engine.MultiModalInput
    • vllm.multimodal.inputs.mm_inputs -> vllm.inputs.engine.mm_input
    • vllm.multimodal.inputs.MultiModalEncDecInputs -> vllm.inputs.engine.MultiModalEncDecInput
    • vllm.multimodal.inputs.mm_enc_dec_inputs -> vllm.inputs.engine.mm_enc_dec_input
  • Updated associated variable names
  • Updated relevant docs

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>
Signed-off-by: DarkLight1337 <tlleungac@connect.ust.hk>
@mergify
Copy link
Copy Markdown
Contributor

mergify bot commented Feb 24, 2026

Documentation preview: https://vllm--35182.org.readthedocs.build/en/35182/

@mergify mergify bot added documentation Improvements or additions to documentation deepseek Related to DeepSeek models frontend llama Related to Llama models multi-modality Related to multi-modality (#4194) performance Performance-related issues qwen Related to Qwen models v1 labels Feb 24, 2026
Signed-off-by: DarkLight1337 <tlleungac@connect.ust.hk>
@mergify
Copy link
Copy Markdown
Contributor

mergify bot commented Feb 24, 2026

Hi @DarkLight1337, the pre-commit checks have failed. Please run:

uv pip install pre-commit
pre-commit install
pre-commit run --all-files

Then, commit the changes and push to your branch.

For future commits, pre-commit will run automatically on changed files before each commit.

Tip

Is mypy or markdownlint failing?
mypy and markdownlint are run differently in CI. If the failure is related to either of these checks, please use the following commands to run them locally:
# For mypy (substitute "3.10" with the failing version if needed)
pre-commit run --hook-stage manual mypy-3.10
# For markdownlint
pre-commit run --hook-stage manual markdownlint

Signed-off-by: DarkLight1337 <tlleungac@connect.ust.hk>
@ywang96
Copy link
Copy Markdown
Member

ywang96 commented Feb 24, 2026

cc @njhill - the fundamental change to this PR is that we want to avoid using EngineCoreRequest as the public interface for the input of AsyncLLM but EngineInput instead, and EngineInput -> EngineCoreRequest (which adds request_id validation) takes place inside AsyncLLM.

I'd like to make sure we decide on an interface for token-in-token-out and stick to it to avoid any additional refactoring/renaming in the future, so let's be careful with it.

Signed-off-by: DarkLight1337 <tlleungac@connect.ust.hk>
Copy link
Copy Markdown
Contributor

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

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

Code Review

This pull request successfully refactors the input organization within vLLM by splitting vllm.inputs.data into vllm.inputs.api and vllm.inputs.engine, and standardizing the naming conventions (e.g., ProcessorInputs to EngineInput). The changes improve code clarity and help prevent circular dependencies by moving multi-modal input definitions. The refactoring is comprehensive, covering numerous files across the engine, entrypoints, and model implementations. I have identified a few minor issues related to docstring references and potential type safety in helper functions that should be addressed to maintain high code quality.

Signed-off-by: DarkLight1337 <tlleungac@connect.ust.hk>
@mergify mergify bot removed the needs-rebase label Mar 23, 2026
@mergify
Copy link
Copy Markdown
Contributor

mergify bot commented Mar 23, 2026

This pull request has merge conflicts that must be resolved before it can be
merged. Please rebase the PR, @DarkLight1337.

https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/syncing-a-fork

@mergify mergify bot added the needs-rebase label Mar 23, 2026
Signed-off-by: DarkLight1337 <tlleungac@connect.ust.hk>
Signed-off-by: DarkLight1337 <tlleungac@connect.ust.hk>
@mergify mergify bot removed the needs-rebase label Mar 24, 2026
Copy link
Copy Markdown
Member

@njhill njhill left a comment

Choose a reason for hiding this comment

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

Looks ok to me since it doesn't really change things from current state w.r.t. my above concerns, so we can continue to discuss those things anyhow.

sorry about the delay

@vllm-bot vllm-bot merged commit ba2f0ac into vllm-project:main Mar 25, 2026
69 of 74 checks passed
@github-project-automation github-project-automation bot moved this from Todo to Done in AMD Mar 25, 2026
@DarkLight1337 DarkLight1337 deleted the mv-inputs branch March 25, 2026 17:22
johnnynunez pushed a commit to johnnynunez/vllm that referenced this pull request Mar 25, 2026
Signed-off-by: DarkLight1337 <tlleungac@connect.ust.hk>
Signed-off-by: johnnynunez <johnnynuca14@gmail.com>
johnnynunez pushed a commit to johnnynunez/vllm that referenced this pull request Mar 25, 2026
Signed-off-by: DarkLight1337 <tlleungac@connect.ust.hk>
Signed-off-by: johnnynunez <johnnynuca14@gmail.com>
RhizoNymph pushed a commit to RhizoNymph/vllm that referenced this pull request Mar 26, 2026
Signed-off-by: DarkLight1337 <tlleungac@connect.ust.hk>
HenryTangDev pushed a commit to HenryTangMain/vllm that referenced this pull request Mar 27, 2026
Signed-off-by: DarkLight1337 <tlleungac@connect.ust.hk>
malaiwah pushed a commit to malaiwah/vllm that referenced this pull request Mar 27, 2026
Signed-off-by: DarkLight1337 <tlleungac@connect.ust.hk>
Signed-off-by: Michel Belleau <michel.belleau@malaiwah.com>
Monishver11 pushed a commit to Monishver11/vllm that referenced this pull request Mar 27, 2026
Signed-off-by: DarkLight1337 <tlleungac@connect.ust.hk>
Signed-off-by: Monishver Chandrasekaran <monishverchandrasekaran@gmail.com>
nithinvc pushed a commit to nithinvc/vllm that referenced this pull request Mar 27, 2026
Signed-off-by: DarkLight1337 <tlleungac@connect.ust.hk>

Signed-off-by: Nithin Chalapathi <nithin.ch10@gmail.com>
JiantaoXu pushed a commit to JiantaoXu/vllm that referenced this pull request Mar 28, 2026
Signed-off-by: DarkLight1337 <tlleungac@connect.ust.hk>
Etelis pushed a commit to Etelis/vllm that referenced this pull request Mar 29, 2026
Signed-off-by: DarkLight1337 <tlleungac@connect.ust.hk>
vrdn-23 pushed a commit to vrdn-23/vllm that referenced this pull request Mar 30, 2026
Signed-off-by: DarkLight1337 <tlleungac@connect.ust.hk>
Signed-off-by: Vinay Damodaran <vrdn@hey.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

cpu Related to CPU backends deepseek Related to DeepSeek models documentation Improvements or additions to documentation frontend llama Related to Llama models multi-modality Related to multi-modality (#4194) performance Performance-related issues qwen Related to Qwen models ready ONLY add when PR is ready to merge/full CI is needed rocm Related to AMD ROCm v1

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

5 participants