Skip to content

[Misc]feat: adapt to vLLM main (5af684c3...66d1cc0c) - #235

Draft
Meihan-chen wants to merge 25 commits into
nv-action:mainfrom
Meihan-chen:main2main_auto_v2_2026-05-06_09-24
Draft

[Misc]feat: adapt to vLLM main (5af684c3...66d1cc0c)#235
Meihan-chen wants to merge 25 commits into
nv-action:mainfrom
Meihan-chen:main2main_auto_v2_2026-05-06_09-24

Conversation

@Meihan-chen

@Meihan-chen Meihan-chen commented May 6, 2026

Copy link
Copy Markdown
Collaborator

Automated adaptation to upstream vLLM main branch changes.
Commit range: 5af684c31912232e5c89484c2e8259e0fac6c55b...66d1cc0c77628e36df8e5e245c116e6aac3045fb

phase: detect

round: 0

git_commits:

  • sha: 0204395cf25b0fa0c4fc7802d6dd6d8e240306be
    subject: fix(kv_offload): adapt to upstream kv_offload module restructuring
    body:
    Upstream vLLM merged the kv_offload module structure:

    • vllm/v1/kv_offload/abstract.py (deleted) -> vllm/v1/kv_offload/base.py
    • vllm/v1/kv_offload/mediums.py (deleted) -> vllm/v1/kv_offload/base.py
    • vllm/v1/kv_offload/spec.py (deleted) -> vllm/v1/kv_offload/base.py

    This commit adapts vllm-ascend to use the new unified base.py module
    and updates the API to work with the new CanonicalKVCaches format.

    Key changes:

    • Update imports from deleted modules to use vllm.v1.kv_offload.base
    • Update get_handlers() signature to accept CanonicalKVCaches
    • Update CpuNpuOffloadingHandler to work with CanonicalKVCaches
    • Remove unused attn_backends parameter

    Co-Authored-By: Claude Opus 4.7 noreply@anthropic.com
    Signed-off-by: main2main-bot main2main-bot@users.noreply.github.com

  • vLLM version: v0.19.0

  • vLLM main: vllm-project/vllm@5af684c

Meihan-chen and others added 25 commits April 16, 2026 16:43
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: hfadzxy <starmoon_zhang@163.com>
Signed-off-by: Meihan-chen <jcccx.cmh@gmail.com>
Signed-off-by: hfadzxy <starmoon_zhang@163.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>
Upstream vLLM merged the kv_offload module structure:
- vllm/v1/kv_offload/abstract.py (deleted) -> vllm/v1/kv_offload/base.py
- vllm/v1/kv_offload/mediums.py (deleted) -> vllm/v1/kv_offload/base.py
- vllm/v1/kv_offload/spec.py (deleted) -> vllm/v1/kv_offload/base.py

This commit adapts vllm-ascend to use the new unified base.py module
and updates the API to work with the new CanonicalKVCaches format.

Key changes:
- Update imports from deleted modules to use vllm.v1.kv_offload.base
- Update get_handlers() signature to accept CanonicalKVCaches
- Update CpuNpuOffloadingHandler to work with CanonicalKVCaches
- Remove unused attn_backends parameter

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
Signed-off-by: main2main-bot <main2main-bot@users.noreply.github.com>
Upstream vLLM renamed and reorganized the MoE runner classes:
- vllm.model_executor.layers.fused_moe.runner.default_moe_runner (deleted)
- DefaultMoERunner class renamed to MoERunner
- MoERunnerBase renamed to MoERunnerInterface

This commit updates vllm-ascend to use the new module path and class name:
- Change import from default_moe_runner to moe_runner
- Change DefaultMoERunner to MoERunner

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
Signed-off-by: main2main-bot <main2main-bot@users.noreply.github.com>
Upstream vLLM commit c08f3b2a6 introduced a change to measure encoder
compile time separately from the LLM backbone. This changed the return
type of compile_or_warm_up_model() from float to CompilationTimes,
a NamedTuple containing (language_model, encoder) compilation times.

This commit adapts vllm-ascend's NPUWorker to match the new upstream API:
- Import CompilationTimes from vllm.v1.worker.worker_base
- Change return type annotation from float to CompilationTimes
- Return CompilationTimes with both language_model and encoder times

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
Signed-off-by: main2main-bot <main2main-bot@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants