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

Support for guided decoding for offline LLM #6878

Merged
merged 13 commits into from
Aug 4, 2024

Conversation

kevinbu233
Copy link
Contributor

@kevinbu233 kevinbu233 commented Jul 28, 2024

FILL IN THE PR DESCRIPTION HERE

Added support for guided decoding (JSON, regex, choice) on offline interface that is raised in issue #3536 . A refactor of #4130

FIX #3536
FIX #7030

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

👋 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.

🚀

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 implementing this! Left a few comments.

Also, it would be a good idea to implement this for AsyncLLMEngine so we can move the guided decoding logic out of the OpenAI server.

tests/entrypoints/llm/conftest.py Outdated Show resolved Hide resolved
tests/entrypoints/llm/test_guided_generate.py Outdated Show resolved Hide resolved
vllm/entrypoints/llm.py Outdated Show resolved Hide resolved
vllm/entrypoints/llm.py Outdated Show resolved Hide resolved
vllm/entrypoints/llm.py Outdated Show resolved Hide resolved
vllm/entrypoints/llm.py Outdated Show resolved Hide resolved
vllm/entrypoints/llm.py Outdated Show resolved Hide resolved
vllm/model_executor/guided_decoding/guided_fields.py Outdated Show resolved Hide resolved
vllm/model_executor/guided_decoding/guided_fields.py Outdated Show resolved Hide resolved
vllm/model_executor/guided_decoding/guided_fields.py Outdated Show resolved Hide resolved
@roG0d
Copy link

roG0d commented Aug 1, 2024

Hi, I've been tracked the guided decoding with CFG for vLLM this past week. I found this PR that points exactly to what I'm looking for.

To be on the same page: it's true that vLLM supports grammar but just with requests related to OpenAI Compatible Server?

If that's so, I would like to help and try bringing this feature forward.

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 now. You just have to run format.sh to appease the linter.

@DarkLight1337
Copy link
Member

DarkLight1337 commented Aug 1, 2024

Hi, I've been tracked the guided decoding with CFG for vLLM this past week. I found this PR that points exactly to what I'm looking for.

To be on the same page: it's true that vLLM supports grammar but just with requests related to OpenAI Compatible Server?

Yes, this PR just extends the existing functionality to offline LLM class.

If that's so, I would like to help and try bringing this feature forward.

The PR is basically complete already, thanks for offering help though!

@rkooo567
Copy link
Collaborator

rkooo567 commented Aug 1, 2024

QQ: should we deprecate logit processor API and pass the string to sampling parameter instead?

@DarkLight1337
Copy link
Member

QQ: should we deprecate logit processor API and pass the string to sampling parameter instead?

Could you elaborate on that? Not sure how would that work.

@stas00
Copy link
Contributor

stas00 commented Aug 3, 2024

@kevinbu233, can this be merged? I think there are quite a few of us who have been waiting for this feature since many moons. Thank you!

@simon-mo
Copy link
Collaborator

simon-mo commented Aug 3, 2024

/ready

@github-actions github-actions bot added the ready ONLY add when PR is ready to merge/full CI is needed label Aug 3, 2024
@simon-mo simon-mo enabled auto-merge (squash) August 3, 2024 05:54
auto-merge was automatically disabled August 3, 2024 18:41

Head branch was pushed to by a user without write access

@DarkLight1337 DarkLight1337 enabled auto-merge (squash) August 4, 2024 01:24
@DarkLight1337 DarkLight1337 merged commit 654bc5c into vllm-project:main Aug 4, 2024
65 of 67 checks passed
@stas00
Copy link
Contributor

stas00 commented Aug 4, 2024

Thank you for the quick merge!

paul-grundmann added a commit to paul-grundmann/vllm that referenced this pull request Aug 7, 2024
sfc-gh-mkeralapura pushed a commit to sfc-gh-mkeralapura/vllm that referenced this pull request Aug 12, 2024
Co-authored-by: Cyrus Leung <cyrus.tl.leung@gmail.com>
kylesayrs pushed a commit to neuralmagic/vllm that referenced this pull request Aug 17, 2024
Co-authored-by: Cyrus Leung <cyrus.tl.leung@gmail.com>
@han-steve
Copy link

Can we add a docstring for the guided_options_request param here? It's pretty hard to discover this option on the documentation.

Alvant pushed a commit to compressa-ai/vllm that referenced this pull request Oct 26, 2024
Co-authored-by: Cyrus Leung <cyrus.tl.leung@gmail.com>
KuntaiDu pushed a commit to KuntaiDu/vllm that referenced this pull request Nov 20, 2024
Co-authored-by: Cyrus Leung <cyrus.tl.leung@gmail.com>
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
7 participants