Skip to content

[Models] Remove GPU-CPU sync when do_pan_and_scan=false in Gemma3 #19999

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from

Conversation

lgeiger
Copy link
Contributor

@lgeiger lgeiger commented Jun 23, 2025

When do_pan_and_scan=false we currently still doing a bit of extra preprocessing work, pass around a num_crops tensor and call num_patches.tolist(). This is not necessary and the latter causes GPU host synchronization, preventing some more CPU operations to be overlapped with GPU work:

Screenshot 2025-06-24 at 00 34 23

This PR makes num_patches tensor optional and prevents splitting image_embeds wich removes a synchronization point.

At the moment this is only a very tiny performance improvement since {scatter, gather}_mm_placeholders also cause synchronization shortly after.
This could be prevented as well with the following patch:

diff --git a/vllm/v1/worker/gpu_model_runner.py b/vllm/v1/worker/gpu_model_runner.py
index 558325fa0..5501b7583 100644
--- a/vllm/v1/worker/gpu_model_runner.py
+++ b/vllm/v1/worker/gpu_model_runner.py
@@ -1059,6 +1059,8 @@ class GPUModelRunner(LoRAModelRunnerMixin):

                 if (is_embed := pos_info.is_embed) is not None:
                     is_embed = is_embed[start_idx:end_idx]
+                    is_embed = is_embed.nonzero().squeeze(1)
+                    is_embed = is_embed.to(encoder_output.device, non_blocking=True)

                 mm_embeds_item = gather_mm_placeholders(
                     encoder_output[start_idx:end_idx],
diff --git a/vllm/v1/worker/utils.py b/vllm/v1/worker/utils.py
index 70339ff2f..cd5380e8e 100644
--- a/vllm/v1/worker/utils.py
+++ b/vllm/v1/worker/utils.py
@@ -59,7 +59,8 @@ def scatter_mm_placeholders(
         (is_embed.shape[0], embeds.shape[-1]),
         fill_value=torch.nan,
     )
-    placeholders[is_embed] = embeds
+    indices = is_embed.nonzero().squeeze(1).to(embeds.device, non_blocking=True)
+    placeholders[indices] = embeds
     return placeholders

But I think this patch is a bit cumbersome so it's probably easier to wait for pytorch/pytorch#156384 which makes GPU tensor indexing with a boolean CPU mask non-blocking.

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 @lgeiger, 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 introduces an optimization for the Gemma3 multimodal model within vLLM by removing an unnecessary GPU-CPU synchronization. It specifically targets the image processing pipeline when the do_pan_and_scan feature is not in use, streamlining the flow by making num_patches optional and avoiding redundant tensor operations and data splitting, which improves performance by allowing more CPU operations to overlap with GPU work.

Highlights

  • Performance Optimization: Eliminated an unnecessary GPU-CPU synchronization point in the Gemma3 model's image processing pipeline. This occurs when do_pan_and_scan is false, by preventing the num_patches tensor from being converted to a list (tolist()) and avoiding the splitting of image_embeds.
  • Optional num_patches Field: The num_patches field in the Gemma3ImagePixelInputs TypedDict has been made optional using typing_extensions.NotRequired, reflecting its conditional usage when pan-and-scan is not active.
  • Streamlined Image Preprocessing: Adjusted _call_hf_processor, _get_mm_fields_config, _parse_and_validate_image_input, and _process_image_input to conditionally bypass num_crops and image_embeds splitting logic when do_pan_and_scan is disabled, reducing redundant computations and data transfers.
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
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

The pull request removes GPU-CPU synchronization when do_pan_and_scan=false in Gemma3 by making the num_patches tensor optional and preventing the splitting of image_embeds. The changes look good, but I've suggested adding a few comments to improve code clarity and robustness.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant