Skip to content
This repository has been archived by the owner on Oct 11, 2024. It is now read-only.

Upstream sync 2024 06 12 #302

Merged
merged 21 commits into from
Jun 12, 2024
Merged

Upstream sync 2024 06 12 #302

merged 21 commits into from
Jun 12, 2024

Conversation

robertgshaw2-redhat
Copy link
Collaborator

@robertgshaw2-redhat robertgshaw2-redhat commented Jun 12, 2024

Upstream sync 2024 06 12 (#302) - v0.5.0 of vllm

SUMMARY:

  • Merge commits from vllm-project@114332b to vllm-project@8f89d72
  • Our GCP test instances do not have gcc or clang installed. All of the triton kernels rely on the gcc and clang to generate JITs. These are still disabled (cc @andy-neuma). All are marked with:
@pytest.mark.skip("C compiler not installed in NM automation. "
                  "This codepath follows a triton pathway, which "
                  "JITs using clang or gcc. Since neither are installed "
                  "in our test instances, we need to skip this for now.")

Note that vllm-project@114332b is NOT included in this merge.

COMPARE vs UPSTREAM:

https://github.com/neuralmagic/nm-vllm/compare/upstream-sync-2024-06-11..vllm-project:vllm:v0.5.0

mgoin and others added 18 commits June 12, 2024 02:17
Co-authored-by: DarkLight1337 <[email protected]>
Co-authored-by: ywang96 <[email protected]>
Copy link
Member

@mgoin mgoin left a comment

Choose a reason for hiding this comment

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

LGTM!

@robertgshaw2-redhat robertgshaw2-redhat merged commit 5aaec10 into main Jun 12, 2024
37 checks passed
@robertgshaw2-redhat robertgshaw2-redhat deleted the upstream-sync-2024-06-12 branch June 12, 2024 22:54
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.