[Misc]feat: adapt to vLLM main (c7aa186d...50acdc5b) - #241
Draft
Meihan-chen wants to merge 36 commits into
Draft
Conversation
Signed-off-by: Meihan-chen <jcccx.cmh@gmail.com>
Signed-off-by: Meihan-chen <jcccx.cmh@gmail.com>
Signed-off-by: Meihan-chen <jcccx.cmh@gmail.com>
Signed-off-by: Meihan-chen <jcccx.cmh@gmail.com>
Signed-off-by: Meihan-chen <jcccx.cmh@gmail.com>
Signed-off-by: Meihan-chen <jcccx.cmh@gmail.com>
Signed-off-by: Meihan-chen <jcccx.cmh@gmail.com>
Signed-off-by: Meihan-chen <jcccx.cmh@gmail.com>
Signed-off-by: Meihan-chen <jcccx.cmh@gmail.com>
Signed-off-by: Meihan-chen <239345480+Meihan-chen@users.noreply.github.com>
Signed-off-by: Meihan-chen <239345480+Meihan-chen@users.noreply.github.com>
Signed-off-by: Meihan-chen <239345480+Meihan-chen@users.noreply.github.com>
Signed-off-by: Meihan-chen <239345480+Meihan-chen@users.noreply.github.com>
Signed-off-by: Meihan-chen <239345480+Meihan-chen@users.noreply.github.com>
Signed-off-by: Meihan-chen <239345480+Meihan-chen@users.noreply.github.com>
Upstream range: c7aa186d67b..16e336491e96 Upstream commit: [Mistral Tokenizer] allow more leniency in apply_chat_template (#41658) No code adaptation needed - changes are to mistral tokenizer internals that vllm-ascend does not override. Signed-off-by: Claude Code <noreply@anthropic.com> Signed-off-by: main2main-bot <main2main-bot@users.noreply.github.com>
…code multimodal) Upstream range: 16e336491e96..5d0fd87038b1 Key adaptation: - Rename _raise_if_multimodal to _warn_if_multimodal in AscendDflashProposer to match upstream SpecDecodeBaseProposer method rename Upstream commits in this step include: - [Spec Decode] Allow multimodal models with a warning (#41752) - Multiple bugfixes for CPU, ROCm, PP mode, etc. Signed-off-by: Claude Code <noreply@anthropic.com> Signed-off-by: main2main-bot <main2main-bot@users.noreply.github.com>
Upstream range: 5d0fd87038b1..242afc6bf40d Upstream commit: [MM][Gemma4] Respect max_soft_tokens in encoder budget (#41799) No code adaptation needed - changes are to gemma4_mm internals that vllm-ascend does not override. Signed-off-by: Claude Code <noreply@anthropic.com> Signed-off-by: main2main-bot <main2main-bot@users.noreply.github.com>
MrZ20
force-pushed
the
main
branch
2 times, most recently
from
June 10, 2026 03:25
677396a to
9554149
Compare
zhangxinyuehfad
force-pushed
the
main
branch
5 times, most recently
from
June 16, 2026 04:48
c14c88e to
9768184
Compare
zhangxinyuehfad
force-pushed
the
main
branch
9 times, most recently
from
June 18, 2026 04:04
de24f70 to
60cd7c9
Compare
zhangxinyuehfad
force-pushed
the
main
branch
10 times, most recently
from
June 25, 2026 09:43
ef5e2db to
117f26e
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Main2Main Summary
Status: completed
Upstream range: c7aa186d67b6f051680831418e957c67f34ba7a2..50acdc5b5cc00f10408d8f98b21fc97efc615173
Reached upstream commit: 50acdc5b5cc00f10408d8f98b21fc97efc615173
Steps: 9/9
CI suite: e2e-main2main
Result
Successfully adapted vllm-ascend to track 30 upstream vLLM commits across 9 steps.
All steps passed CI verification. One code adaptation was required in step-2 for
spec decode multimodal method rename.
Completed Steps
Changes Made
_raise_if_multimodalto_warn_if_multimodalinvllm_ascend/spec_decode/dflash_proposer.py(step-2).CI Verification
Key Upstream Changes Absorbed
_raise_if_multimodal→_warn_if_multimodal, adapted in vllm-ascend.vllm-ascend Commits Created