mirror of
https://github.com/pewdiepie-archdaemon/odysseus.git
synced 2026-06-15 17:25:26 -04:00
horribleCodes
9c90f62657
* fix(platform): add WSL compatibility functions and path translation fix(cookbook): enhance model scan script to support additional HuggingFace cache paths fix(hardware): improve cache key generation for remote SSH context test(tests): add tests for WSL detection and path translation functionality * fix(cookbook): prefer prebuilt wheels for llama-cpp-python and normalize package aliases * fix: enable StrictHostKeyChecking in nvidia probe refactor: consolidate ssh & powershell command execution to utility functions in core module refactor: consolidate nvidia path candidates in to single variables in core module tests: add tests for new utility functions * fix: correct wrong variable name
152 lines
6.4 KiB
Python
152 lines
6.4 KiB
Python
"""Unified-memory NVIDIA detection — Grace Blackwell GB10 / DGX Spark (#1340).
|
|
|
|
GB10 (and other unified-memory NVIDIA parts) report `nvidia-smi
|
|
--query-gpu=memory.total` as "[N/A]"/"Not Supported" because the GPU shares the
|
|
system LPDDR pool instead of carrying discrete VRAM. The detector did
|
|
`float(memory.total)` and, on the ValueError, `continue`d — dropping the only
|
|
GPU row, so a real GB10 running vLLM was reported as "No GPU" and Cookbook
|
|
recommendations/model-switching broke. These pin that such a device is detected
|
|
as a unified-memory CUDA GPU backed by system RAM, while discrete GPUs are
|
|
unchanged.
|
|
"""
|
|
|
|
import pytest
|
|
|
|
from services.hwfit import hardware
|
|
|
|
|
|
@pytest.fixture(autouse=True)
|
|
def _local(monkeypatch):
|
|
monkeypatch.setattr(hardware, "_remote_host", None)
|
|
|
|
|
|
def test_gb10_unified_memory_detected_not_dropped(monkeypatch):
|
|
# Real GB10 nvidia-smi --query-gpu=memory.total,name output: memory is N/A.
|
|
monkeypatch.setattr(hardware, "_run", lambda cmd: "[N/A], NVIDIA GB10")
|
|
monkeypatch.setattr(hardware, "_get_ram_gb", lambda: 128.0)
|
|
info = hardware._detect_nvidia()
|
|
assert info is not None, "GB10 was dropped as 'No GPU'"
|
|
assert info["gpu_name"] == "NVIDIA GB10"
|
|
assert info["backend"] == "cuda"
|
|
assert info["gpu_count"] == 1
|
|
assert info["unified_memory"] is True
|
|
assert info["gpu_vram_gb"] == 128.0 # backed by the unified RAM pool
|
|
assert hardware._last_gpu_error is None
|
|
|
|
|
|
def test_detect_system_reports_gb10_as_gpu(monkeypatch):
|
|
"""End-to-end through detect_system: has_gpu True + unified_memory propagated."""
|
|
monkeypatch.setattr(hardware, "_run", lambda cmd: "[N/A], NVIDIA GB10")
|
|
monkeypatch.setattr(hardware, "_get_ram_gb", lambda: 128.0)
|
|
monkeypatch.setattr(hardware, "_get_available_ram_gb", lambda: 120.0)
|
|
monkeypatch.setattr(hardware, "_get_cpu_count", lambda: 20)
|
|
monkeypatch.setattr(hardware, "_get_cpu_name", lambda: "NVIDIA Grace")
|
|
monkeypatch.setattr(hardware, "_detect_apple_silicon", lambda: None)
|
|
s = hardware.detect_system(fresh=True)
|
|
assert s["has_gpu"] is True
|
|
assert s["gpu_name"] == "NVIDIA GB10"
|
|
assert s["backend"] == "cuda"
|
|
assert s.get("unified_memory") is True
|
|
|
|
|
|
def test_discrete_gpu_unchanged_and_not_unified(monkeypatch):
|
|
monkeypatch.setattr(hardware, "_run", lambda cmd: "24576, NVIDIA GeForce RTX 4090")
|
|
info = hardware._detect_nvidia()
|
|
assert info["gpu_vram_gb"] == 24.0
|
|
assert info["gpu_count"] == 1
|
|
assert not info.get("unified_memory")
|
|
|
|
|
|
def test_discrete_takes_precedence_over_unified_row(monkeypatch):
|
|
"""A box with a real discrete-VRAM GPU keeps the discrete path; the
|
|
N/A-memory row is not conflated into a unified pool."""
|
|
monkeypatch.setattr(hardware, "_run", lambda cmd: "24576, NVIDIA RTX 4090\n[N/A], NVIDIA GB10")
|
|
info = hardware._detect_nvidia()
|
|
assert info["gpu_name"] == "NVIDIA RTX 4090"
|
|
assert info["gpu_count"] == 1
|
|
assert not info.get("unified_memory")
|
|
|
|
|
|
def test_no_gpu_still_none(monkeypatch):
|
|
"""No nvidia-smi output → still None, no spurious unified GPU."""
|
|
monkeypatch.setattr(hardware, "_run", lambda cmd: None)
|
|
assert hardware._detect_nvidia() is None
|
|
|
|
|
|
def test_detect_system_cache_separates_same_host_different_ports(monkeypatch):
|
|
"""Keep cache separate by host+port+platform, don't use cached data"""
|
|
ram_gb = 0
|
|
|
|
def _ram():
|
|
nonlocal ram_gb
|
|
ram_gb += 1
|
|
return ram_gb * 64.0
|
|
|
|
monkeypatch.setattr(hardware, "_get_ram_gb", _ram)
|
|
monkeypatch.setattr(hardware, "_get_available_ram_gb", lambda: 40.0)
|
|
monkeypatch.setattr(hardware, "_get_cpu_count", lambda: 16)
|
|
monkeypatch.setattr(hardware, "_get_cpu_name", lambda: "AMD Ryzen")
|
|
monkeypatch.setattr(hardware, "_detect_apple_silicon", lambda: None)
|
|
monkeypatch.setattr(hardware, "_detect_nvidia", lambda: None)
|
|
monkeypatch.setattr(hardware, "_detect_amd", lambda: None)
|
|
monkeypatch.setattr(hardware, "_run", lambda _cmd: "x86_64")
|
|
|
|
def _windows_probe():
|
|
nonlocal ram_gb
|
|
ram_gb += 1
|
|
return {
|
|
"total_ram_gb": ram_gb * 64.0,
|
|
"available_ram_gb": 40.0,
|
|
"cpu_cores": 16,
|
|
"cpu_name": "AMD Ryzen",
|
|
"has_gpu": False,
|
|
"gpu_name": None,
|
|
"gpu_vram_gb": None,
|
|
"gpu_count": 0,
|
|
"backend": "cpu_x86",
|
|
"homogeneous": True,
|
|
"gpu_error": None,
|
|
"platform": "windows",
|
|
}
|
|
|
|
monkeypatch.setattr(hardware, "_detect_windows", _windows_probe)
|
|
hardware._cache_by_host.clear()
|
|
|
|
hardware.detect_system(host="user@wsl-host", ssh_port="22", platform="linux", fresh=False)
|
|
hardware.detect_system(host="user@wsl-host", ssh_port="2222", platform="linux", fresh=False)
|
|
hardware.detect_system(host="user@wsl-host", ssh_port="22", platform="windows", fresh=False)
|
|
|
|
assert len(hardware._cache_by_host) == 3
|
|
assert hardware._cache_by_host[("user@wsl-host", "22", "linux")][1]["total_ram_gb"] == 64.0
|
|
assert hardware._cache_by_host[("user@wsl-host", "2222", "linux")][1]["total_ram_gb"] == 128.0
|
|
assert hardware._cache_by_host[("user@wsl-host", "22", "windows")][1]["total_ram_gb"] == 192.0
|
|
|
|
|
|
def test_detect_system_cache_hits_when_remote_context_matches(monkeypatch):
|
|
"""Cache hits when host+port+platform match"""
|
|
ram_gb = 0
|
|
|
|
def _ram():
|
|
nonlocal ram_gb
|
|
ram_gb += 1
|
|
return ram_gb * 64.0
|
|
|
|
monkeypatch.setattr(hardware, "_get_ram_gb", _ram)
|
|
monkeypatch.setattr(hardware, "_get_available_ram_gb", lambda: 40.0)
|
|
monkeypatch.setattr(hardware, "_get_cpu_count", lambda: 16)
|
|
monkeypatch.setattr(hardware, "_get_cpu_name", lambda: "AMD Ryzen")
|
|
monkeypatch.setattr(hardware, "_detect_apple_silicon", lambda: None)
|
|
monkeypatch.setattr(hardware, "_detect_nvidia", lambda: None)
|
|
monkeypatch.setattr(hardware, "_detect_amd", lambda: None)
|
|
monkeypatch.setattr(hardware, "_run", lambda _cmd: "x86_64")
|
|
hardware._cache_by_host.clear()
|
|
|
|
hardware.detect_system(host="user@wsl-host", ssh_port="22", platform="linux", fresh=False)
|
|
hardware.detect_system(host="user@wsl-host", ssh_port="22", platform="linux", fresh=False)
|
|
hardware.detect_system(fresh=False)
|
|
hardware.detect_system(fresh=False)
|
|
|
|
assert len(hardware._cache_by_host) == 2
|
|
assert hardware._cache_by_host[("user@wsl-host", "22", "linux")][1]["total_ram_gb"] == 64.0
|
|
assert hardware._cache_by_host[("_local", "", "")][1]["total_ram_gb"] == 128.0
|