-
Notifications
You must be signed in to change notification settings - Fork 108
Default vLLM mode to native instead of docker sidecar #4753
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
Open
claude
wants to merge
1
commit into
main
Choose a base branch
from
agent/20260414-fix-4750
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| # Copyright The Marin Authors | ||
| # SPDX-License-Identifier: Apache-2.0 | ||
|
|
||
| """Tests for marin.inference.vllm_server helpers (do not require vllm).""" | ||
|
|
||
| import pytest | ||
|
|
||
| from marin.inference.vllm_server import resolve_vllm_mode | ||
|
|
||
|
|
||
| def test_default_mode_is_native(monkeypatch): | ||
| """Default mode must be native so Iris workers without /var/run/docker.sock work out of the box.""" | ||
| monkeypatch.delenv("MARIN_VLLM_MODE", raising=False) | ||
| assert resolve_vllm_mode(None) == "native" | ||
|
|
||
|
|
||
| def test_env_var_can_select_docker(monkeypatch): | ||
| monkeypatch.setenv("MARIN_VLLM_MODE", "docker") | ||
| assert resolve_vllm_mode(None) == "docker" | ||
|
|
||
|
|
||
| def test_explicit_argument_overrides_env(monkeypatch): | ||
| monkeypatch.setenv("MARIN_VLLM_MODE", "docker") | ||
| assert resolve_vllm_mode("native") == "native" | ||
|
|
||
|
|
||
| def test_unknown_mode_raises(monkeypatch): | ||
| monkeypatch.setenv("MARIN_VLLM_MODE", "kubernetes") | ||
| with pytest.raises(ValueError, match="MARIN_VLLM_MODE"): | ||
| resolve_vllm_mode(None) |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.
Changing the fallback in
resolve_vllm_modetonativebreaks the documentedMARIN_VLLM_MODE=dockeropt-in for Ray-launched evaluators that resolve mode on the submitter but do not forward that env var to the worker (for examplesimple_evaluator.launch_evaluate_with_rayandlm_evaluation_harness_evaluator.launch_evaluate_with_ray). In that path,mode_stris computed as docker locally (so no native pip package is added), but the worker process falls back to this new default (native) becauseMARIN_VLLM_MODEis absent fromEnvironmentConfig.env_vars, causing backend/package mismatch and vLLM startup failures.Useful? React with 👍 / 👎.