[Misc]feat: adapt to vLLM main (0d4d334e...b2c58ee9) - #244
Draft
Meihan-chen wants to merge 34 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>
Signed-off-by: Meihan-chen <239345480+Meihan-chen@users.noreply.github.com>
Upstream commits absorbed: - [Bugfix] Fix incorrect chat template format for Qwen3.5 (#42660) - [CPU][RISC-V] Add RVV-optimized attention kernels (#40119) - [Model] Support InternS2 Preview (#42705) - [Bugfix] Fix inverted condition causing thinking_token_budget to be silently ignored (#41674) - Update Intel Xeon model list and vLLM Benchmark Suite BKMs (#42607) - [Bugfix] Clarify CPU backend memory error messages (#42479) Changes are CPU-specific or internal vLLM implementations. No vllm-ascend code adaptation required. Signed-off-by: main2main-bot <main2main-bot@users.noreply.github.com>
Upstream commit absorbed: - [Deprecation] Remove old locations of and (#35024) Changes remove deprecated import locations in vLLM. vllm-ascend does not import from deprecated locations. No vllm-ascend code adaptation required. Signed-off-by: main2main-bot <main2main-bot@users.noreply.github.com>
zhangxinyuehfad
force-pushed
the
main
branch
4 times, most recently
from
June 18, 2026 04:04
de24f70 to
60cd7c9
Compare
zhangxinyuehfad
force-pushed
the
main
branch
11 times, most recently
from
June 26, 2026 09:09
05b98c1 to
38085d5
Compare
zhangxinyuehfad
force-pushed
the
main
branch
6 times, most recently
from
July 7, 2026 03:28
1cd9ff4 to
b7570c6
Compare
zhangxinyuehfad
force-pushed
the
main
branch
4 times, most recently
from
July 13, 2026 09:44
0c96baa to
e7d055b
Compare
MrZ20
force-pushed
the
main
branch
2 times, most recently
from
July 24, 2026 06:26
405d1af to
7423e19
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:
0d4d334eaa583b9c09aa4eb7538c22db99fd84b3..b2c58ee9427f15563210e184c57a6e530f37e464Reached upstream commit:
b2c58ee9427f15563210e184c57a6e530f37e464Steps: 6/6
CI suite: e2e-singlecard-light
Result
The target vLLM commit
b2c58ee9427f15563210e184c57a6e530f37e464was fully reached. All 6 planned steps completed successfully with CI passing on each step. No vllm-ascend code adaptation was required - all upstream changes were either hardware-specific optimizations (CPU/RISC-V, ROCm), internal implementation refactors, or new model registrations that flow through to vllm-ascend without override.Completed Steps
0d4d334..27b85d2d362ebf27b85d2..2676ab1f2b1c592676ab1..4b364f80359b164b364f8..75fd68cb76482475fd68c..491e8d822338a1491e8d8..b2c58ee7bd484aChanges Made
0d4d334eaa583b9c09aa4eb7538c22db99fd84b3tob2c58ee9427f15563210e184c57a6e530f37e464(30 commits absorbed).Dockerfile.lint,pr_test_full.yaml,pr_test_light.yaml) with new commit reference.docs/source/conf.pymain_vllm_committo target commit.CI Verification
Commits Created in vllm-ascend
d362ebfed81775e03eb531b6f3155fcb82428e63- step-1f2b1c59a3050602e1cd73182b902d881ebffdd9d- step-20359b1676dc403219092763950417d16de5eb834- step-3b7648245a2bf2c26794918f062c75b92f50bfc5a- step-422338a1eb16a12d42d30d9b11f9cdb8040f5619c- step-57bd484ab1632c6cf663a1b07b619fd8f0fed037f- step-6Key Upstream Changes Absorbed
No Push/PR
As instructed, no git push or PR creation was performed. The commits are local only.