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

Sync with upstream @ v0.6.2 #169

Merged
merged 152 commits into from
Sep 27, 2024
Merged

Conversation

dtrifiro
Copy link

@dtrifiro dtrifiro commented Sep 26, 2024

Related changes:

Changelog: https://github.com/vllm-project/vllm/releases/tag/v0.6.2

Isotr0py and others added 30 commits September 13, 2024 06:35
@dtrifiro
Copy link
Author

Also needs openshift/release#57233

@NickLucche
Copy link

/lgtm

Copy link

openshift-ci bot commented Sep 26, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dtrifiro, NickLucche

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:
  • OWNERS [NickLucche,dtrifiro]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@RH-steve-grubb
Copy link

This would be good to merge.

@github-actions github-actions bot changed the title Sync with upstream @ v0.6.2 Sync with [email protected] Sep 27, 2024
@openshift-ci openshift-ci bot removed the lgtm label Sep 27, 2024
@dtrifiro dtrifiro changed the title Sync with [email protected] Sync with upstream @ v0.6.2 Sep 27, 2024
Copy link

openshift-ci bot commented Sep 27, 2024

@dtrifiro: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/smoke-test 78a09a7 link true /test smoke-test

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

@RH-steve-grubb
Copy link

I did a grep for VLLM_FA_CMAKE_GPU_ARCHES. It is only referenced in the Dockerfile. No code or makefiles reference it. Searching the whole internet only finds that Dockerfile in vllm. I don't think it's used or Google would have found it in many places.

@dtrifiro
Copy link
Author

I did a grep for VLLM_FA_CMAKE_GPU_ARCHES. It is only referenced in the Dockerfile. No code or makefiles reference it. Searching the whole internet only finds that Dockerfile in vllm. I don't think it's used or Google would have found it in many places.

You're right @RH-steve-grubb, in recent builds a custom flash-attention fork has been introduced https://github.com/vllm-project/flash-attention, which is cloned in vllm's CMakelists.txt and then built.

See https://github.com/vllm-project/flash-attention/blob/main/CMakeLists.txt#L40

@RH-steve-grubb
Copy link

/lgtm

@openshift-ci openshift-ci bot added the lgtm label Sep 27, 2024
@dtrifiro dtrifiro merged commit 91b1702 into opendatahub-io:main Sep 27, 2024
19 of 21 checks passed
@dtrifiro dtrifiro deleted the sync-with-0.6.2 branch September 27, 2024 14:47
Xaenalt pushed a commit that referenced this pull request Oct 14, 2024
FILL IN THE PR DESCRIPTION HERE

FIX #xxxx (*link existing issues this PR will resolve*)

**BEFORE SUBMITTING, PLEASE READ THE CHECKLIST BELOW AND FILL IN THE
DESCRIPTION ABOVE**

---

<details>
<!-- inside this <details> section, markdown rendering does not work, so
we use raw html here. -->
<summary><b> PR Checklist (Click to Expand) </b></summary>

<p>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.</p>

<h3>PR Title and Classification</h3>
<p>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:</p>
<ul>
    <li><code>[Bugfix]</code> for bug fixes.</li>
<li><code>[CI/Build]</code> for build or continuous integration
improvements.</li>
<li><code>[Doc]</code> for documentation fixes and improvements.</li>
<li><code>[Model]</code> for adding a new model or improving an existing
model. Model name should appear in the title.</li>
<li><code>[Frontend]</code> For changes on the vLLM frontend (e.g.,
OpenAI API server, <code>LLM</code> class, etc.) </li>
<li><code>[Kernel]</code> for changes affecting CUDA kernels or other
compute kernels.</li>
<li><code>[Core]</code> for changes in the core vLLM logic (e.g.,
<code>LLMEngine</code>, <code>AsyncLLMEngine</code>,
<code>Scheduler</code>, etc.)</li>
<li><code>[Hardware][Vendor]</code> for hardware-specific changes.
Vendor name should appear in the prefix (e.g.,
<code>[Hardware][AMD]</code>).</li>
<li><code>[Misc]</code> for PRs that do not fit the above categories.
Please use this sparingly.</li>
</ul>
<p><strong>Note:</strong> If the PR spans more than one category, please
include all relevant prefixes.</p>

<h3>Code Quality</h3>

<p>The PR need to meet the following code quality standards:</p>

<ul>
<li>We adhere to <a
href="https://google.github.io/styleguide/pyguide.html">Google Python
style guide</a> and <a
href="https://google.github.io/styleguide/cppguide.html">Google C++
style guide</a>.</li>
<li>Pass all linter checks. Please use <a
href="https://github.com/vllm-project/vllm/blob/main/format.sh"><code>format.sh</code></a>
to format your code.</li>
<li>The code need to be well-documented to ensure future contributors
can easily understand the code.</li>
<li>Include sufficient tests to ensure the project to stay correct and
robust. This includes both unit tests and integration tests.</li>
<li>Please add documentation to <code>docs/source/</code> if the PR
modifies the user-facing behaviors of vLLM. It helps vLLM user
understand and utilize the new features or changes.</li>
</ul>

<h3>Notes for Large Changes</h3>
<p>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 <code>rfc-required</code>
and might not go through the PR.</p>

<h3>What to Expect for the Reviews</h3>

<p>The goal of the vLLM team is to be a <i>transparent reviewing
machine</i>. 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: </p>

<ul>
<li> 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.</li>
<li> 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.</li>
<li> After the review, the reviewer will put an <code>
action-required</code> label on the PR if there are changes required.
The contributor should address the comments and ping the reviewer to
re-review the PR.</li>
<li> 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.
 </li>
</ul>

<h3>Thank You</h3>

<p> 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! </p>


</details>

---------

Co-authored-by: Michal Adamczyk <[email protected]>
Co-authored-by: barak goldberg <[email protected]>
Co-authored-by: Michal Szutenberg <[email protected]>
Co-authored-by: Jan Kaniecki <[email protected]>
prarit pushed a commit to prarit/vllm that referenced this pull request Oct 18, 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.