[Misc]feat: adapt to vLLM main (0d4d334e...46a95815) - #246
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
6 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
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 Upgrade Complete
Summary
Successfully upgraded vllm-ascend from vLLM commit
0d4d334eaa583b9c09aa4eb7538c22db99fd84b3to target commit46a95815d344e43ebd6b4757632c55d03e90983aacross 8 steps covering 23 upstream commits.Upgrade Details
0d4d334→27b85d227b85d2→2676ab12676ab1→4b364f8lora/utils.py(maybe_get_oot_by_class)4b364f8→75fd68c75fd68c→0fe7550spec_decode/eagle_proposer.py(dtype=np.int32)0fe7550→e0a45f1e0a45f1→fb5bd03fb5bd03→46a9581vllm-ascend Code Changes
Files Modified
vllm_ascend/lora/utils.py(Step-3)can_replace_layermethods to usemaybe_get_oot_by_class(AscendQKVParallelLinear)for consistency with upstream's out-of-tree layer handling patternfrom vllm.model_executor.custom_op import maybe_get_oot_by_classvllm_ascend/spec_decode/eagle_proposer.py(Step-5)self.token_arange_np = np.arange(self.max_num_tokens + 1)toself.token_arange_np = np.arange(self.max_num_tokens + 1, dtype=np.int32)for consistency with upstream dtype fixNo-Op Steps
Steps with no vllm-ascend code changes required:
NPUWorkerinherits viasuper().__init__()callCommits Created
All 8 commits signed and verified:
bc0c59df9e7d07ad5be43547742f6bd4bc71b0436fa51f1d7c1f3a1235c6105d2e2d2a3236fc5b6936b99ffd5a8d5145b6bc047e05478c59d50210c6063e33acea8def1641b80a8046885227185cb194025382e396be0ce93cb02a9e6394cc1c1ee6ccc6d55688ecd22925e89dfe2c5cba424c864a3166935fa0dd85f558fd5deec622ba686d5eeeae3b3de9aeabe986b3d0eab9eb96fcdea714608f8c7b06faCI Verification
All steps verified via
e2e-singlecard-lightsuite:Pre-Completion Checklist
git commit -s)/tmp/main2main/conf.pymain_vllm_commitupdated at each stepvllm_version_is()guards not needed (no version-specific code paths)/tmp/main2main/steps/<step-id>/summary.md/tmp/main2main/final-summary.mdTarget Status
✅ TARGET REACHED: vLLM commit
46a95815d344e43ebd6b4757632c55d03e90983aThe vllm-ascend repository is now compatible with the requested vLLM upstream commit.