Skip to content

Conversation

comaniac
Copy link
Collaborator

@comaniac comaniac commented Feb 26, 2025

We currently use git merge-base main dev to find the base commit of the dev branch, and use the commit to determine which prebuilt wheel to use when installing vLLM without compilation. However, the base commit may not be up-to-date if the local main branch is out dated. Since we cannot sync the forked main branch for users, this PR verifies if the local main branch is synced with the upstream, and errors out otherwise.

cc @youkaichao

Signed-off-by: Cody Yu <[email protected]>
@github-actions
Copy link

👋 Hi! Thank you for contributing to the vLLM project.

💬 Join our developer Slack at https://slack.vllm.ai to discuss your PR in #pr-reviews, coordinate on features in #feat- channels, or join special interest groups in #sig- channels.

Just a reminder: PRs would not trigger full CI run by default. Instead, it would only run fastcheck CI which starts running only a small and essential subset of CI tests to quickly catch errors. You can run other CI tests on top of those by going to your fastcheck build on Buildkite UI (linked in the PR checks section) and unblock them. If you do not have permission to unblock, ping simon-mo or khluu to add you in our Buildkite org.

Once the PR is approved and ready to go, your PR reviewer(s) can run CI to test the changes comprehensively before merging.

To run CI, PR reviewers can either: Add ready label to the PR or enable auto-merge.

🚀

@mergify mergify bot added the ci/build label Feb 26, 2025
Copy link
Member

@youkaichao youkaichao left a comment

Choose a reason for hiding this comment

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

can you add a test env var to disable it? i'm afraid it might break the ci. we can add test env var (enabled by default), but disable it in ci, e.g. by setting it in the docer file.

@comaniac
Copy link
Collaborator Author

Sure. I don't know we are using Python only build in the CI..

@youkaichao
Copy link
Member

Sure. I don't know we are using Python only build in the CI..

we have a test for it in

- label: Python-only Installation Test

the ci itself does not use python-only build.

Signed-off-by: Cody Yu <[email protected]>
@comaniac
Copy link
Collaborator Author

@youkaichao added VLLM_TEST_USE_PRECOMPILED_NIGHTLY_WHEEL, but I feel we should really clean up the environment variables later. Another idea is enhancing VLLM_USE_PRECOMPILED to support something like VLLM_USE_PRECOMPILED=nightly.

Copy link
Member

@youkaichao youkaichao left a comment

Choose a reason for hiding this comment

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

LGTM, thanks for the fix!

@youkaichao youkaichao merged commit f35f8e2 into vllm-project:main Mar 3, 2025
19 checks passed
Akshat-Tripathi pushed a commit to krai/vllm that referenced this pull request Mar 3, 2025
russellb added a commit to russellb/vllm that referenced this pull request Mar 14, 2025
PR vllm-project#13921 added an assumption about the local `main` branch. We're
already getting the latest commit ref for `main` upstream, so using this
branch is not necessary in the rest of the logic. What we really care
about is upstream main and the git branch we're currently on.

This change should keep the same behavior, but stop looking at the
`main` branch as part of it.

Signed-off-by: Russell Bryant <[email protected]>
lulmer pushed a commit to lulmer/vllm that referenced this pull request Apr 7, 2025
shreyankg pushed a commit to shreyankg/vllm that referenced this pull request May 3, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants