70926822db* studio/setup.sh: guard empty CUDA arch detection in the source build PR #5826 hardened setup.sh for fresh CUDA toolkits, but the source build still set -DCMAKE_CUDA_ARCHITECTURES only when nvidia-smi reported a compute capability. When that query returns nothing the build proceeded with no explicit arch list, so llama.cpp built PTX only. On a driver older than the toolkit that binary fails at runtime with "the provided PTX was compiled with an unsupported toolchain" - the build succeeds, so neither the build-time check nor the CPU fallback caught it (issue #5854). Resolve the arch list before committing to a CUDA build. A new pure helper _resolve_cuda_archs parses and de-duplicates the nvidia-smi compute_cap output and honors an explicit UNSLOTH_LLAMA_CUDA_ARCHS override. When the result is empty, build CPU llama.cpp instead of a PTX-only binary, with a clear message pointing at the override - so the user still ends up with a working llama-server. The override also lets advanced users force a native build on hosts where nvidia-smi cannot report compute_cap. No behavior change when an arch is detected: -DGGML_CUDA=ON plus the arch, CUDA flags and NVCC_PREPEND_FLAGS are assembled exactly as before. Adds tests/sh/test_resolve_cuda_archs.sh (single/multi/dedup/empty/garbage/ whitespace/override cases), wired into tests/run_all.sh and the studio-backend-ci.yml shell-test loop. * studio/setup.sh: resolve nvidia-smi via /usr/bin fallback for arch detection Addresses review feedback on the empty-CUDA-arch guard: _setup_has_usable_nvidia_gpu classifies a host as NVIDIA-usable using nvidia-smi on PATH OR /usr/bin/nvidia-smi, but the new arch detection probed only `command -v nvidia-smi`. On a GPU host where nvidia-smi is off PATH (reachable only at /usr/bin), arch detection returned empty and the new empty-arch branch dropped the build to CPU, losing CUDA. Mirror the same PATH-then-/usr/bin resolution so those hosts still get a native CUDA build. Also scope _resolve_cuda_archs locals with `local` (no behavior change; it already runs under command substitution). * tests: update compute_cap-probe assertion for $_smi_bin resolution The nvidia-smi /usr/bin fallback parameterized the binary in the compute_cap probe (_setup_run_smi "$_smi_bin" ...), so the literal-string assertion in test_compute_cap_probe_timeout_wrapped no longer matched. Assert the probe is preceded by _setup_run_smi (timeout-wrapped) instead, scanning all occurrences so the comment mention is ignored. Same intent, binary-agnostic. * tests: ruff-format the compute_cap probe assertion (pre-commit) Collapse the backslash-continued assert onto one line and normalize slice spacing so the ruff-format pre-commit hook (0.6.9) is satisfied. Formatting only; no behavior change. * Tighten code comments (no logic change) * studio(windows): build CPU when CUDA arch is undetectable (#5854) The Windows source build added -DGGML_CUDA=ON unconditionally but only set -DCMAKE_CUDA_ARCHITECTURES when $CudaArch was detected. With no detectable compute capability that produced a PTX-only binary, the same hole the Linux fix closed. Build CPU llama.cpp in that case, and honor UNSLOTH_LLAMA_CUDA_ARCHS to force a CUDA build, matching setup.sh. Detected-arch builds are unchanged. * test: anchor NVCC_PREPEND_FLAGS scope check on the final CPU branch The undetectable-arch CPU fallback adds an earlier -DGGML_CUDA=OFF, so the ordering check now anchors on -DGGML_CUDA=ON and the last -DGGML_CUDA=OFF instead of the first. --------- Co-authored-by: Daniel Han <michaelhan2050@gmail.com>
68 lines
2.2 KiB
Bash
Executable file
68 lines
2.2 KiB
Bash
Executable file
#!/bin/bash
|
|
# Unit tests for _resolve_cuda_archs() from studio/setup.sh (#5854).
|
|
# Turns nvidia-smi compute_cap text into a deduped ';'-separated arch list;
|
|
# empty result signals a CPU build, and an explicit override wins.
|
|
set -e
|
|
|
|
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
|
|
SETUP_SH="$SCRIPT_DIR/../../studio/setup.sh"
|
|
PASS=0
|
|
FAIL=0
|
|
|
|
# Extract just the helper function (same sed range as the other function tests).
|
|
_FUNC_FILE=$(mktemp)
|
|
sed -n '/^_resolve_cuda_archs()/,/^}/p' "$SETUP_SH" > "$_FUNC_FILE"
|
|
|
|
assert_eq() {
|
|
_label="$1"; _expected="$2"; _actual="$3"
|
|
if [ "$_actual" = "$_expected" ]; then
|
|
echo " PASS: $_label"
|
|
PASS=$((PASS + 1))
|
|
else
|
|
echo " FAIL: $_label (expected '$_expected', got '$_actual')"
|
|
FAIL=$((FAIL + 1))
|
|
fi
|
|
}
|
|
|
|
# $1 = raw compute_cap text, $2 = override
|
|
run_resolve() {
|
|
bash -c ". '$_FUNC_FILE'; _resolve_cuda_archs \"\$1\" \"\$2\"" _ "$1" "$2"
|
|
}
|
|
|
|
echo "=== test_resolve_cuda_archs ==="
|
|
|
|
# 1) Single GPU -> single arch.
|
|
assert_eq "single 8.6" "86" "$(run_resolve "8.6" "")"
|
|
|
|
# 2) Two distinct GPUs -> both archs, order preserved.
|
|
assert_eq "distinct 8.6 + 9.0" "86;90" "$(run_resolve "$(printf '8.6\n9.0\n')" "")"
|
|
|
|
# 3) Duplicate caps (multi-GPU same model) -> deduped.
|
|
assert_eq "dedup 12.0 x2" "120" "$(run_resolve "$(printf '12.0\n12.0\n')" "")"
|
|
|
|
# 4) Empty input -> empty (the CPU-fallback signal; #5854).
|
|
assert_eq "empty input" "" "$(run_resolve "" "")"
|
|
|
|
# 5) Garbage / N/A lines are ignored -> empty.
|
|
assert_eq "garbage N/A" "" "$(run_resolve "$(printf 'N/A\n[Not Supported]\n')" "")"
|
|
|
|
# 6) Mixed valid + junk -> only the valid caps survive.
|
|
assert_eq "mixed valid+junk" "86;90" "$(run_resolve "$(printf '8.6\nfoo\n9.0\n')" "")"
|
|
|
|
# 7) Whitespace / CR around a cap is stripped.
|
|
assert_eq "whitespace stripped" "86" "$(run_resolve "$(printf ' 8.6 \r\n')" "")"
|
|
|
|
# 8) Override wins verbatim, ignoring detection.
|
|
assert_eq "override wins" "120" "$(run_resolve "8.6" "120")"
|
|
|
|
# 9) Override works even with no detected caps.
|
|
assert_eq "override no detection" "86;90" "$(run_resolve "" "86;90")"
|
|
|
|
# 10) Future arch (compute 10.0 -> 100) parses.
|
|
assert_eq "future 10.0" "100" "$(run_resolve "10.0" "")"
|
|
|
|
rm -f "$_FUNC_FILE"
|
|
|
|
echo ""
|
|
echo "Results: $PASS passed, $FAIL failed"
|
|
[ "$FAIL" -eq 0 ] || exit 1
|