Skip to content
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

[ci] Use env var to control whether to use S3 bucket in CI #13634

Merged
merged 19 commits into from
Feb 23, 2025

Conversation

khluu
Copy link
Collaborator

@khluu khluu commented Feb 20, 2025

  • Revert all the changes that change model name to S3 and add load_format
  • ^ move all of that to 1 place in arg_utils where if the model is in S3 allowlist and env var is on, model name is changed to S3 and load format is changed to Run AI
  • Fix a bunch of tests
  • Some lint fixes

khluu and others added 3 commits February 20, 2025 18:46
p
Signed-off-by: kevin <kevin@anyscale.com>
p
Signed-off-by:  <>
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.

🚀

EC2 Default User added 2 commits February 21, 2025 00:01
p
Signed-off-by:  <>
p
Signed-off-by:  <>
vllm/utils.py Outdated
@@ -2268,3 +2268,73 @@ def wrapped_init(self, *args, **kwargs) -> None:

type.__setattr__(cls, '__init__', wrapped_init)
return cls


MODELS_ON_S3 = [
Copy link
Member

Choose a reason for hiding this comment

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

move them to vllm/test_utils.py ?

@@ -1124,6 +1125,10 @@ def create_engine_config(self,
f", but got {self.cpu_offload_gb}")

device_config = DeviceConfig(device=self.device)
if envs.VLLM_CI_USE_S3 and self.model in MODELS_ON_S3:
Copy link
Member

Choose a reason for hiding this comment

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

the change looks good to me.

@@ -53,13 +53,13 @@ steps:
- tests/standalone_tests/lazy_imports.py
commands:
- python3 standalone_tests/lazy_imports.py
- pytest -v -s mq_llm_engine # MQLLMEngine
- pytest -v -s async_engine # AsyncLLMEngine
- VLLM_CI_USE_S3=1 pytest -v -s mq_llm_engine # MQLLMEngine
Copy link
Member

Choose a reason for hiding this comment

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

please remove the change before merge.

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.

approve to unblock merge. please fix comments before merge.

p
Signed-off-by:  <>
Copy link

mergify bot commented Feb 21, 2025

This pull request has merge conflicts that must be resolved before it can be
merged. Please rebase the PR, @khluu.

https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/syncing-a-fork

@mergify mergify bot added the needs-rebase label Feb 21, 2025
EC2 Default User added 4 commits February 21, 2025 21:07
p
Signed-off-by:  <>
p
Signed-off-by:  <>
Signed-off-by:  <>
p
Signed-off-by:  <>
@mergify mergify bot removed the needs-rebase label Feb 22, 2025
EC2 Default User added 5 commits February 22, 2025 02:31
p
Signed-off-by:  <>
p
Signed-off-by:  <>
p
Signed-off-by:  <>
@khluu khluu marked this pull request as ready for review February 22, 2025 08:18
@khluu
Copy link
Collaborator Author

khluu commented Feb 22, 2025

pre-commit error also happens on main

@khluu khluu added the ready ONLY add when PR is ready to merge/full CI is needed label Feb 22, 2025
Copy link

mergify bot commented Feb 22, 2025

This pull request has merge conflicts that must be resolved before it can be
merged. Please rebase the PR, @khluu.

https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/syncing-a-fork

@mergify mergify bot added the needs-rebase label Feb 22, 2025
Copy link
Member

@ywang96 ywang96 left a comment

Choose a reason for hiding this comment

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

Left two comments - PTAL

Signed-off-by:  <>
@mergify mergify bot removed the needs-rebase label Feb 22, 2025
EC2 Default User added 2 commits February 22, 2025 13:32
p
Signed-off-by:  <>
Signed-off-by:  <>
@DarkLight1337
Copy link
Member

DarkLight1337 commented Feb 22, 2025

Hmm why did the CI get skipped?

p
Signed-off-by:  <>
@DarkLight1337 DarkLight1337 enabled auto-merge (squash) February 23, 2025 03:19
@simon-mo simon-mo merged commit 2c5e637 into main Feb 23, 2025
58 of 61 checks passed
@simon-mo simon-mo deleted the khluu/control_s3 branch February 23, 2025 03:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ci/build frontend ready ONLY add when PR is ready to merge/full CI is needed speculative-decoding structured-output v1
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants