Skip to content

[Bugfix][v1] Fix step pooler implementation and step pooling usage in v1 #19956

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Jun 23, 2025

Conversation

Isotr0py
Copy link
Collaborator

@Isotr0py Isotr0py commented Jun 22, 2025

Essential Elements of an Effective PR Description Checklist

  • The purpose of the PR, such as "Fix some issue (link existing issues this PR will resolve)".
  • The test plan, such as providing test command.
  • The test results, such as pasting the results comparison before and after, or e2e results
  • (Optional) The necessary documentation update, such as updating supported_models.md and examples for a new model.

Purpose

  • Fix redundant pooled_data = [] in step pooler implementation
  • Fix missing prompt_token_ids in pooling metadata for step pooling when using v1 runner

Test Plan

pytest -s -v tests/models/language/pooling/test_reward.py

Test Result

  • Test should pass on both v0 and v1 engine

(Optional) Documentation Update

Isotr0py added 2 commits June 22, 2025 22:58
Signed-off-by: Isotr0py <2037008807@qq.com>
Signed-off-by: Isotr0py <2037008807@qq.com>
Copy link

👋 Hi! Thank you for contributing to the vLLM project.

💬 Join our developer Slack at https://slack.vllm.ai to discuss your PR in #pr-reviews, coordinate on features in #feat- channels, or join special interest groups in #sig- channels.

Just a reminder: PRs would not trigger full CI run by default. Instead, it would only run fastcheck CI which starts running only a small and essential subset of CI tests to quickly catch errors. You can run other CI tests on top of those by going to your fastcheck build on Buildkite UI (linked in the PR checks section) and unblock them. If you do not have permission to unblock, ping simon-mo or khluu to add you in our Buildkite org.

Once the PR is approved and ready to go, your PR reviewer(s) can run CI to test the changes comprehensively before merging.

To run CI, PR reviewers can either: Add ready label to the PR or enable auto-merge.

🚀

Copy link
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.

Summary of Changes

Hello @Isotr0py, 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 focuses on critical bug fixes related to the step pooler implementation and its usage within the v1 runner. It resolves an issue where collected pooled data was being inadvertently discarded and ensures that necessary prompt token IDs are correctly propagated for step pooling operations, enhancing the correctness and reliability of the pooling mechanism.

Highlights

  • Step Pooler Implementation Fix: Corrected a logical error in vllm/model_executor/layers/pooler.py where the pooled_data list was redundantly re-initialized after being populated, ensuring that collected pooled data is no longer discarded.
  • V1 Runner Step Pooling Metadata: Addressed a bug in vllm/v1/worker/gpu_input_batch.py to ensure that prompt_token_ids are correctly included in the sampling metadata when step pooling is active, which was previously missing.
  • Conditional Prompt Token Handling: Introduced a new is_step_pooler flag in vllm/v1/worker/gpu_model_runner.py and propagated it to the InputBatch constructor, allowing for conditional inclusion of prompt_token_ids specifically for step pooling operations.
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 in your pull request via creating an issue comment (i.e. comment on the pull request page) using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands.

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 issue 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 is currently in preview and 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 to provide feedback.

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.

@mergify mergify bot added the v1 label Jun 22, 2025
Copy link
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 fixes a bug in the step pooler implementation and ensures that prompt token IDs are correctly handled when using step pooling with the v1 runner. The changes include removing a redundant assignment in the pooler, adding a flag to indicate the need for token IDs during sampling, and passing this flag to the InputBatch constructor and reinitialization methods. These changes improve the correctness and efficiency of step pooling.

Isotr0py added 5 commits June 23, 2025 01:51
Signed-off-by: Isotr0py <2037008807@qq.com>
Signed-off-by: Isotr0py <2037008807@qq.com>
Signed-off-by: Isotr0py <2037008807@qq.com>
Signed-off-by: Isotr0py <2037008807@qq.com>
Signed-off-by: Isotr0py <2037008807@qq.com>
@Isotr0py
Copy link
Collaborator Author

Also cc @maxdebayser

Signed-off-by: Isotr0py <2037008807@qq.com>
@Isotr0py Isotr0py requested a review from mgoin as a code owner June 23, 2025 08:08
@mergify mergify bot added multi-modality Related to multi-modality (#4194) qwen Related to Qwen models labels Jun 23, 2025
@DarkLight1337 DarkLight1337 enabled auto-merge (squash) June 23, 2025 08:29
@github-actions github-actions bot added the ready ONLY add when PR is ready to merge/full CI is needed label Jun 23, 2025
Copy link
Contributor

@maxdebayser maxdebayser left a comment

Choose a reason for hiding this comment

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

Thanks for the fix! Overall it looks good to me. I've only requested a few small refactorings.

@Isotr0py Isotr0py disabled auto-merge June 23, 2025 13:58
Signed-off-by: Isotr0py <2037008807@qq.com>
@Isotr0py Isotr0py enabled auto-merge (squash) June 23, 2025 15:25
Copy link
Contributor

@maxdebayser maxdebayser left a comment

Choose a reason for hiding this comment

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

LGTM, thanks!

@Isotr0py Isotr0py merged commit 61f4fc5 into vllm-project:main Jun 23, 2025
75 checks passed
@Isotr0py Isotr0py deleted the fix-step-pooler branch June 24, 2025 02:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
multi-modality Related to multi-modality (#4194) qwen Related to Qwen models ready ONLY add when PR is ready to merge/full CI is needed v1
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants