[Mini-vLLM] Cut dead subsystems: models, entrypoints, backends, utils, tests
- Drop dead model modules, keeping files live imports require - Remove anthropic, cohere, codegen entrypoints and batch STT modes - Delete unused attention backends, MoE experts, and NPU/XPU util leaves - Strip dead third_party trees and ROCm leaves with no CUDA path - Remove mooncake EC connectors: dependency missing since branch base - Re-audit verified by full import sweep and Qwen3.5 smoke test Co-authored-by: Hinata <hinata@idihore.id> Signed-off-by: MOVZX <movzx@yahoo.com>
This commit is contained in:
@@ -1,23 +0,0 @@
|
||||
#!/usr/bin/env python3
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
# SPDX-FileCopyrightText: Copyright contributors to the vLLM project
|
||||
"""Check that device_count respects CUDA_VISIBLE_DEVICES after platform import."""
|
||||
|
||||
import os
|
||||
import sys
|
||||
|
||||
for key in ["CUDA_VISIBLE_DEVICES", "HIP_VISIBLE_DEVICES", "ROCR_VISIBLE_DEVICES"]:
|
||||
os.environ.pop(key, None)
|
||||
|
||||
import torch # noqa: E402
|
||||
|
||||
from vllm.platforms import current_platform # noqa: F401, E402
|
||||
|
||||
os.environ["CUDA_VISIBLE_DEVICES"] = "0"
|
||||
count = torch.accelerator.device_count()
|
||||
|
||||
if count == 0:
|
||||
sys.exit(0) # Skip: no GPUs available
|
||||
|
||||
assert count == 1, f"device_count()={count}, expected 1"
|
||||
print("OK")
|
||||
@@ -1,20 +0,0 @@
|
||||
#!/usr/bin/env python3
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
# SPDX-FileCopyrightText: Copyright contributors to the vLLM project
|
||||
"""Check that vllm.platforms import does not initialize CUDA."""
|
||||
|
||||
import os
|
||||
|
||||
for key in ["CUDA_VISIBLE_DEVICES", "HIP_VISIBLE_DEVICES", "ROCR_VISIBLE_DEVICES"]:
|
||||
os.environ.pop(key, None)
|
||||
|
||||
import torch # noqa: E402
|
||||
|
||||
assert not torch.cuda.is_initialized(), "CUDA initialized before import"
|
||||
|
||||
from vllm.platforms import current_platform # noqa: E402
|
||||
|
||||
assert not torch.cuda.is_initialized(), (
|
||||
f"CUDA was initialized during vllm.platforms import on {current_platform}"
|
||||
)
|
||||
print("OK")
|
||||
@@ -1,196 +0,0 @@
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
# SPDX-FileCopyrightText: Copyright contributors to the vLLM project
|
||||
|
||||
import ctypes
|
||||
from concurrent.futures import ThreadPoolExecutor
|
||||
|
||||
import pytest
|
||||
import torch
|
||||
|
||||
from vllm.platforms import current_platform
|
||||
|
||||
|
||||
def check_cuda_context():
|
||||
"""Check CUDA driver context status."""
|
||||
try:
|
||||
cuda = ctypes.CDLL("libcuda.so")
|
||||
device = ctypes.c_int()
|
||||
result = cuda.cuCtxGetDevice(ctypes.byref(device))
|
||||
return (True, device.value) if result == 0 else (False, None)
|
||||
except Exception:
|
||||
return False, None
|
||||
|
||||
|
||||
def run_cuda_test_in_thread(device_input, expected_device_id):
|
||||
"""Run CUDA context test in separate thread for isolation."""
|
||||
try:
|
||||
# New thread should have no CUDA context initially
|
||||
valid_before, device_before = check_cuda_context()
|
||||
if valid_before:
|
||||
return (
|
||||
False,
|
||||
"CUDA context should not exist in new thread, "
|
||||
f"got device {device_before}",
|
||||
)
|
||||
|
||||
# Test setting CUDA context
|
||||
current_platform.set_device(device_input)
|
||||
|
||||
# Verify context is created correctly
|
||||
valid_after, device_id = check_cuda_context()
|
||||
if not valid_after:
|
||||
return False, "CUDA context should be valid after set_cuda_context"
|
||||
if device_id != expected_device_id:
|
||||
return False, f"Expected device {expected_device_id}, got {device_id}"
|
||||
|
||||
return True, "Success"
|
||||
except Exception as e:
|
||||
return False, f"Exception in thread: {str(e)}"
|
||||
|
||||
|
||||
class TestSetCudaContext:
|
||||
"""Test suite for the set_cuda_context function."""
|
||||
|
||||
@pytest.mark.skipif(not current_platform.is_cuda(), reason="CUDA not available")
|
||||
@pytest.mark.parametrize(
|
||||
argnames="device_input,expected_device_id",
|
||||
argvalues=[
|
||||
(0, 0),
|
||||
(torch.device("cuda:0"), 0),
|
||||
("cuda:0", 0),
|
||||
],
|
||||
ids=["int", "torch_device", "string"],
|
||||
)
|
||||
def test_set_cuda_context_parametrized(self, device_input, expected_device_id):
|
||||
"""Test setting CUDA context in isolated threads."""
|
||||
with ThreadPoolExecutor(max_workers=1) as executor:
|
||||
future = executor.submit(
|
||||
run_cuda_test_in_thread, device_input, expected_device_id
|
||||
)
|
||||
success, message = future.result(timeout=30)
|
||||
assert success, message
|
||||
|
||||
@pytest.mark.skipif(not current_platform.is_cuda(), reason="CUDA not available")
|
||||
def test_set_cuda_context_invalid_device_type(self):
|
||||
"""Test error handling for invalid device type."""
|
||||
with pytest.raises(ValueError, match="Expected a cuda device"):
|
||||
current_platform.set_device(torch.device("cpu"))
|
||||
|
||||
|
||||
def test_get_device_capability_uses_visible_device_ordinal(monkeypatch):
|
||||
import vllm.platforms.interface as platform_interface
|
||||
from vllm.platforms.cuda import NvmlCudaPlatform, pynvml
|
||||
|
||||
seen_indices: list[int] = []
|
||||
|
||||
def record_handle(index: int) -> str:
|
||||
seen_indices.append(index)
|
||||
return f"handle-{index}"
|
||||
|
||||
monkeypatch.setattr(platform_interface, "_assigned_physical_gpu_ids", [1])
|
||||
monkeypatch.setenv(NvmlCudaPlatform.device_control_env_var, "0,1")
|
||||
monkeypatch.setattr(
|
||||
NvmlCudaPlatform,
|
||||
"device_control_id_to_physical_device_id",
|
||||
classmethod(lambda _cls, device_id: int(device_id)),
|
||||
)
|
||||
monkeypatch.setattr(pynvml, "nvmlInit", lambda: None)
|
||||
monkeypatch.setattr(pynvml, "nvmlShutdown", lambda: None)
|
||||
monkeypatch.setattr(
|
||||
pynvml,
|
||||
"nvmlDeviceGetHandleByIndex",
|
||||
record_handle,
|
||||
)
|
||||
monkeypatch.setattr(
|
||||
pynvml,
|
||||
"nvmlDeviceGetCudaComputeCapability",
|
||||
lambda _handle: (9, 0),
|
||||
)
|
||||
NvmlCudaPlatform.get_device_capability.cache_clear()
|
||||
|
||||
capability = NvmlCudaPlatform.get_device_capability(device_id=1)
|
||||
|
||||
assert capability is not None
|
||||
assert capability.to_int() == 90
|
||||
assert seen_indices == [1]
|
||||
|
||||
|
||||
def _stub_nvml(monkeypatch) -> dict[str, int]:
|
||||
"""Stub NVML to report SM 9.0 and count init/shutdown pairs.
|
||||
|
||||
Pins `NvmlCudaPlatform` rather than the `CudaPlatform` alias: that alias is
|
||||
`NonNvmlCudaPlatform` where NVML is unavailable, and that class reads
|
||||
`torch.cuda` instead, which needs a real device.
|
||||
"""
|
||||
from vllm.platforms.cuda import NvmlCudaPlatform, pynvml
|
||||
|
||||
calls = {"init": 0, "shutdown": 0}
|
||||
|
||||
monkeypatch.setattr(
|
||||
pynvml, "nvmlInit", lambda: calls.__setitem__("init", calls["init"] + 1)
|
||||
)
|
||||
monkeypatch.setattr(
|
||||
pynvml,
|
||||
"nvmlShutdown",
|
||||
lambda: calls.__setitem__("shutdown", calls["shutdown"] + 1),
|
||||
)
|
||||
# Pin the visible-device mapping so the test does not depend on whatever
|
||||
# CUDA_VISIBLE_DEVICES happens to be set to in the environment.
|
||||
monkeypatch.setenv(NvmlCudaPlatform.device_control_env_var, "0")
|
||||
monkeypatch.setattr(
|
||||
NvmlCudaPlatform,
|
||||
"device_control_id_to_physical_device_id",
|
||||
classmethod(lambda _cls, device_id: int(device_id)),
|
||||
)
|
||||
monkeypatch.setattr(
|
||||
pynvml, "nvmlDeviceGetHandleByIndex", lambda index: f"handle-{index}"
|
||||
)
|
||||
monkeypatch.setattr(
|
||||
pynvml, "nvmlDeviceGetCudaComputeCapability", lambda _handle: (9, 0)
|
||||
)
|
||||
NvmlCudaPlatform.get_device_capability.cache_clear()
|
||||
return calls
|
||||
|
||||
|
||||
def test_has_device_capability_does_not_reinit_nvml(monkeypatch):
|
||||
"""Repeated capability checks must not re-enter an NVML context.
|
||||
|
||||
`has_device_capability` only reads the cached `get_device_capability`, which
|
||||
carries its own NVML context. Wrapping it in `with_nvml_context` as well
|
||||
cost an nvmlInit()/nvmlShutdown() pair per call, and
|
||||
`triton_reshape_and_cache_flash` calls it per attention layer per step for
|
||||
fp8 and bfloat16 KV caches (issue #50381).
|
||||
"""
|
||||
from vllm.platforms.cuda import NvmlCudaPlatform
|
||||
|
||||
calls = _stub_nvml(monkeypatch)
|
||||
try:
|
||||
assert NvmlCudaPlatform.has_device_capability(80)
|
||||
for _ in range(20):
|
||||
NvmlCudaPlatform.has_device_capability(80)
|
||||
NvmlCudaPlatform.has_device_capability(89)
|
||||
NvmlCudaPlatform.has_device_capability((9, 0))
|
||||
|
||||
assert calls["init"] == 1
|
||||
assert calls["shutdown"] == 1
|
||||
finally:
|
||||
NvmlCudaPlatform.get_device_capability.cache_clear()
|
||||
|
||||
|
||||
def test_has_device_capability_comparisons(monkeypatch):
|
||||
"""Dropping the redundant NVML context must not change the answers."""
|
||||
from vllm.platforms.cuda import NvmlCudaPlatform
|
||||
|
||||
_stub_nvml(monkeypatch)
|
||||
try:
|
||||
assert NvmlCudaPlatform.has_device_capability(80)
|
||||
assert NvmlCudaPlatform.has_device_capability(90)
|
||||
assert NvmlCudaPlatform.has_device_capability((9, 0))
|
||||
assert not NvmlCudaPlatform.has_device_capability(100)
|
||||
assert not NvmlCudaPlatform.has_device_capability((10, 0))
|
||||
finally:
|
||||
NvmlCudaPlatform.get_device_capability.cache_clear()
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
pytest.main([__file__, "-v"])
|
||||
Reference in New Issue
Block a user