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

Upstream sync v0.4.0.post1 (merged with upstream-v0.4.0.post1) #157

Merged
merged 275 commits into from
Apr 4, 2024

Conversation

mgoin
Copy link
Member

@mgoin mgoin commented Apr 1, 2024

Merge upstream v0.4.0.post1 into aka branch 'upstream-v0.4.0.post1'

Rough commands used:

git remote add upstream https://github.com/vllm-project/vllm.git
git fetch upstream
git fetch origin
DATE=$(date '+%Y-%m-%d')
LOCAL_BRANCH=upstream-sync-${DATE}
git checkout upstream/main
git checkout a3c226e7eb19b976a937e745f3867eb05f809278 # this is v0.4.0.post1
git checkout -b upstream-v0.4.0.post1
git checkout main
git merge upstream-v0.4.0.post1

Ran ./format.sh on all the files - this was required because isort was added and needed to change import orders for most files

TEST PLAN
Nightly

AllenDou and others added 30 commits February 28, 2024 05:38
Co-authored-by: ElizaWszola <[email protected]>
Co-authored-by: Michael Goin <[email protected]>
@mgoin mgoin changed the title Upstream sync v0.4.0 (upstream-sync-2024-04-01) Upstream sync v0.4.0 + bugfixes (upstream-sync-2024-04-02) Apr 2, 2024
@mgoin mgoin changed the title Upstream sync v0.4.0 + bugfixes (upstream-sync-2024-04-02) Upstream sync v0.4.0.post1 + bugfixes (upstream-sync-2024-04-02) Apr 3, 2024
@mgoin mgoin changed the title Upstream sync v0.4.0.post1 + bugfixes (upstream-sync-2024-04-02) Upstream sync v0.4.0.post1 (merged with upstream-v0.4.0.post1) Apr 3, 2024
@mgoin mgoin merged commit 3d151aa into main Apr 4, 2024
2 checks passed
@mgoin mgoin deleted the merge-upstream-0.4.0-to-main branch April 4, 2024 00:11
@varun-sundar-rabindranath varun-sundar-rabindranath restored the merge-upstream-0.4.0-to-main branch April 4, 2024 03:40
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.