mirror of
https://github.com/pewdiepie-archdaemon/odysseus.git
synced 2026-06-17 10:15:27 -04:00
fix(platform): Improve WSL SSH remote compatibility (#3316)
* 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
This commit is contained in:
@@ -47,6 +47,9 @@ _STATE_PATH = _DATA_DIR / "cookbook_state.json"
|
||||
import tempfile
|
||||
_TMUX_LOG_DIR = Path(tempfile.gettempdir()) / "odysseus-tmux"
|
||||
|
||||
from core.platform_compat import NVIDIA_PATH_CANDIDATES, SSH_PATH_OVERRIDE
|
||||
|
||||
|
||||
|
||||
def fail(msg: str, code: int = 1) -> None:
|
||||
sys.stderr.write(f"error: {msg}\n")
|
||||
@@ -160,7 +163,26 @@ def cmd_gpus(args) -> None:
|
||||
prefix = _ssh_prefix(args.host, args.ssh_port)
|
||||
cmd = prefix + (query.split() if not prefix else [query])
|
||||
try:
|
||||
out = subprocess.run(cmd, capture_output=True, text=True, timeout=15)
|
||||
if prefix:
|
||||
candidates = [query]
|
||||
args_part = query[len("nvidia-smi "):]
|
||||
candidates.append(
|
||||
"bash -lc "
|
||||
+ repr(
|
||||
f"{SSH_PATH_OVERRIDE}"
|
||||
f"nvidia-smi {args_part}"
|
||||
)
|
||||
)
|
||||
for nvidia_path in NVIDIA_PATH_CANDIDATES:
|
||||
candidates.append(f"{nvidia_path} {args_part}")
|
||||
|
||||
out = None
|
||||
for candidate in candidates:
|
||||
out = subprocess.run(prefix + [candidate], capture_output=True, text=True, timeout=15)
|
||||
if out.returncode == 0:
|
||||
break
|
||||
else:
|
||||
out = subprocess.run(cmd, capture_output=True, text=True, timeout=15)
|
||||
except FileNotFoundError:
|
||||
# No nvidia-smi locally → try the Metal fallback before giving up.
|
||||
if not prefix:
|
||||
|
||||
Reference in New Issue
Block a user