-
-
Notifications
You must be signed in to change notification settings - Fork 10.7k
[Build] Make sure local main branch is synced when VLLM_USE_PRECOMPILED=1 #13921
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
Signed-off-by: Cody Yu <[email protected]>
👋 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 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 🚀 |
There was a problem hiding this 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.
Sure. I don't know we are using Python only build in the CI.. |
we have a test for it in vllm/.buildkite/test-pipeline.yaml Line 64 in cd711c4
the ci itself does not use python-only build. |
Signed-off-by: Cody Yu <[email protected]>
@youkaichao added |
There was a problem hiding this 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!
…ED=1 (vllm-project#13921) Signed-off-by: Cody Yu <[email protected]>
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]>
…ED=1 (vllm-project#13921) Signed-off-by: Cody Yu <[email protected]> Signed-off-by: Louis Ulmer <[email protected]>
…ED=1 (vllm-project#13921) Signed-off-by: Cody Yu <[email protected]>
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