Skip to content

[eagle][cp] fix eagle_cp enable bug2#7079

Merged
wangxiyuan merged 2 commits intovllm-project:mainfrom
lilinsiman:eagle_cp_bugfix2
Mar 10, 2026
Merged

[eagle][cp] fix eagle_cp enable bug2#7079
wangxiyuan merged 2 commits intovllm-project:mainfrom
lilinsiman:eagle_cp_bugfix2

Conversation

@lilinsiman
Copy link
Copy Markdown
Collaborator

@lilinsiman lilinsiman commented Mar 9, 2026

What this PR does / why we need it?

Fix acceptance and high-concurrency bug in eagle3 and cp enabled

Does this PR introduce any user-facing change?

no

How was this patch tested?

tests and ut

Signed-off-by: lilinsiman <lilinsiman@gmail.com>
@gemini-code-assist
Copy link
Copy Markdown
Contributor

Summary of Changes

Hello, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request addresses and fixes acceptance and high-concurrency bugs within the eagle3 and context parallel (cp) features. The changes primarily involve refining the internal logic for processing query lengths and batch masks in the attention mechanism, and correcting how auxiliary hidden states are aggregated in the model runner, leading to improved stability and correctness in these components.

Highlights

  • Context Parallel Attention Logic: Corrected the variable used for slicing query lengths and removed redundant batch mask processing in the context parallel attention mechanism.
  • Model Runner Hidden State Processing: Adjusted the concatenation of auxiliary hidden states in the model runner to ensure correct aggregation without unnecessary slicing.

🧠 New Feature in Public Preview: You can now enable Memory to help Gemini Code Assist learn from your team's feedback. This makes future code reviews more consistent and personalized to your project's style. Click here to enable Memory in your admin console.

Changelog
  • vllm_ascend/attention/context_parallel/attention_cp.py
    • Corrected the variable used for slicing query_lens from num_decode_tokens to num_decodes.
    • Removed a redundant torch.repeat_interleave operation for batch_chunk_seq_mask.
    • Updated the _build_chunked_context_metadata function call to no longer pass the batch_chunk_seq_mask parameter.
  • vllm_ascend/worker/model_runner_v1.py
    • Adjusted the concatenation of aux_hidden_states by removing an extraneous slice [:num_scheduled_tokens].
Activity
  • No specific activity (comments, reviews, or progress updates) has been recorded for this pull request yet.
Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point by creating a comment using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

Feature Command Description
Code Review /gemini review Performs a code review for the current pull request in its current state.
Pull Request Summary /gemini summary Provides a summary of the current pull request in its current state.
Comment @gemini-code-assist Responds in comments when explicitly tagged, both in pull request comments and review comments.
Help /gemini help Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

Footnotes

  1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution.

Copy link
Copy Markdown
Contributor

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

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

Code Review

This pull request aims to fix bugs related to the Eagle speculative decoding method when context parallelism is enabled. The changes involve correcting an indexing bug in attention_cp.py, removing what appears to be dead code, and modifying how auxiliary hidden states are handled in model_runner_v1.py. While most changes seem correct, the modification in model_runner_v1.py appears to introduce a new issue by removing a necessary slice, and it misses an existing bug where hidden_states is not sliced. I've provided a critical comment with a suggested fix to ensure correctness and consistency.

Comment thread vllm_ascend/worker/model_runner_v1.py
Signed-off-by: lilinsiman <lilinsiman@gmail.com>
@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Mar 9, 2026

👋 Hi! Thank you for contributing to the vLLM Ascend project. The following points will speed up your PR merge:‌‌

  • A PR should do only one thing, smaller PRs enable faster reviews.
  • Every PR should include unit tests and end-to-end tests ‌to ensure it works and is not broken by other future PRs.
  • Write the commit message by fulfilling the PR description to help reviewer and future developers understand.

If CI fails, you can run linting and testing checks locally according Contributing and Testing.

@lilinsiman lilinsiman requested a review from wangxiyuan as a code owner March 9, 2026 09:29
@linfeng-yuan linfeng-yuan added ready read for review ready-for-test start test by label for PR labels Mar 9, 2026
@wangxiyuan wangxiyuan merged commit a5ea699 into vllm-project:main Mar 10, 2026
76 of 79 checks passed
845473182 pushed a commit to 845473182/vllm-ascend that referenced this pull request Mar 12, 2026
…to qwen3next_graph

* 'main' of https://github.com/vllm-project/vllm-ascend: (88 commits)
  [main][bugfix] Fixed the problem of speculative decoding in FULL mode (vllm-project#7148)
  fixed fia pad logic in graph mode. (vllm-project#7144)
  [Doc] fix DSV3.1 PD configs (vllm-project#7187)
  refactor: add a check before layer_sharding logging (vllm-project#7186)
  [Build] Add support for Ascend950 chip (vllm-project#7151)
  Revert "[CI] fix skiped e2e test when upgrade vllm version  (vllm-project#6654)" (vllm-project#7166)
  [MODELRUNNERV2]fix penality ops (vllm-project#7013)
  [Bugfix][LoRA] Fix the issue when enable LoRA + tp + fully_sharded_loras (vllm-project#6650)
  [KV Pool]get_num_new_matched_tokens return 0 if token length < block_size (vllm-project#7146)
  [CI] Build Image for v0.16.0rc1 (vllm-project#7155)
  [CI] Skip `test_mooncake_layerwise_connector.py` in `ut` (vllm-project#7147)
  [BugFix]Fix recomputed scheduler bug (vllm-project#7137)
  [Model] Support Minimax-m2.5 on NPU (vllm-project#7105)
  [P/D]Mooncake Layerwise Connector supports hybrid attention manager with multiple kvcache groups (vllm-project#7022)
  Add patch_qwen3_5 for triton ops fused_recurrent_gated_delta_rule (vllm-project#7109)
  [Doc][ReleaseNote] Add release notes for v0.16.0rc1 (vllm-project#7067)
  [Misc] Download on both hk and guiyang region (vllm-project#7129)
  [bugdix] The problem that the w4a8 weight fails to be loaded when the EP is not enabled is resolved. (vllm-project#7090)
  [eagle][cp] fix eagle_cp enable bug2 (vllm-project#7079)
  [CI]Upgrade niglty multi-node-tests max-parallel to 2 (vllm-project#7035)
  ...
Nagisa125 pushed a commit to starmountain1997/vllm-ascend that referenced this pull request Mar 17, 2026
### What this PR does / why we need it?
Fix acceptance and high-concurrency bug in eagle3 and cp enabled

### Does this PR introduce _any_ user-facing change?
no

### How was this patch tested?
tests and ut

- vLLM version: v0.16.0
- vLLM main:
vllm-project/vllm@4034c3d

---------

Signed-off-by: lilinsiman <lilinsiman@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ready read for review ready-for-test start test by label for PR

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants