Skip to content

Conversation

alex-jw-brooks
Copy link
Contributor

This PR finishes exposing multi-image support for Qwen-VL (not Qwen2) as follow-up to #8029.

Multi-image offline inference example (.generate)

from vllm import LLM, SamplingParams
from vllm.multimodal.utils import fetch_image

question = "Can you compare these images?"
image_urls = [
    "https://upload.wikimedia.org/wikipedia/commons/d/da/2015_Kaczka_krzy%C5%BCowka_w_wodzie_%28samiec%29.jpg",
    "https://upload.wikimedia.org/wikipedia/commons/7/77/002_The_lion_king_Snyggve_in_the_Serengeti_National_Park_Photo_by_Giles_Laurent.jpg",
]

llm = LLM(
    model="Qwen/Qwen-VL-Chat",
    trust_remote_code=True,
    limit_mm_per_prompt={"image": len(image_urls)},
    dtype="half"
)


get_img_prompt = lambda img_num: f"Picture {img_num}: <img></img>\n"
placeholders = "".join(get_img_prompt(i) for i, _ in enumerate(image_urls, start=1))
prompt = f"<|im_start|>user\n{placeholders}{question}\n<|im_end|>\n<|im_start|>assistant\n"

sampling_params = SamplingParams(temperature=0.2, max_tokens=64)

outputs = llm.generate({
        "prompt": prompt,
        "multi_modal_data": {
            "image": [fetch_image(url) for url in image_urls]
        },
    },
    sampling_params=sampling_params
)

for o in outputs:
    generated_text = o.outputs[0].text
    print(generated_text)
The two images shown are different. The first image is of a male mallard duck swimming in a body of water, while the second image is of a male lion resting in the tall grass. The two images are unrelated and cannot be compared.<|im_end|>

Chat example:

Image numbering is already handled properly in the chat utils, so no extra changes needed there.

Server:

python -m vllm.entrypoints.openai.api_server \
    --device cuda \
    --model Qwen/Qwen-VL-Chat \
    --api-key token-abc123 \
    --chat-template examples/template_chatml.jinja \
    --tokenizer Qwen/Qwen-VL-Chat \
    --dtype=half \
    --limit-mm-per-prompt image=2 \
    --trust-remote-code &

Client:

from openai import OpenAI

client = OpenAI(base_url="http://localhost:8000/v1", api_key="token-abc123")

completion = client.chat.completions.create(
  model="Qwen/Qwen-VL-Chat",
  messages=[
    {
        "role": "user", "content": [
          {"type": "image_url", "image_url": {"url": "https://upload.wikimedia.org/wikipedia/commons/d/da/2015_Kaczka_krzy%C5%BCowka_w_wodzie_%28samiec%29.jpg"}},
          {"type": "image_url", "image_url": {"url": "https://upload.wikimedia.org/wikipedia/commons/7/77/002_The_lion_king_Snyggve_in_the_Serengeti_National_Park_Photo_by_Giles_Laurent.jpg"}},
          {"type": "text", "text": "Can you compare these images?"},
        ]
    }
  ]
)

print(completion.choices[0].message)
ChatCompletionMessage(content='The images shown are different and cannot be compared. Image 1 is a duck swimming in water, and Image 2 is a lion lying in the grass. They are completely different in both content and subject.<|im_end|>\n', refusal=None, role='assistant', function_call=None, tool_calls=[])

BEFORE SUBMITTING, PLEASE READ THE CHECKLIST BELOW AND FILL IN THE DESCRIPTION ABOVE


PR Checklist (Click to Expand)

Thank you for your contribution to vLLM! Before submitting the pull request, please ensure the PR meets the following criteria. This helps vLLM maintain the code quality and improve the efficiency of the review process.

PR Title and Classification

Only specific types of PRs will be reviewed. The PR title is prefixed appropriately to indicate the type of change. Please use one of the following:

  • [Bugfix] for bug fixes.
  • [CI/Build] for build or continuous integration improvements.
  • [Doc] for documentation fixes and improvements.
  • [Model] for adding a new model or improving an existing model. Model name should appear in the title.
  • [Frontend] For changes on the vLLM frontend (e.g., OpenAI API server, LLM class, etc.)
  • [Kernel] for changes affecting CUDA kernels or other compute kernels.
  • [Core] for changes in the core vLLM logic (e.g., LLMEngine, AsyncLLMEngine, Scheduler, etc.)
  • [Hardware][Vendor] for hardware-specific changes. Vendor name should appear in the prefix (e.g., [Hardware][AMD]).
  • [Misc] for PRs that do not fit the above categories. Please use this sparingly.

Note: If the PR spans more than one category, please include all relevant prefixes.

Code Quality

The PR need to meet the following code quality standards:

  • We adhere to Google Python style guide and Google C++ style guide.
  • Pass all linter checks. Please use format.sh to format your code.
  • The code need to be well-documented to ensure future contributors can easily understand the code.
  • Include sufficient tests to ensure the project to stay correct and robust. This includes both unit tests and integration tests.
  • Please add documentation to docs/source/ if the PR modifies the user-facing behaviors of vLLM. It helps vLLM user understand and utilize the new features or changes.

Notes for Large Changes

Please keep the changes as concise as possible. For major architectural changes (>500 LOC excluding kernel/data/config/test), we would expect a GitHub issue (RFC) discussing the technical design and justification. Otherwise, we will tag it with rfc-required and might not go through the PR.

