Skip to content

Revert "[Perf][ROCm] Dual-stream decode with hipgraphs" - #52024

Merged
AndreasKaratzas merged 3 commits into
vllm-project:mainfrom
simondanielsson:revert-48223-feat/dual-stream-decode-rocm
Aug 13, 2026
Merged

AndreasKaratzas merged 3 commits into
vllm-project:mainfrom
simondanielsson:revert-48223-feat/dual-stream-decode-rocm

Conversation

@simondanielsson

Copy link
Copy Markdown
Contributor

Reverts #48223

@claude claude Bot 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.

Claude Code Review

This pull request is from a fork — automated review is disabled. A repository maintainer can comment @claude review to run a one-time review.

@mergify mergify Bot added the rocm Related to AMD ROCm label Aug 12, 2026
@github-project-automation github-project-automation Bot moved this to Todo in AMD Aug 12, 2026
@simondanielsson

Copy link
Copy Markdown
Contributor Author

The PR previously broke CI for DP with hybrid models : https://buildkite.com/vllm/amd-ci/builds/11962/list?sid=019ff533-827d-49d0-804e-938ff4efe9d8&tab=output

@AndreasKaratzas AndreasKaratzas left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM

Thanks :)

…48223)"

This reverts commit 47ececb.

Signed-off-by: simondanielsson <simon.danielsson99@hotmail.com>
@simondanielsson
simondanielsson force-pushed the revert-48223-feat/dual-stream-decode-rocm branch from f2e6bd6 to 198d902 Compare August 12, 2026 17:07
@dllehr-amd dllehr-amd added the ready ONLY add when PR is ready to merge/full CI is needed label Aug 12, 2026
@github-actions

Copy link
Copy Markdown

@simondanielsson, CI is now available for this PR.

  • /ci run starts a CI build.
  • /ci retry retries failed jobs in the CI build for the current PR head. If the current head has no CI build, it starts a new CI build for the current head containing only jobs that failed in the latest earlier CI build for this PR.
  • /ci cancel cancels scheduled or running CI builds for this PR branch.

@Fangzhou-Ai

Fangzhou-Ai commented Aug 12, 2026

Copy link
Copy Markdown
Collaborator

@shen-shanshan @jiacao-amd

@AndreasKaratzas

Copy link
Copy Markdown
Member

/ci run

@github-actions

Copy link
Copy Markdown

✅ Triggered Buildkite CI #83611 for commit 198d9023e738.

@AndreasKaratzas

Copy link
Copy Markdown
Member

/ci run

@github-actions

Copy link
Copy Markdown

✅ Triggered Buildkite CI #83622 for commit 1a2b6105ee82.

@AndreasKaratzas

Copy link
Copy Markdown
Member

/ci run

@github-actions

Copy link
Copy Markdown

✅ Triggered Buildkite CI #83641 for commit 6a1664e19479.

@AndreasKaratzas
AndreasKaratzas enabled auto-merge (squash) August 13, 2026 01:42
@shen-shanshan

Copy link
Copy Markdown
Collaborator

/ci retry

@github-actions

Copy link
Copy Markdown

✅ Queued 1 failed job(s) for retry in Buildkite CI #83641.

@AndreasKaratzas
AndreasKaratzas merged commit 3d204df into vllm-project:main Aug 13, 2026
111 checks passed
@github-project-automation github-project-automation Bot moved this from Todo to Done in AMD Aug 13, 2026
@simondanielsson
simondanielsson deleted the revert-48223-feat/dual-stream-decode-rocm branch August 13, 2026 08:01
iboiko-habana pushed a commit to vllm-project/vllm-gaudi that referenced this pull request Aug 13, 2026
…e SharedExperts stream-sync in dp1 MoE fast path (+1 more) (#1732)

This PR consolidates 2 fixes against
vllm@`1c3633acafd6bbde1f3636cee9799e3ab0879d13`. Both symptoms are the
same ~10-line shared-experts fast-path block and are co-resolved by one
commit (697d798).

## Bug 1: Restore SharedExperts stream-sync in dp1 MoE fast path

- **State machine id**: moerunner_apply_quant_method_overlapping_kwarg
- **Commit**: 697d798

### Root cause
Upstream vLLM PR #52024 reverted PR #51838, restoring the shared-experts
stream-synchronization path in the dp1 MoE fast path. The plugin
MoERunner override had adapted to the #51838 shape and forwarded a
shared_experts_overlapping keyword into MoERunner._apply_quant_method();
after the revert that parameter no longer exists upstream, so every MoE
job raised TypeError: _apply_quant_method() got an unexpected keyword
argument 'shared_experts_overlapping'.

### Upstream PR
vllm-project/vllm#52024
Revert of vllm#51838, restoring the shared-experts stream-sync fast
path.

### Fix
Restore the shared-experts stream-sync block in the dp1 MoE fast path so
the override matches post-revert upstream and stops forwarding the
removed shared_experts_overlapping kwarg into
MoERunner._apply_quant_method(). Single ~10-line block; both symptoms
are co-resolved by this one commit.

## Bug 2: Restore SharedExperts.maybe_forward_async in dp1 MoE fast path

- **State machine id**: sharedexperts_missing_maybe_forward_async
- **Commit**: 697d798

### Root cause
Same upstream revert (vLLM PR #52024 reverting #51838). Post-revert, the
shared-experts fast path again dispatches through
SharedExperts.maybe_forward_async, but the plugin override had dropped
that call, so MLA/MoE jobs raised AttributeError: 'SharedExperts' object
has no attribute 'maybe_forward_async'.

### Upstream PR
vllm-project/vllm#52024
Revert of vllm#51838, restoring the shared-experts stream-sync fast
path.

### Fix
Same commit: the restored fast-path block calls
SharedExperts.maybe_forward_async again, matching post-revert upstream
and clearing the AttributeError across MLA/MoE/PD jobs.

Signed-off-by: Paweł Olejniczak <pawelx.olejniczak@intel.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ready ONLY add when PR is ready to merge/full CI is needed rocm Related to AMD ROCm

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

5 participants