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

[Core] Change LoRA embedding sharding to support loading methods #5038

Merged
merged 32 commits into from
Jun 7, 2024

Conversation

Yard1
Copy link
Collaborator

@Yard1 Yard1 commented May 24, 2024

Implements the logic outlined in #4997 (comment) to fix multi-LoRA used together with sharded state loader. After this change, it is possible to use a sharded state saved from a base model (without enable_lora=True) with a multi-LoRA enabled model.


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!

@Yard1
Copy link
Collaborator Author

Yard1 commented May 24, 2024

@aurickq @sfc-gh-hazhang please validate?

vllm/lora/layers.py Outdated Show resolved Hide resolved
@aurickq
Copy link
Contributor

aurickq commented May 28, 2024

Just tested and it seems to be working. Thanks for the fix! CC @sfc-gh-zhwang

@sfc-gh-zhwang
Copy link
Contributor

Thanks!!

@Yard1 Yard1 requested review from zhuohan123, WoosukKwon and rkooo567 and removed request for zhuohan123 and WoosukKwon May 28, 2024 17:19
Copy link
Collaborator

@rkooo567 rkooo567 left a comment

Choose a reason for hiding this comment

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

Looks pretty good. Mostly nits and comment improvement

vllm/worker/model_runner.py Show resolved Hide resolved
vllm/model_executor/layers/vocab_parallel_embedding.py Outdated Show resolved Hide resolved
vllm/model_executor/layers/vocab_parallel_embedding.py Outdated Show resolved Hide resolved
vllm/model_executor/layers/vocab_parallel_embedding.py Outdated Show resolved Hide resolved
added_vocab_start_index * added_vocab_mask)
vocab_mask = org_vocab_mask | added_vocab_mask
input_ = vocab_mask * (input_ - combined_offset)
return input_, ~vocab_mask
Copy link
Collaborator

Choose a reason for hiding this comment

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

what is ~?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

negation

vllm/model_executor/layers/vocab_parallel_embedding.py Outdated Show resolved Hide resolved
vllm/lora/layers.py Outdated Show resolved Hide resolved
vllm/lora/layers.py Show resolved Hide resolved
@Yard1 Yard1 enabled auto-merge (squash) June 4, 2024 20:26
@WoosukKwon WoosukKwon disabled auto-merge June 7, 2024 02:07
@WoosukKwon WoosukKwon merged commit ccdc490 into vllm-project:main Jun 7, 2024
89 of 90 checks passed
@Yard1 Yard1 deleted the lora_sharding_improvement branch June 7, 2024 03:49
dtrifiro pushed a commit to opendatahub-io/vllm that referenced this pull request Jun 10, 2024
Temirulan pushed a commit to Temirulan/vllm-whisper that referenced this pull request Sep 6, 2024
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.

5 participants