What to Expect for the Reviews

The goal of the vLLM team is to be a transparent reviewing machine. We would like to make the review process transparent and efficient and make sure no contributor feel confused or frustrated. However, the vLLM team is small, so we need to prioritize some PRs over others. Here is what you can expect from the review process:

  • After the PR is submitted, the PR will be assigned to a reviewer. Every reviewer will pick up the PRs based on their expertise and availability.
  • After the PR is assigned, the reviewer will provide status update every 2-3 days. If the PR is not reviewed within 7 days, please feel free to ping the reviewer or the vLLM team.
  • After the review, the reviewer will put an action-required label on the PR if there are changes required. The contributor should address the comments and ping the reviewer to re-review the PR.
  • Please respond to all comments within a reasonable time frame. If a comment isn't clear or you disagree with a suggestion, feel free to ask for clarification or discuss the suggestion.

Thank You

Finally, thank you for taking the time to read these guidelines and for your interest in contributing to vLLM. Your contributions make vLLM a great tool for everyone!

Copy link

github-actions bot commented Sep 6, 2024

👋 Hi! Thank you for contributing to the vLLM project.
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 do one of these:

  • Add ready label to the PR
  • Enable auto-merge.

🚀

@alex-jw-brooks
Copy link
Contributor Author

FYI @DarkLight1337 since you reviewed the main PR for qwen-vl! 🙂

@alex-jw-brooks alex-jw-brooks changed the title Support multiple images for qwen-vl [Model] Support multiple images for qwen-vl Sep 6, 2024
@DarkLight1337
Copy link
Member

Could you add a test to verify the behavior of this model?

After #8201 is merged, can you update the example script for multi-image input to include this model as well?

@alex-jw-brooks
Copy link
Contributor Author

alex-jw-brooks commented Sep 7, 2024

Yup, definitely! I had recently started working on some stuff around the image processor to allow kwargs to be passed through as overrides for stuff pulled from the HF config - but before that, I was planning to open a PR to add some common test utils for building an InputContext and some dummy data for different multimodal models to test correctness of custom input mappers / processors, with tests for a few models as examples. I think it would be nice to have fast tests that only test the preprocessing correctness that can run without loading the full models.

I had started writing those tests for this model already - do you have any thoughts on adding those here to test this PR? Happy to do that and then submit a follow-up refactoring common stuff out + adding some tests for other models, or if you think it would be better, just adding an end-to-end test here for now and adding preprocessing tests in a separate PR

@DarkLight1337
Copy link
Member

DarkLight1337 commented Sep 7, 2024

I had started writing those tests for this model already - do you have any thoughts on adding those here to test this PR?

Sure!

Happy to do that and then submit a follow-up refactoring common stuff out + adding some tests for other models, or if you think it would be better, just adding an end-to-end test here for now and adding preprocessing tests in a separate PR

I'm currently working on #7820, perhaps it would be best to refactor the tests after that to avoid introducing a bunch of merge conflicts.

@alex-jw-brooks
Copy link
Contributor Author

Perfect, I'll add them to the test file to this model for now, and wait until after that's merged before making stuff common and adding similar tests for some other models 😄

@alex-jw-brooks alex-jw-brooks force-pushed the qwenvl_multi_image branch 2 times, most recently from b6f910c to ea86cd3 Compare September 9, 2024 08:48
@DarkLight1337
Copy link
Member

DarkLight1337 commented Sep 9, 2024

Can we have an end-to-end correctness test for multi-image input just like the other models?

Otherwise LGTM!

Copy link
Member

@DarkLight1337 DarkLight1337 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 for your help again!

@DarkLight1337 DarkLight1337 enabled auto-merge (squash) September 11, 2024 01:08
@github-actions github-actions bot added the ready ONLY add when PR is ready to merge/full CI is needed label Sep 11, 2024
@DarkLight1337
Copy link
Member

Can you merge main into this branch to fix the CI failure?

@alex-jw-brooks
Copy link
Contributor Author

alex-jw-brooks commented Sep 11, 2024

No problem, thanks a lot for the quick reviews! Just did 🙂

Seems like there are still some failures, but they're unrelated (for marlin moe)

@DarkLight1337
Copy link
Member

Sorry I forgot about this, Qwen2-VL has just been released so you have to update the examples file.

@alex-jw-brooks
Copy link
Contributor Author

No worries at all, that's great news! Just rebased 😄

@DarkLight1337 DarkLight1337 enabled auto-merge (squash) September 12, 2024 04:30
@WoosukKwon WoosukKwon disabled auto-merge September 12, 2024 17:10
@WoosukKwon WoosukKwon merged commit c6202da into vllm-project:main Sep 12, 2024
50 of 51 checks passed
Alvant pushed a commit to compressa-ai/vllm that referenced this pull request Oct 26, 2024
Signed-off-by: Alex-Brooks <[email protected]>
Co-authored-by: Cyrus Leung <[email protected]>
Co-authored-by: DarkLight1337 <[email protected]>
Signed-off-by: Alvant <[email protected]>
LeiWang1999 pushed a commit to LeiWang1999/vllm-bitblas that referenced this pull request Mar 26, 2025
Signed-off-by: Alex-Brooks <[email protected]>
Co-authored-by: Cyrus Leung <[email protected]>
Co-authored-by: DarkLight1337 <[email protected]>
Signed-off-by: LeiWang1999 <[email protected]>
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.

3 participants