Skip to content
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

[VLM] Minor space optimization for ClipVisionModel #6436

Merged
merged 6 commits into from
Jul 15, 2024

Conversation

ywang96
Copy link
Member

@ywang96 ywang96 commented Jul 15, 2024

Previously we initialize the full ClipVisionModel and forward passes up to the required feature layer. This PR avoids loading the unused layers and initializes the model up to the required feature layer to save space on the GPU. This change makes the forward signature cleaner too.


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

👋 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 trigger fastcheck CI to run, which consists only a small and essential subset of tests to quickly catch errors with the flexibility to run extra individual tests on top (you can do this by unblocking test steps in the Buildkite run).

Full CI run is still required to merge this PR so once the PR is ready to go, please make sure to run it. If you need all test signals in between PR commits, you can trigger full CI as well.

To run full CI, you can do one of these:

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

🚀

@ywang96 ywang96 marked this pull request as ready for review July 15, 2024 05:07
@ywang96 ywang96 added the ready ONLY add when PR is ready to merge/full CI is needed label Jul 15, 2024
@ywang96 ywang96 requested a review from DarkLight1337 July 15, 2024 05:08
@ywang96
Copy link
Member Author

ywang96 commented Jul 15, 2024

Tests have passed locally - @DarkLight1337 Please take a look when you get a chance, thanks

@DarkLight1337
Copy link
Member

To avoid mutating the config object, let's move the logic of setting number of layers back inside CLIPVisionModel.__init__.

@ywang96
Copy link
Member Author

ywang96 commented Jul 15, 2024

To avoid mutating the config object, let's move the logic of setting number of layers back inside CLIPVisionModel.__init__.

I'm actually a bit skeptical about that for two reasons:

  1. The setting for the vision feature layer is often directly under model config (e.g., LlavaConfig) instead of CLIPVisionConfig - moving it inside CLIPVisionModel means we need to pass info in addition to CLIPVisionConfig when initializing.
  2. Another reason for this PR is to also make the CLIPVisionModel completely separate from the main VLM's logics, so it's easier for us to swap between vLLM implementation and transformers for future debugging.

@DarkLight1337
Copy link
Member

DarkLight1337 commented Jul 15, 2024

We can add an extra override_num_hidden_layers argument to CLIPVisionModel.__init__ that is used in place of vision_config.num_hidden_layers if passed. This lets us keep the code for determining whether/how to override this inside the main VLM file.

@ywang96
Copy link
Member Author

ywang96 commented Jul 15, 2024

@DarkLight1337 I modified the code to move the logic into CLIPVisionModel.__init__

@DarkLight1337
Copy link
Member

It seems that the config object is still being mutated inside CLIPVisionModel. Can we forward the override_num_hidden_layers argument all the way to CLIPEncoder so we don't have to touch the existing config?

@ywang96
Copy link
Member Author

ywang96 commented Jul 15, 2024

Ah I see what you meant - yea let me do that.

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.

Thanks for taking my comments into account!

@DarkLight1337 DarkLight1337 merged commit 6ae1597 into vllm-project:main Jul 15, 2024
73 checks passed
dtrifiro pushed a commit to opendatahub-io/vllm that referenced this pull request Jul 17, 2024
xjpang pushed a commit to xjpang/vllm that referenced this pull request Jul 24, 2024
Alvant pushed a commit to compressa-ai/vllm that referenced this pull request Oct 26, 2024
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