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

[CI] Make mistral tests pass #4596

Merged
merged 11 commits into from
May 8, 2024
Merged

Conversation

rkooo567
Copy link
Collaborator

@rkooo567 rkooo567 commented May 4, 2024

This makes mistral tests pass with long prompts (which also tests sliding window)

The logprob comparison code comes from https://github.com/vllm-project/vllm/pull/4510/files. I'd love to merge it after this PR is merged


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!

@simon-mo
Copy link
Collaborator

simon-mo commented May 6, 2024

I don't think it the file is included in the test yaml.

@robertgshaw2-neuralmagic
Copy link
Sponsor Collaborator

I do not think this test captures the essence of what that mistral test is going after. The logprobs test is a simple smoketest for general correctness when we do not have bitwise correctness

But, we break out of the testing loop if we predict different tokens as long as the logprobs are "close"

This test looks at a long generation (to flex sliding window) ... so I do not think the logprobs strategy really makes sense here

@rkooo567
Copy link
Collaborator Author

rkooo567 commented May 6, 2024

hmm interestingly, when I use short prompt + word matching, it passes, but not with long prompt (not sure if it is sliding window is not working properly or long prompt is not suitable for exact token prediction). Maybe we can at least enable short prompt + word matching like other tests in this case. (and slinding window covered in a more clever way)

@rkooo567
Copy link
Collaborator Author

rkooo567 commented May 6, 2024

Intsead of long prompt, we are using short prompt now

@rkooo567
Copy link
Collaborator Author

rkooo567 commented May 7, 2024

Hmm wonder if there's a bug. Although the test uses bfloat16, I am seeing this error;

E       RuntimeError: expected scalar type BFloat16 but found Half
 

<br class="Apple-interchange-newline">

But I couldn't repro locally for some reasons

@rkooo567
Copy link
Collaborator Author

rkooo567 commented May 8, 2024

@simon-mo okay, I think there was a bug in our rotary embeding. I believe it is fixed.

) -> None:
# TODO(sang): Sliding window should be tested separately.
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I think this PR should cover it #4545

@@ -109,7 +109,7 @@ def _forward(
key_pass = key[..., self.rotary_dim:]

self.cos_sin_cache: torch.Tensor = self.cos_sin_cache.to(
positions.device)
positions.device, dtype=query.dtype)
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

This was a bug. we always use the default dtype, but the kernel requires it to be the same as query dtype. this breaks the kernel because cos_sin_cache dtype is sometimes float16 (default dtype) while query dtype was bfloat16

Copy link
Collaborator

Choose a reason for hiding this comment

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

I'm even surprised this is called instead of the compiled kernel

@simon-mo simon-mo merged commit f6a5930 into vllm-project:main May 8, 2024
59 checks passed
z103cb pushed a commit to z103cb/opendatahub_vllm that referenced this pull request May 9, 2024
dtrifiro pushed a commit to dtrifiro/vllm that referenced this pull request May 21, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants