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] Allow specifying custom Executor #6557

Merged
merged 5 commits into from
Jul 20, 2024
Merged

Conversation

Yard1
Copy link
Collaborator

@Yard1 Yard1 commented Jul 19, 2024

This PR allows the user to pass in their custom Executor and TokenizerGroup classes if they so desire. This allows easy experimentation and customized deployments.


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 Yard1 requested review from comaniac and rkooo567 July 19, 2024 01:18
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 run fastcheck CI which consists a small and essential subset of CI tests to quickly catch errors. You can run other CI tests on top of default ones by unblocking the steps in your fast-check build on Buildkite UI.

Once the PR is approved and ready to go, please make sure to run full CI as it is required to merge (or just use auto-merge).

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

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

🚀

@Yard1
Copy link
Collaborator Author

Yard1 commented Jul 19, 2024

/ready

@github-actions github-actions bot added the ready ONLY add when PR is ready to merge/full CI is needed label Jul 19, 2024
Copy link
Collaborator

@comaniac comaniac left a comment

Choose a reason for hiding this comment

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

LGTM!

@comaniac comaniac enabled auto-merge (squash) July 19, 2024 04:57
@comaniac comaniac disabled auto-merge July 19, 2024 05:01
@Yard1 Yard1 enabled auto-merge (squash) July 19, 2024 05:06
@Yard1 Yard1 disabled auto-merge July 19, 2024 05:13
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.

I prefer to make uses_ray a property + abstract class, but other than that it lgtm

vllm/executor/executor_base.py Show resolved Hide resolved
@njhill
Copy link
Member

njhill commented Jul 19, 2024

@Yard1 I'm kind of wary about making this pluggable since it's something additional that needs to be supported and may hamper our ability to evolve the architecture of these parts. Are there concrete examples / use cases of this that can be shared?

If it's just for the purpose of experimentation, it's not difficult to do that with custom changes in a separate branch?

@comaniac
Copy link
Collaborator

comaniac commented Jul 19, 2024

@Yard1 I'm kind of wary about making this pluggable since it's something additional that needs to be supported and may hamper our ability to evolve the architecture of these parts.

I consider this is not a big issue because of the following reasons:

  1. This PR only provides a more flexible way to accept custom executors without changing any existing behaviors.
  2. As mentioned in the PR description, it's mainly for development convenience, meaning that we won't encourage users to implement their custom executors. It implies that custom executors shouldn't block future architecture evolution, as custom executors are not upstreamed, after all.

Are there concrete examples / use cases of this that can be shared?
If it's just for the purpose of experimentation, it's not difficult to do that with custom changes in a separate branch?

I could provide 2 use cases as examples:

  1. We may need to develop a feature in executor/worker/model runner that would take a few weeks. However, since executor/worker/runner are the core components in vLLM and frequently changed/updated. As a result, we suffer from merging conflicts, and we have 2 options to solve this: (1) do not merge main branch until we finish development; (2) use custom executor during the development process. We don't prefer (1) because it's hard to perform integration testing along with new features in the other components of the upstream.
  2. We may have a custom executor/worker/model runner that cannot be upstreamed easily, mainly due to a temporary hacky solution for particular business use cases. In this case, our upstream steps are usually (1) delivering business needs; (2) making the solution less hacky and more general; (3) proposing an RFC to the community; (4) upstreaming the code. This process may take even a few months, and it would be super tedious if we use a separate branch.

Thanks.

@Yard1 Yard1 enabled auto-merge (squash) July 19, 2024 22:27
@njhill
Copy link
Member

njhill commented Jul 19, 2024

@comaniac @Yard1 ok fair enough! I guess we should clearly document that this isn't for general use though and could change/break at any point in future.

It implies that custom executors shouldn't block future architecture evolution, as custom executors are not upstreamed, after all.

I meant in terms of us having to avoid changing the executor structure such that it would break others' custom executors.

We may need to develop a feature in executor/worker/model runner that would take a few weeks. However, since executor/worker/runner are the core components in vLLM and frequently changed/updated. As a result, we suffer from merging conflicts

I thought that this was vLLM BAU :-) I'm not sure how the executor is special in this regard. Any large change that takes time to get merged ends up having to be regularly kept up-to-date with main (which I agree is very painful). We've had some PRs that took multiple months to get merged and required countless nontrivial conflict resolutions over that time (for example the multiproc executor, soft prompt support, ...)

@comaniac
Copy link
Collaborator

@comaniac @Yard1 ok fair enough! I guess we should clearly document that this isn't for general use though and could change/break at any point in future.

👍

I meant in terms of us having to avoid changing the executor structure such that it would break others' custom executors.

Understood. IMO it's not the OSS community's responsibility to make sure the change of executor structure won't break other's downstream custom executors.

I thought that this was vLLM BAU :-) I'm not sure how the executor is special in this regard. Any large change that takes time to get merged ends up having to be regularly kept up-to-date with main (which I agree is very painful). We've had some PRs that took multiple months to get merged and required countless nontrivial conflict resolutions over that time (for example the multiproc executor, soft prompt support, ...)

I totally understand, and that's also the motivation of this PR. Hopefully this could make our life less painful lol

@Yard1 Yard1 disabled auto-merge July 19, 2024 23:31
@Yard1
Copy link
Collaborator Author

Yard1 commented Jul 19, 2024

Added a comment to arg_utils!

@Yard1 Yard1 enabled auto-merge (squash) July 19, 2024 23:34
@Yard1 Yard1 merged commit 7bd8200 into vllm-project:main Jul 20, 2024
71 of 73 checks passed
@Yard1 Yard1 deleted the custom_executor branch July 22, 2024 22:42
xjpang pushed a commit to xjpang/vllm that referenced this pull request Jul 24, 2024
gnpinkert pushed a commit to gnpinkert/vllm that referenced this pull request Jul 26, 2024
cduk pushed a commit to cduk/vllm-pascal that referenced this pull request Aug 6, 2024
Alvant pushed a commit to compressa-ai/vllm that referenced this pull request Oct 26, 2024
KuntaiDu pushed a commit to KuntaiDu/vllm that referenced this pull request Nov 20, 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.

4 participants