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

[Rel Eng] Upstream sync 2024 06 11 #298

Merged
merged 93 commits into from
Jun 11, 2024

Conversation

robertgshaw2-neuralmagic
Copy link
Collaborator

@robertgshaw2-neuralmagic robertgshaw2-neuralmagic commented Jun 11, 2024

Upstream sync 2024 06 11 (#288)

SUMMARY:

  • Merge commits from vllm-project@1197e02 to vllm-project@114332b
  • 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@1197e02 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

dtrifiro and others added 30 commits June 11, 2024 01:17
Co-authored-by: Varun Sundar Rabindranath <varun@neuralmagic.com>
Co-authored-by: Robert Shaw <114415538+robertgshaw2-neuralmagic@users.noreply.github.com>
…e_sharded_state.py (vllm-project#5151)

Signed-off-by: Ye Cao <caoye.cao@alibaba-inc.com>
…#5184)

Co-authored-by: mgoin <michael@neuralmagic.com>
…llm-project#4927)

This PR enables the fused topk_softmax kernel used in moe layer for HIP
Signed-off-by: kevin <kevin@anyscale.com>
mgoin and others added 19 commits June 11, 2024 01:31
[Core][CUDA Graph] add output buffer for cudagraph to reduce memory footprint (vllm-project#5074)
…roject#5361)

[mis][ci/test] fix flaky test in tests/test_sharded_state_loader.py (vllm-project#5361)
Co-authored-by: Roger Wang <ywang@roblox.com>
Signed-off-by: kevin <kevin@anyscale.com>
Copy link
Member

@andy-neuma andy-neuma left a comment

Choose a reason for hiding this comment

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

cool

.buildkite/test-pipeline.yaml Show resolved Hide resolved
Copy link
Member

@andy-neuma andy-neuma left a comment

Choose a reason for hiding this comment

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

thanks.

@robertgshaw2-neuralmagic robertgshaw2-neuralmagic merged commit b9fd1d5 into main Jun 11, 2024
37 checks passed
@robertgshaw2-neuralmagic robertgshaw2-neuralmagic deleted the upstream-sync-2024-06-11 branch June 11, 2024 20:01
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.