Skip to content

Conversation

@DarkLight1337
Copy link
Member

@DarkLight1337 DarkLight1337 commented Dec 6, 2025

Purpose

Follow-up to #30035

Since merge_by_field_config is no longer effective, we can remove it from all model classes early and emit errors/warning messages for OOT models that still define merge_by_field_config to help them migrate.

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>
@DarkLight1337 DarkLight1337 added ready ONLY add when PR is ready to merge/full CI is needed multi-modality Related to multi-modality (#4194) labels Dec 6, 2025
@DarkLight1337 DarkLight1337 moved this to In Progress in Multi-modality Core Dec 6, 2025
@mergify mergify bot added deepseek Related to DeepSeek models llama Related to Llama models qwen Related to Qwen models labels Dec 6, 2025
Copy link
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 effectively deprecates the merge_by_field_config attribute from the SupportsMultiModal protocol. The changes involve removing this redundant flag from a large number of multi-modal model classes, which simplifies the codebase. The core logic change in vllm/model_executor/models/interfaces.py correctly implements the deprecation by raising an error for the now-unsupported False value and issuing a warning for the redundant True value, providing clear guidance for developers. This is a good cleanup effort that improves maintainability.

Signed-off-by: DarkLight1337 <tlleungac@connect.ust.hk>
@DarkLight1337 DarkLight1337 enabled auto-merge (squash) December 6, 2025 05:19
@DarkLight1337 DarkLight1337 merged commit c46b932 into vllm-project:main Dec 6, 2025
59 checks passed
@DarkLight1337 DarkLight1337 deleted the deprecate-merge-by-field-config-attr branch December 6, 2025 07:57
@github-project-automation github-project-automation bot moved this from In Progress to Done in Multi-modality Core Dec 6, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

deepseek Related to DeepSeek models llama Related to Llama models multi-modality Related to multi-modality (#4194) qwen Related to Qwen models ready ONLY add when PR is ready to merge/full CI is needed

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

2 participants