Skip to content

Conversation

WoosukKwon
Copy link
Collaborator

@WoosukKwon WoosukKwon commented Aug 21, 2025

This PR refactors the scheduler's bitmask handling into the new get_grammar_bitmask method. I find this cleaner because bitmask construction is orthogonal to the scheduling logic.

This will also help #23233

@WoosukKwon WoosukKwon added the ready ONLY add when PR is ready to merge/full CI is needed label Aug 21, 2025
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.

🚀

@WoosukKwon WoosukKwon requested review from aarnphm and russellb August 21, 2025 18:02
@mergify mergify bot added the v1 label Aug 21, 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 refactors the logic for constructing the grammar bitmask into a new get_grammar_bitmask method within the Scheduler class. This is a good improvement that enhances code clarity and modularity by separating the bitmask creation from the main scheduling logic. The implementation correctly moves the existing logic without introducing any functional changes. The code is well-structured and the refactoring achieves its goal effectively. I have reviewed the changes and found no issues.

Copy link
Member

@russellb russellb left a comment

Choose a reason for hiding this comment

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

lgtm!

@russellb russellb enabled auto-merge (squash) August 21, 2025 20:17
@russellb russellb merged commit 800349c into main Aug 21, 2025
49 of 51 checks passed
@russellb russellb deleted the woosuk/bitmask branch August 21, 2025 20:53
Xu-Wenqing pushed a commit to Xu-Wenqing/vllm that referenced this pull request Aug 23, 2025
epwalsh pushed a commit to epwalsh/vllm that referenced this pull request Aug 28, 2025
xiao-llm pushed a commit to xiao-llm/vllm that referenced this pull request Aug 28, 2025
zhewenl pushed a commit to zhewenl/vllm that referenced this pull request Aug 28, 2025
mengxingkongzhouhan pushed a commit to mengxingkongzhouhan/vllm that referenced this pull request Aug 30, 2025
zhewenl pushed a commit to zhewenl/vllm that referenced this pull request Sep 3, 2025
@andylolu2
Copy link
Contributor

andylolu2 commented Sep 11, 2025

@WoosukKwon I believe there's a bug here, we should be passing itertools.chain(scheduled_new_reqs, scheduled_running_reqs, scheduled_resumed_reqs) instead of self.running to self.get_grammar_bitmask.

As indicated by this comment

# Since some requests in the RUNNING queue may not be scheduled in
# this step, the total number of scheduled requests can be smaller than
# len(self.running).

self.running != scheduled_new_reqs + scheduled_running_reqs + scheduled_resumed_reqs).

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 v1

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants