fix(ui): show VRAM for every visible GPU

This commit is contained in:
Joseph Magly
2026-08-23 20:06:08 -04:00
parent 151c96637c
commit 5ce65e8193
5 changed files with 161 additions and 42 deletions
+51 -33
View File
@@ -935,45 +935,63 @@ def _cleanup_disk(
# ---------------------------------------------------------------------------
def _get_vram_html() -> str:
"""Return an HTML snippet showing GPU/accelerator memory usage as a styled bar."""
"""Return per-device GPU/accelerator memory usage as styled bars."""
if not dev.is_gpu_available():
return (
'<div style="text-align:center;color:#4a5568;font-size:0.72rem;'
'letter-spacing:1px;margin-top:6px;">CPU ONLY — NO GPU DETECTED</div>'
)
try:
mem = dev.get_memory_info()
used = mem.used_gb
total = mem.total_gb
pct = (used / total * 100) if total > 0 else 0
# Color shifts from green → yellow → red
if pct < 50:
bar_color = "#00ff41"
elif pct < 80:
bar_color = "#ffcc00"
else:
bar_color = "#ff003c"
device_name = mem.device_name
reserved_html = (
f'<span style="color:#4a5568;">reserved: {mem.reserved_gb:.1f} GB</span>'
if mem.reserved_gb > 0
else '<span style="color:#4a5568;">unified memory</span>'
)
return (
f'<div style="margin:6px auto 0;max-width:480px;">'
f'<div style="display:flex;justify-content:space-between;font-size:0.68rem;'
f'color:#4a5568;letter-spacing:1px;margin-bottom:2px;">'
f'<span>{device_name}</span>'
f'<span>{used:.1f} / {total:.1f} GB ({pct:.0f}%)</span></div>'
f'<div style="background:#0a0a0f;border:1px solid #1a1f2e;border-radius:3px;'
f'height:10px;overflow:hidden;">'
f'<div style="width:{min(pct, 100):.1f}%;height:100%;background:{bar_color};'
f'box-shadow:0 0 6px {bar_color};transition:width 0.5s ease;"></div></div>'
f'<div style="display:flex;justify-content:space-between;font-size:0.6rem;'
f'color:#333;margin-top:1px;">'
f'{reserved_html}</div>'
f'</div>'
)
cuda_count = dev.device_count() if dev.is_cuda() else 0
device_indices = range(cuda_count) if cuda_count else (None,)
rows = []
for device_index in device_indices:
query_index = 0 if device_index is None else device_index
device_key = "single" if device_index is None else device_index
mem = dev.get_memory_info(query_index)
used = mem.used_gb
total = mem.total_gb
pct = (used / total * 100) if total > 0 else 0
# Color shifts from green → yellow → red
if pct < 50:
bar_color = "#00ff41"
elif pct < 80:
bar_color = "#ffcc00"
else:
bar_color = "#ff003c"
device_name = (
f"GPU {device_index} · {mem.device_name}"
if device_index is not None
else mem.device_name
)
reserved_html = (
f'<span style="color:#4a5568;">reserved: {mem.reserved_gb:.1f} GB</span>'
if mem.reserved_gb > 0
else '<span style="color:#4a5568;">unified memory</span>'
)
rows.append(
f'<div data-device-index="{device_key}" '
f'style="margin:6px auto 0;max-width:480px;">'
f'<div style="display:flex;justify-content:space-between;font-size:0.68rem;'
f'color:#4a5568;letter-spacing:1px;margin-bottom:2px;">'
f'<span>{device_name}</span>'
f'<span>{used:.1f} / {total:.1f} GB ({pct:.0f}%)</span></div>'
f'<div style="background:#0a0a0f;border:1px solid #1a1f2e;border-radius:3px;'
f'height:10px;overflow:hidden;">'
f'<div style="width:{min(pct, 100):.1f}%;height:100%;background:{bar_color};'
f'box-shadow:0 0 6px {bar_color};transition:width 0.5s ease;"></div></div>'
f'<div style="display:flex;justify-content:space-between;font-size:0.6rem;'
f'color:#333;margin-top:1px;">'
f'{reserved_html}</div>'
f'</div>'
)
if cuda_count > 1:
rows.append(
'<div style="text-align:center;color:#4a5568;font-size:0.6rem;'
'margin-top:4px;">Automatic sharding uses additional GPUs as model size '
'requires; smaller models may remain on GPU 0.</div>'
)
return "".join(rows)
except Exception:
return '<div style="text-align:center;color:#4a5568;font-size:0.72rem;">Memory: unavailable</div>'
+1
View File
@@ -31,6 +31,7 @@
"obliteratus/strategies/__init__.py"
],
"required_tests": [
"tests/test_app_vram.py",
"tests/test_cli.py",
"tests/test_cli_boundaries.py",
"tests/test_module_imports.py",
+4 -4
View File
@@ -83,10 +83,10 @@ def get_device(preference: str = "auto") -> str:
)
def get_device_name() -> str:
"""Human-readable name of the current accelerator."""
def get_device_name(device_index: int = 0) -> str:
"""Human-readable name of the selected accelerator."""
if is_cuda():
return torch.cuda.get_device_name(0)
return torch.cuda.get_device_name(device_index)
if is_mps():
# Apple doesn't expose a per-chip name via MPS; use platform info.
chip = platform.processor() or "Apple Silicon"
@@ -136,7 +136,7 @@ def _system_memory_gb() -> tuple[float, float]:
def get_memory_info(device_index: int = 0) -> MemoryInfo:
"""Query memory for the given accelerator (or system RAM for MPS/CPU)."""
name = get_device_name()
name = get_device_name(device_index) if is_cuda() else get_device_name()
if is_cuda():
try:
+87
View File
@@ -0,0 +1,87 @@
"""Deterministic contracts for the Gradio accelerator-memory display."""
from __future__ import annotations
import subprocess
import sys
def test_vram_html_covers_cpu_single_and_multi_accelerator_topologies():
"""Exercise app state away from Gradio's import-time worker sockets."""
script = r'''
from types import SimpleNamespace
import app
def memory(used, reserved, total, name):
return SimpleNamespace(
used_gb=used,
reserved_gb=reserved,
total_gb=total,
device_name=name,
)
# Zero accelerators preserves the CPU-only message.
app.dev.is_gpu_available = lambda: False
html = app._get_vram_html()
assert "CPU ONLY — NO GPU DETECTED" in html
assert "data-device-index" not in html
# A single non-CUDA accelerator preserves one unified-memory row.
app.dev.is_gpu_available = lambda: True
app.dev.is_cuda = lambda: False
app.dev.get_memory_info = lambda _index=0: memory(4, 0, 16, "Apple M3 (MPS)")
html = app._get_vram_html()
assert html.count("data-device-index=") == 1
assert 'data-device-index="single"' in html
assert "Apple M3 (MPS)" in html
assert "4.0 / 16.0 GB (25%)" in html
assert "Automatic sharding" not in html
# Homogeneous CUDA devices each receive an indexed row and query.
memories = [
memory(4, 5, 80, "NVIDIA A100"),
memory(16, 20, 80, "NVIDIA A100"),
memory(72, 74, 80, "NVIDIA A100"),
]
queried = []
app.dev.is_cuda = lambda: True
app.dev.device_count = lambda: len(memories)
def memory_info(index):
queried.append(index)
return memories[index]
app.dev.get_memory_info = memory_info
html = app._get_vram_html()
assert queried == [0, 1, 2]
assert html.count("data-device-index=") == 3
assert "GPU 0 · NVIDIA A100" in html
assert "GPU 1 · NVIDIA A100" in html
assert "GPU 2 · NVIDIA A100" in html
assert "Automatic sharding uses additional GPUs" in html
# Heterogeneous device names stay aligned with their CUDA indices.
memories = [
memory(2, 3, 24, "NVIDIA RTX 4090"),
memory(8, 9, 80, "NVIDIA A100"),
]
app.dev.device_count = lambda: len(memories)
app.dev.get_memory_info = memories.__getitem__
html = app._get_vram_html()
assert "GPU 0 · NVIDIA RTX 4090" in html
assert "GPU 1 · NVIDIA A100" in html
assert html.index("GPU 0 · NVIDIA RTX 4090") < html.index("GPU 1 · NVIDIA A100")
'''
result = subprocess.run(
[sys.executable, "-c", script],
capture_output=True,
text=True,
timeout=120,
check=False,
)
assert result.returncode == 0, result.stdout + result.stderr
+18 -5
View File
@@ -45,9 +45,11 @@ def test_explicit_device_validation(monkeypatch):
def test_names_and_device_counts(monkeypatch):
monkeypatch.setattr(device, "is_cuda", lambda: True)
monkeypatch.setattr(device.torch.cuda, "get_device_name", lambda _index: "Test GPU")
names = ["Test GPU 0", "Test GPU 1", "Test GPU 2", "Test GPU 3"]
monkeypatch.setattr(device.torch.cuda, "get_device_name", names.__getitem__)
monkeypatch.setattr(device.torch.cuda, "device_count", lambda: 4)
assert device.get_device_name() == "Test GPU"
assert device.get_device_name() == "Test GPU 0"
assert device.get_device_name(3) == "Test GPU 3"
assert device.device_count() == 4
monkeypatch.setattr(device, "is_cuda", lambda: False)
@@ -88,11 +90,18 @@ def test_system_memory_sources_and_fallback(monkeypatch):
def test_memory_info_for_cuda_and_cuda_fallback(monkeypatch):
gib = 1024**3
monkeypatch.setattr(device, "is_cuda", lambda: True)
monkeypatch.setattr(device, "get_device_name", lambda: "GPU")
queried_names = []
def device_name(index=0):
queried_names.append(index)
return f"GPU {index}"
monkeypatch.setattr(device, "get_device_name", device_name)
monkeypatch.setattr(device.torch.cuda, "mem_get_info", lambda _index: (6 * gib, 8 * gib))
monkeypatch.setattr(device.torch.cuda, "memory_allocated", lambda _index: 1 * gib)
monkeypatch.setattr(device.torch.cuda, "memory_reserved", lambda _index: 2 * gib)
assert device.get_memory_info(2) == device.MemoryInfo(1, 2, 8, 6, "GPU")
assert device.get_memory_info(2) == device.MemoryInfo(1, 2, 8, 6, "GPU 2")
assert queried_names == [2]
monkeypatch.setattr(device.torch.cuda, "mem_get_info", Mock(side_effect=RuntimeError("unsupported")))
monkeypatch.setattr(
@@ -100,7 +109,11 @@ def test_memory_info_for_cuda_and_cuda_fallback(monkeypatch):
"get_device_properties",
lambda _index: SimpleNamespace(total_memory=10 * gib),
)
assert device.get_memory_info(2) == device.MemoryInfo(total_gb=10, free_gb=10, device_name="GPU")
assert device.get_memory_info(2) == device.MemoryInfo(
total_gb=10,
free_gb=10,
device_name="GPU 2",
)
def test_memory_info_for_mps_cpu_and_total_free(monkeypatch):