[Misc]feat: adapt to vLLM main (0d4d334e...46a95815) - #243
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>
Signed-off-by: Meihan-chen <239345480+Meihan-chen@users.noreply.github.com>
zhangxinyuehfad
force-pushed
the
main
branch
2 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
11 times, most recently
from
June 26, 2026 09:09
05b98c1 to
38085d5
Compare
zhangxinyuehfad
force-pushed
the
main
branch
5 times, most recently
from
July 2, 2026 11:27
b035592 to
7d46541
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..46a95815d344e43ebd6b4757632c55d03e90983a
Reached upstream commit: 46a95815d344e43ebd6b4757632c55d03e90983a
Steps: 8/8
CI suite: e2e-main2main
Result
The target vLLM commit
46a95815d344e43ebd6b4757632c55d03e90983awas fully reached. All 8 planned steps completed with CI verification, and vllm-ascend was successfully adapted to absorb 23 upstream commits. Only one minor adaptation was required (addingdtype=np.int32totoken_arange_npoverride ineagle_proposer.pyfor type consistency with upstreamSpecDecodeBaseProposer). All other changes were inherited automatically through vLLM's module imports and class inheritance.Completed Steps
Changes Made
0d4d334eaa583b9c09aa4eb7538c22db99fd84b3to46a95815d344e43ebd6b4757632c55d03e90983a..github/workflows/dockerfiles/Dockerfile.lint,.github/workflows/pr_test_full.yaml,.github/workflows/pr_test_light.yaml, anddocs/source/conf.pywith new vLLM commit hash in each step.dtype=np.int32totoken_arange_npoverride invllm_ascend/spec_decode/eagle_proposer.py(line 184) for type consistency with upstreamSpecDecodeBaseProposerchange.CI Verification
ci_result: "passed"andrun_suite_exit_code: 0.Key Upstream Changes Absorbed
get_tokenizerandresolve_hf_chat_templateimport paths removedmaybe_get_oot_by_class()for out-of-tree layer supportPoolingOfflineMixinset_forward_context()to permanent setup inWorkerBase.__init__vllm-ascend Commits Created
All commits are signed and located in the vllm-ascend repository:
4e7a6ac70b220ccb51d96099b35e70a19052c1d2(step-1)3622a097ee6e7f225b7cc99cf0ee573c31ce1273(step-2)ae9bbbdf7f2a74ed0c3b8f54eb848b564d740372(step-3)770cc65981c99d436cf3c78e3405593d7b1d881c(step-4)b84c2bcbd389facd975711e546bdb47ad14be9b0(step-5)8b3a966e467946d16d14f5ce066d50b113135f31(step-6)0041731377b8a261939a439685ee6ca3462df084(step-7)8585eabe70b8114192bcbd09ef8cdb02099311bc(step-8)