Skip to content

Merge upstream/main into vLLM-HUST#88

Merged
ShuhaoZhangTony merged 2099 commits into
mainfrom
sync/upstream-main-20260703
Jul 3, 2026
Merged

Merge upstream/main into vLLM-HUST#88
ShuhaoZhangTony merged 2099 commits into
mainfrom
sync/upstream-main-20260703

Conversation

@ShuhaoZhangTony

Copy link
Copy Markdown
Member

Summary

Merge upstream/main into the HUST vLLM fork so this fork's commit graph directly contains upstream commits, instead of continuing to rely only on cherry-pick/backport sync batches.

This resolution preserves HUST-local behavior around Ascend host compatibility, Knorm environment/configuration, plugin pooling/offline encode support, routing headers, engine shutdown handling, KV cache management, and selected worker/attention merge points.

Duplicate-work check

AI-assisted duplicate check was performed before opening this PR. Existing open sync PRs include #75, #82, and #87, but those are partial cherry-pick/batch syncs. This PR is materially different because it performs a direct merge of upstream/main into the fork branch so upstream commits become ancestors in the fork graph. No existing open PR was found for head branch sync/upstream-main-20260703.

Commands run:

gh pr list --repo vLLM-HUST/vllm-hust --state open --search "upstream sync main" --json number,title,headRefName,baseRefName,isDraft,url
gh pr list --repo vLLM-HUST/vllm-hust --state open --head sync/upstream-main-20260703 --json number,title,url,baseRefName,isDraft

Validation

git diff --name-only --diff-filter=U
python -m py_compile vllm/entrypoints/llm.py vllm/v1/core/block_pool.py vllm/v1/core/kv_cache_coordinator.py vllm/v1/core/kv_cache_manager.py vllm/v1/core/sched/scheduler.py vllm/v1/core/single_type_kv_cache_manager.py vllm/envs.py vllm/platforms/__init__.py vllm/utils/async_utils.py vllm/v1/worker/gpu_model_runner.py vllm/v1/attention/backends/utils.py vllm/v1/engine/core_client.py vllm/v1/engine/llm_engine.py vllm/entrypoints/openai/engine/serving.py
git diff --check
rg -n "<<<<<<<|>>>>>>>|^=======$" vllm/entrypoints/llm.py vllm/v1/core vllm/platforms/__init__.py vllm/utils/async_utils.py || true

Also ran a container import smoke with the paired vllm-ascend-hust upstream-merge checkout on PYTHONPATH; it loaded vllm and vllm_ascend from /workspace/upstream-sync-20260703 and imported the vLLM CLI successfully.

NPU generation smoke was not run because the host-managed service was active on NPU4-7, while the test constraint for this work was to use only NPU1. The service was not stopped or restarted.

AI assistance

AI assistance was used to resolve conflicts, run local validation, and prepare this PR. The human submitter should review every changed line and run the relevant full CI/NPU tests before merging.

hmellor and others added 30 commits June 27, 2026 00:16
…oject#46820)

Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>
Signed-off-by: Nick Hill <nickhill123@gmail.com>
…llm-project#46854)

Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>
Signed-off-by: Brandon Pelfrey <bpelfrey@nvidia.com>
Co-authored-by: Roger Wang <hey@rogerw.io>
…tliers (vllm-project#46658)

Signed-off-by: Divakar Verma <divakar.verma@amd.com>
)

Signed-off-by: Divakar Verma <divakar.verma@amd.com>
Signed-off-by: chengvjiang <chengvjiang@tencent.com>
Co-authored-by: chengvjiang <chengvjiang@tencent.com>
Co-authored-by: youkaichao <youkaichao@gmail.com>
…#44551)

