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

[Bugfix] Fix vLLM UsageInfo and logprobs None AssertionError with empty token_ids #9034

Merged
merged 4 commits into from
Oct 15, 2024

Conversation

CatherineSue
Copy link
Contributor

When there is no new tokens generated, Sequence.get_output_token_ids_to_return should return empty list.

FILL IN THE PR DESCRIPTION HERE

FIX #8988 (link existing issues this PR will resolve)

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.

Adding or changing kernels

Each custom kernel needs a schema and one or more implementations to be registered with PyTorch.

  • Make sure custom ops are registered following PyTorch guidelines: Custom C++ and CUDA Operators and The Custom Operators Manual
  • Custom operations that return Tensors require meta-functions. Meta-functions should be implemented and registered in python so that dynamic dims can be handled automatically. See above documents for a description of meta-functions.
  • Use torch.libary.opcheck() to test the function registration and meta-function for any registered ops. See tests/kernels for examples.
  • When changing the C++ signature of an existing op, the schema must be updated to reflect the changes.
  • If a new custom type is needed, see the following document: Custom Class Support in PT2.

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!

When there is no new tokens generated, Sequence.get_output_token_ids_to_return should return empty list.
Copy link

github-actions bot commented Oct 3, 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.

🚀

@DarkLight1337 DarkLight1337 requested a review from njhill October 3, 2024 02:57
Copy link
Member

@njhill njhill left a comment

Choose a reason for hiding this comment

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

Thanks @CatherineSue and thanks for adding the test!

@njhill
Copy link
Member

njhill commented Oct 3, 2024

@CatherineSue looks like the test is failing, the max context for the model used is 8k token, would that be sufficient to expose the issue?

@CatherineSue
Copy link
Contributor Author

Oh I saw in the server fixture in test_chat.py we set --max-model-len to 8192.
I tested it locally, --max-model-len to 8192 and zephry model is not gonna trigger the issue.

In our test, we used llama3.2-1b-instruct and llama3.2-3b-instruct, with --max-model-len=131072, and a prompt with 2000 tokens can expose it. Can we use llama3.2 model in CI?

@njhill
Copy link
Member

njhill commented Oct 3, 2024

@CatherineSue I don't see why not, we already use other llama models elsewhere in the CI (would probably make sense to move most/all that usage to the 1B model now anyhow).

@CatherineSue
Copy link
Contributor Author

@njhill sorry for the late updates. I was sick for the past two weeks and didn't get time to fix the ut.
I tried to use llama3.2-1b-instruct, but the CI raises:

FAILED entrypoints/openai/test_chat.py::test_chat_completion_stream_options_and_logprobs_with_long_prompts[meta-llama/Llama-3.2-1B-Instruct] - openai.NotFoundError: Error code: 404 - {'object': 'error', 'message': 'The model `meta-llama/Llama-3.2-1B-Instruct` does not exist.', 'type': 'NotFoundError', 'param': None, 'code': 404}

Emm do we need to pass specific HF_TOKEN for the CI?

@njhill
Copy link
Member

njhill commented Oct 15, 2024

@CatherineSue no problem, sorry to hear that and I hope you're feeling better. Actually I had just started to look at this myself, and have written a separate test that uses a smaller max_num_batched_tokens to force prompt chunking without needing a very long context. This also reproduces the issue.

In the process of doing that I also found some related bugs. In any case I'm happy to push those updates to your branch so feel free to leave this and I'll do it soon (hopefully tonight).

@njhill
Copy link
Member

njhill commented Oct 15, 2024

OK @CatherineSue I have pushed the additional test, as well as changes to omit redundant empty chunks being returned to the user in this case. Hopefully this is good to go now!

@njhill njhill added the ready ONLY add when PR is ready to merge/full CI is needed label Oct 15, 2024
@simon-mo simon-mo merged commit ba30942 into vllm-project:main Oct 15, 2024
63 of 66 checks passed
charlifu pushed a commit to charlifu/vllm that referenced this pull request Oct 23, 2024
vrdn-23 pushed a commit to vrdn-23/vllm that referenced this pull request Oct 23, 2024
Alvant pushed a commit to compressa-ai/vllm that referenced this pull request Oct 26, 2024
garg-amit pushed a commit to garg-amit/vllm that referenced this pull request Oct 28, 2024
FerdinandZhong pushed a commit to FerdinandZhong/vllm that referenced this pull request Oct 29, 2024
sumitd2 pushed a commit to sumitd2/vllm that referenced this pull request Nov 14, 2024
KuntaiDu pushed a commit to KuntaiDu/vllm that referenced this pull request Nov 20, 2024
mfournioux pushed a commit to mfournioux/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.

[Bug]: openai.serving_chat tries to call _create_chat_logprobs when the output.text is empty
3 participants