forked from vllm-project/vllm
-
Notifications
You must be signed in to change notification settings - Fork 20
Add hot-swappable EXL3 MSRT expert cartridges with TP support #299
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
malaiwah
wants to merge
7
commits into
local-inference-lab:dev/gilded-gnosis
Choose a base branch
from
malaiwah:feat/exl3-lora-cartridge-clean
base: dev/gilded-gnosis
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
Show all changes
7 commits
Select commit
Hold shift + click to select a range
456227c
feat(exl3): LoRA cartridge support for MSRT additive quantization
malaiwah d057cbc
fix(exl3): harden CUDA graph cartridge hot-swap
malaiwah e161019
feat(exl3): make cartridge runtime zero-cost when inactive
malaiwah 4abd745
Run EXL3 cartridges from packed trellises
malaiwah 1b7926f
feat(exl3): drop redundant cartridge suh/svh, add hot-swap HTTP endpo…
malaiwah 7e48079
perf(exl3): restore few-active-expert grouping, cut load time, skip i…
malaiwah a7b107f
feat(exl3): enforce versioned cartridge compatibility
malaiwah 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,99 @@ | ||
| # SPDX-License-Identifier: Apache-2.0 | ||
| # SPDX-FileCopyrightText: Copyright contributors to the vLLM project | ||
|
|
||
| from unittest.mock import AsyncMock | ||
|
|
||
| from fastapi import FastAPI | ||
| from fastapi.testclient import TestClient | ||
|
|
||
| from vllm.entrypoints.serve.dev.cartridge.api_router import attach_router | ||
|
|
||
|
|
||
| def _client(engine) -> TestClient: | ||
| app = FastAPI() | ||
| attach_router(app) | ||
| app.state.engine_client = engine | ||
| return TestClient(app) | ||
|
|
||
|
|
||
| def test_load_cartridge_returns_updated_layers(): | ||
| engine = AsyncMock() | ||
| engine.load_exl3_cartridge.return_value = [2, 2] | ||
| client = _client(engine) | ||
|
|
||
| response = client.post( | ||
| "/load_exl3_cartridge", json={"adapter_path": "/tmp/cart.safetensors"} | ||
| ) | ||
|
|
||
| assert response.status_code == 200 | ||
| assert response.json() == {"status": "loaded", "updated_layers": [2, 2]} | ||
| engine.load_exl3_cartridge.assert_awaited_once_with("/tmp/cart.safetensors") | ||
|
|
||
|
|
||
| def test_load_cartridge_requires_adapter_path(): | ||
| client = _client(AsyncMock()) | ||
|
|
||
| response = client.post("/load_exl3_cartridge", json={}) | ||
|
|
||
| assert response.status_code == 400 | ||
|
|
||
|
|
||
| def test_load_cartridge_rejects_invalid_utf8_json(): | ||
| client = _client(AsyncMock()) | ||
|
|
||
| response = client.post( | ||
| "/load_exl3_cartridge", | ||
| content=b'{"adapter_path":"\xff"}', | ||
| headers={"content-type": "application/json"}, | ||
| ) | ||
|
|
||
| assert response.status_code == 400 | ||
| assert response.json() == {"detail": "Invalid JSON request body"} | ||
|
|
||
|
|
||
| def test_load_cartridge_maps_value_error_to_bad_request(): | ||
| engine = AsyncMock() | ||
| engine.load_exl3_cartridge.side_effect = ValueError("bad cartridge") | ||
| client = _client(engine) | ||
|
|
||
| response = client.post( | ||
| "/load_exl3_cartridge", json={"adapter_path": "/tmp/cart.safetensors"} | ||
| ) | ||
|
|
||
| assert response.status_code == 400 | ||
| assert response.json()["error"] == "EXL3 cartridge validation failed" | ||
| assert "bad cartridge" not in response.text | ||
|
|
||
|
|
||
| def test_deactivate_cartridge_returns_updated_layers(): | ||
| engine = AsyncMock() | ||
| engine.deactivate_exl3_cartridge.return_value = [0, 0] | ||
| client = _client(engine) | ||
|
|
||
| response = client.post("/deactivate_exl3_cartridge") | ||
|
|
||
| assert response.status_code == 200 | ||
| assert response.json() == {"status": "deactivated", "updated_layers": [0, 0]} | ||
|
|
||
|
|
||
| def test_cartridge_status_reports_active_workers(): | ||
| engine = AsyncMock() | ||
| engine.collective_rpc.return_value = [True, False] | ||
| client = _client(engine) | ||
|
|
||
| response = client.get("/exl3_cartridge_status") | ||
|
|
||
| assert response.status_code == 200 | ||
| assert response.json() == {"active": [True, False]} | ||
| engine.collective_rpc.assert_awaited_once_with("has_exl3_cartridge") | ||
|
|
||
|
|
||
| def test_endpoints_reject_engine_without_cartridge_support(): | ||
| engine = object() # no load_exl3_cartridge attribute | ||
| client = _client(engine) | ||
|
|
||
| response = client.post( | ||
| "/load_exl3_cartridge", json={"adapter_path": "/tmp/cart.safetensors"} | ||
| ) | ||
|
|
||
| assert response.status_code == 501 |
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.