Signed-off-by: jwzheng96 <jianweizheng@pku.edu.cn>
Signed-off-by: JianweiZheng <32029023+jwzheng96@users.noreply.github.com>
Signed-off-by: Jason Ozuzu <jasonozuzu@cohere.com>
Signed-off-by: walterbm <walter.beller.morales@gmail.com>
Co-authored-by: JianweiZheng <32029023+jwzheng96@users.noreply.github.com>
Co-authored-by: Wentao Ye <44945378+yewentao256@users.noreply.github.com>
Co-authored-by: walterbm <walter.beller.morales@gmail.com>
Co-authored-by: Walter Beller-Morales <walterbm@users.noreply.github.com>
Co-authored-by: Flora Feng <4florafeng@gmail.com>
Signed-off-by: Benjamin Chislett <bchislett@nvidia.com>
… E2E Throughput improvement. (vllm-project#46862)

Signed-off-by: yewentao256 <zhyanwentao@126.com>
…ct#46891)

Signed-off-by: pei.zhang <pei.zhang@amd.com>
Co-authored-by: Claude <noreply@anthropic.com>
…project#46905)

Signed-off-by: Codex <codex@example.invalid>
Co-authored-by: Codex <codex@example.invalid>
…nd implemented moe-backend selection (vllm-project#46184)

Signed-off-by: Hongxia Yang <hongxia.yang@amd.com>
Signed-off-by: tjtanaa <tunjian.tan@embeddedllm.com>
Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Co-authored-by: TJian <tunjian.tan@embeddedllm.com>
Co-authored-by: Andreas Karatzas <akaratza@amd.com>
Co-authored-by: Tan Pin Siang <tanpinsiang@gmail.com>
Signed-off-by: Fangzhou-Ai <fangzhouai@gmail.com>
Signed-off-by: tjtanaa <tunjian.tan@embeddedllm.com>
Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>
Co-authored-by: tjtanaa <tunjian.tan@embeddedllm.com>
…tale weight/scale interleave) (vllm-project#46915)

Signed-off-by: wentian-byte <2990624738@qq.com>
…roject#46818)

Signed-off-by: shaojinjie.sjj <shaojinjiesjj@gmail.com>
Co-authored-by: shaojinjie.sjj <shaojinjiesjj@gmail.com>
…oject#46782)

Signed-off-by: Taneem Ibrahim <taneem.ibrahim@gmail.com>
…for now (vllm-project#46928)

Signed-off-by: Matthew Wong <Matthew.Wong2@amd.com>
Signed-off-by: <>
Co-authored-by: Varun Sundar Rabindranath <varun-sundar-rabindranath@h100-01.nemg-001.lab.rdu2.dc.redhat.com>
…m-project#46886)

Signed-off-by: Andreas Karatzas <akaratza@amd.com>
Signed-off-by: Codex <codex@example.invalid>
Co-authored-by: Codex <codex@example.invalid>
Signed-off-by: Tianyu Guo <guoty9@mail2.sysu.edu.cn>
Signed-off-by: Isotr0py <mozf@mail2.sysu.edu.cn>
Co-authored-by: Isotr0py <mozf@mail2.sysu.edu.cn>
Co-authored-by: Roger Wang <hey@rogerw.io>
njhill and others added 23 commits July 2, 2026 10:19
…after function name (vllm-project#47311)

Signed-off-by: Joe Rowell <joerowell4@gmail.com>
Signed-off-by: mgoin <mgoin64@gmail.com>
Signed-off-by: Dan Blanaru <48605845+DanBlanaru@users.noreply.github.com>
Co-authored-by: Matthew Bonanni <mbonanni@redhat.com>
Signed-off-by: Andreas Karatzas <akaratza@amd.com>
Signed-off-by: Andreas Karatzas <akaratza@amd.com>
Signed-off-by: Andreas Karatzas <akaratza@amd.com>
Signed-off-by: Adam Baranowski <adam.baranowski@poolside.ai>
)

Signed-off-by: wenjun.liu <wenjun.liu@intel.com>
Signed-off-by: zengxian <xiangdong.zeng@intel.com>
Co-authored-by: zengxian <xiangdong.zeng@intel.com>
Signed-off-by: Nick Hill <nickhill123@gmail.com>
…ate (vllm-project#47485)

Signed-off-by: mgoin <mgoin64@gmail.com>
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
…g window (vllm-project#47217)

Signed-off-by: Luciano Martins <lucianommartins@users.noreply.github.com>
Co-authored-by: Luciano Martins <lucianommartins@users.noreply.github.com>
…er (vllm-project#44682)

Co-authored-by: Bugen Zhao <i@bugenzhao.com>
Signed-off-by: Ting Sun <suntcrick@gmail.com>
Signed-off-by: Bugen Zhao <i@bugenzhao.com>
…mitive-level profiling (vllm-project#47467)

Signed-off-by: Evgeny Parshutin <eugeny.parshutin@intel.com>
Signed-off-by: zengxian <xiangdong.zeng@intel.com>
Signed-off-by: Chris Leonard <chleonar@redhat.com>
…llm-project#46684)

Co-authored-by: Bugen Zhao <i@bugenzhao.com>
Signed-off-by: Bugen Zhao <i@bugenzhao.com>
Merge upstream/main into the HUST fork so the local commit graph contains upstream commits directly instead of relying on continued cherry-pick/backport syncs.

Preserve HUST local changes for Ascend host compatibility, Knorm routing, plugin pooling, KV cache scheduling, and shutdown behavior while resolving upstream conflicts.

Co-authored-by: OpenAI Codex <codex@openai.com>
Anchor the HUST package version to the current upstream/main commit and derive the development distance from HUST-only commits.

Co-authored-by: OpenAI Codex <codex@openai.com>
@ShuhaoZhangTony

Copy link
Copy Markdown
Member Author

Version metadata update pushed.

  • upstream/main anchor: 6429d5f (v0.23.1rc0)
  • fork distance after this commit: ahead 455 / behind 0 vs upstream/main
  • resolved package version scheme: 0.23.1.post1.dev455+g81d6a64e5a (local suffix may vary by commit/dirty state)

@ShuhaoZhangTony ShuhaoZhangTony marked this pull request as ready for review July 3, 2026 07:47
Copilot AI review requested due to automatic review settings July 3, 2026 07:47
@ShuhaoZhangTony ShuhaoZhangTony merged commit bc56dfe into main Jul 3, 2026
1 of 2 checks passed

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copilot wasn't able to review this pull request because it exceeds the maximum number of files (300). Try reducing the number of changed files and requesting a review from Copilot again.

@github-actions

github-actions Bot commented Jul 3, 2026

Copy link
Copy Markdown

Ascend Benchmark Result

  • Commit: 30b9c1f6d68f6b985ff4f996e30023bab16fd034
  • Scenario: random-online
  • Model: Qwen/Qwen2.5-3B-Instruct
  • Publish mode: artifact-preview
  • Leaderboard publish: skipped
  • HF publish: skipped
  • Perfgate mode: report
  • Baseline source: unavailable
  • Scenario mode: unavailable
  • Scenario label: none
  • Scenario reason: unavailable
  • Workflow run: view run
  • Raw benchmark result: missing
  • Leaderboard entry: missing
  • Note: random-online runs stay as preview artifacts unless random preview publish is explicitly enabled.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.