Skip to content

[CPU][CI] Fallback sliding window to v0 and fix CPU pooling model tests #19901

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 1 commit into from
Jun 20, 2025

Conversation

bigPYJ1151
Copy link
Contributor

@bigPYJ1151 bigPYJ1151 commented Jun 20, 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

  • Fallback models with sliding window to V0 as CPU chunked prefill attention kernel doesn't support sliding window.
  • Fix CPU embedding model tests.

Test Plan

Test Result

(Optional) Documentation Update

Signed-off-by: jiang1.li <jiang1.li@intel.com>
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 @bigPYJ1151, 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 primarily addresses compatibility issues with models utilizing sliding window attention on CPU, ensuring proper fallback to the V0 engine where the V1 CPU kernel lacks support. Additionally, it includes targeted fixes to improve the reliability and accuracy of CPU embedding model tests by accounting for these architectural limitations.

Highlights

  • CPU Sliding Window Handling: Implemented a mechanism within vllm/engine/arg_utils.py to prevent the V1 engine from being used for models that utilize sliding window attention when running on a CPU backend. This ensures a fallback to the V0 engine, as the current CPU chunked prefill attention kernel in V1 does not support sliding window.
  • CPU Embedding Model Test Fixes: Adjusted tests/models/language/pooling/test_embedding.py to correctly mark the ssmits/Qwen2-7B-Instruct-embed-base model for CPU-specific testing. Additionally, a pytest.skip condition was added for the intfloat/e5-mistral-7b-instruct model when running on CPU with V1 enabled, explicitly skipping tests for this configuration due to the lack of sliding window support in CPU V1.
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.

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.

Code Review

This pull request aims to address compatibility issues for models using sliding window attention when running on CPU, specifically by falling back to the V0 engine, and also includes fixes for CPU pooling model tests.

The code changes are well-targeted and appear correct:

  1. In vllm/engine/arg_utils.py, the modification to _is_v1_supported_oracle correctly adds logic to detect if a model with a sliding window is running on a CPU, and if so, ensures it falls back to the V0 engine. This directly implements the primary goal of the PR.
  2. In tests/models/language/pooling/test_embedding.py:
    • The test for intfloat/e5-mistral-7b-instruct is now skipped when running on CPU with the V1 engine, which is appropriate given that CPU V1 doesn't support sliding window for this model.
    • The ssmits/Qwen2-7B-Instruct-embed-base test parameterization now includes pytest.mark.cpu_model, aligning with the goal of fixing/improving CPU model tests.
    • The import of the os module is necessary for the environment variable check.

The changes are clear and directly support the PR's objectives. No medium, high, or critical issues were identified in the provided code diffs.

To further improve the pull request quality, I recommend completing the PR description by filling out the "Test Plan" and "Test Result" sections. This will help reviewers and future maintainers understand how these changes were validated.

@DarkLight1337 DarkLight1337 enabled auto-merge (squash) June 20, 2025 10:04
@github-actions github-actions bot added the ready ONLY add when PR is ready to merge/full CI is needed label Jun 20, 2025
@DarkLight1337 DarkLight1337 merged commit 79f2f1c into vllm-project:main Jun 20, 2025
76 checks passed
chris-relational pushed a commit to chris-relational/vllm that referenced this pull request Jun 20, 2025
Signed-off-by: nie3e <adrcwiek@gmail.com>
Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>

added notebooks to playground

updates

remoted verbatim HF secrets from all files

updates

[custom_op][vllm-plugin] update custom_op class to use op_registry (vllm-project#19164)

Signed-off-by: Chendi.Xue <chendi.xue@intel.com>

Export NaNs in logits to scheduler_stats if output is corrupted (vllm-project#18777)

Signed-off-by: Vlad Mihailescu <vtmihailescu@gmail.com>

[CPU][CI] Fallback sliding window to v0 and fix CPU pooling model tests (vllm-project#19901)

Signed-off-by: jiang1.li <jiang1.li@intel.com>

[Kernel] mark TorchSDPABackend swap_blocks NotImplementedError (vllm-project#19749)
yeqcharlotte pushed a commit to yeqcharlotte/vllm that referenced this pull request Jun 22, 2025
juncheoll pushed a commit to juncheoll/vllm that referenced this pull request Jun 23, 2025
…ts (vllm-project#19901)

Signed-off-by: jiang1.li <jiang1.li@intel.com>
Signed-off-by: juncheoll <th6re8e@naver.com>
fhl2000 pushed a commit to fhl2000/vllm that referenced this pull request Jun 25, 2025
…ts (vllm-project#19901)

Signed-off-by: jiang1.li <jiang1.li@intel.com>
Signed-off-by: fhl <2410591650@qq.com>
gmarinho2 pushed a commit to gmarinho2/vllm that referenced this pull request Jun 26, 2025
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants