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

Upstream sync 2024 03 14 #127

Merged
merged 114 commits into from
Mar 15, 2024
Merged

Conversation

robertgshaw2-neuralmagic
Copy link
Collaborator

@robertgshaw2-neuralmagic robertgshaw2-neuralmagic commented Mar 14, 2024

SUMMARY:

  • upstream merge (sync) up to 54be8a0

NOTES

  • Updated ruff configs had line limits. Had to clean up a lot of files manually. I think ./format.sh runs yapf and ruff only on the nm-vllm/vllm directory whereas our automation runs on everything in the nm-vllm, so it was a bit tricky for me to catch why the automation was failing. cc @varun-sundar-rabindranath please review the benchmark directory in detail

Primary upstream changes:

Kernels

Core

TEST PLAN:

  • nightly automation

ronensc and others added 30 commits February 21, 2024 18:18
Co-authored-by: zhangdacheng <[email protected]>
Co-authored-by: Woosuk Kwon <[email protected]>
Comment on lines 17 to 22
- label: Core Test
command: pytest -v -s core

- label: Core Test
command: pytest -v -s core

Copy link
Member

Choose a reason for hiding this comment

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

this looks duplicated?

@varun-sundar-rabindranath

Hey @robertgshaw2-neuralmagic - can you update the PR description with this template 7bbd2cc

something like

SUMMARY:
* upstream merge (sync) up to `54be8a0`

NOTES:
* Updated ruff configs had line limits. Had to clean up a lot of files manually. I think ./format.sh runs yapf and ruff only on the nm-vllm/vllm directory whereas our automation runs on everything in the nm-vllm, so it was a bit tricky for me to catch why the automation was failing. cc @varun-sundar-rabindranath please review the benchmark directory in detail

Primary upstream changes:
Kernels
[batched_rotary_embedding](https://github.com/vllm-project/vllm/commit/7e9bd08f60a4b18e3646ff986caeacde9ffffa53)
[gelu_tanh_and_mul](https://github.com/neuralmagic/nm-vllm/pull/127)

Core
https://github.com/vllm-project/vllm/pull/3191 <<< adds new layer of abstraction to vLLM. All should look at this

TEST PLAN:
nightly automation

removed duplicated test in buildkite (bad merge)
@robertgshaw2-neuralmagic robertgshaw2-neuralmagic merged commit b8c95c3 into main Mar 15, 2024
2 checks passed
@robertgshaw2-neuralmagic robertgshaw2-neuralmagic deleted the upstream-sync-2024-03-14 branch March 15, 2024 18:51
@robertgshaw2-neuralmagic robertgshaw2-neuralmagic restored the upstream-sync-2024-03-14 branch March 15, 2024 18:51
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.