a3a0cb1606* Studio setup.sh: cope with fresh CUDA toolkits like 13.3 CUDA 13.3 shipped today. Three loose ends in studio/setup.sh surfaced during the llama.cpp build path: 1. setup.ps1 already aborts cleanly when the CUDA toolkit is below llama.cpp's minimum (12.4) via #4517, but setup.sh still hit the generic cmake failure described in #4437. Added a min-version check that downgrades to a CPU build for nvcc < 12.4 with a clear message pointing to the toolkit archive. 2. The first day a new CUDA toolkit ships, its host-compiler whitelist lags whatever gcc/clang the distro is on, so nvcc rejects the host compiler with a wall of "#error -- unsupported GNU version" before any real compile runs. NVCC_PREPEND_FLAGS now carries -allow-unsupported-compiler so the build moves on instead. 3. The Linux CUDA/ROCm configure failure path had no symmetry with the macOS Metal fallback: a single nvcc failure left BUILD_OK=false and no llama.cpp at all. Generalised the existing Metal -> CPU fallback to cover any GPU_BACKEND, so a CUDA configure or build failure now transparently retries with the CPU args and the user still ends up with a working llama-server. Pulled the version probe out into _nvcc_meets_llama_minimum so it can be unit-tested. Added tests/sh/test_nvcc_meets_llama_minimum.sh and two extra cases in tests/sh/test_get_torch_index_url.sh covering the legacy "CUDA Version: 13.3" header (driver-reported) and the future 13.7 case. Wired the new test into tests/run_all.sh and the studio-backend CI workflow. * tests: relax pr4562 regression to allow generic GPU fallback label * studio tests: assert setup.sh exports NVCC_PREPEND_FLAGS=-allow-unsupported-compiler The -allow-unsupported-compiler flag is the core of the fresh-CUDA-toolkit fix (it lets nvcc accept a host gcc/clang newer than its release-time whitelist, so CUDA 13.3 day-one builds do not abort on '#error -- unsupported GNU version'), but it had no automated coverage. Add a source-pattern test asserting the flag is present, delivered via NVCC_PREPEND_FLAGS so it also covers cmake's CUDA compiler-id probe, and kept out of CMAKE_ARGS for bash word-splitting safety. * studio/setup.ps1: allow unsupported host compiler for CUDA build (Windows parity) Mirror the Linux setup.sh headline fix from this PR on Windows. A freshly released CUDA toolkit ships with a host-compiler whitelist that lags the installed toolchain, so nvcc can reject the host with "#error -- unsupported Microsoft Visual Studio version!" before any real compile runs (the MSVC analogue of the gcc wall the Linux side hit on CUDA 13.3). Set NVCC_PREPEND_FLAGS=-allow-unsupported-compiler in the CUDA build branch so both cmake's configure-time CUDA compiler-id probe and the cmake --build step proceed. The flag disables the host version check only and is a no-op when the compiler is already supported. Set via the process environment (not the $CmakeArgs array), after the Refresh-Environment calls that re-sanitize CUDA env vars, and appended idempotently to any value the user already set. Validated with PowerShell 7.6.2: full setup.ps1 AST parse is clean and the snippet is idempotent (empty -> set, existing -> append once, no duplicate). Needs real Windows + CUDA CI to exercise the actual nvcc/MSVC build. Adds test_setup_ps1_exports_allow_unsupported_compiler asserting the flag is present, env-delivered, kept out of $CmakeArgs, and scoped to the CUDA-on branch. * studio: tighten code comments added in this PR Shorten the verbose multi-line comments and test docstrings introduced by this PR (setup.sh, setup.ps1, and the shell/python tests) to be succinct while preserving the rationale. No code or test-assertion changes.
121 lines
3.5 KiB
Bash
Executable file
121 lines
3.5 KiB
Bash
Executable file
#!/bin/bash
|
|
# Unit tests for _nvcc_meets_llama_minimum() from studio/setup.sh.
|
|
# llama.cpp needs CUDA toolkit >= 12.4 (#4437); setup.ps1 aborts via #4517,
|
|
# the Linux side was silent until this fix.
|
|
set -e
|
|
|
|
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
|
|
SETUP_SH="$SCRIPT_DIR/../../studio/setup.sh"
|
|
PASS=0
|
|
FAIL=0
|
|
|
|
# Extract just the helper function. The sed range is the same pattern the
|
|
# install.sh tests use.
|
|
_FUNC_FILE=$(mktemp)
|
|
sed -n '/^_nvcc_meets_llama_minimum()/,/^}/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
|
|
}
|
|
|
|
# Fake nvcc printing "release X.Y" in the canonical nvcc -V layout (the helper
|
|
# greps for "release X.Y", stable across CUDA 9.x-13.x).
|
|
make_mock_nvcc() {
|
|
_ver=$1
|
|
_dir=$(mktemp -d)
|
|
cat > "$_dir/nvcc" <<MOCK
|
|
#!/bin/sh
|
|
cat <<NV
|
|
nvcc: NVIDIA (R) Cuda compiler driver
|
|
Copyright (c) 2005-2026 NVIDIA Corporation
|
|
Cuda compilation tools, release $_ver, V${_ver}.0
|
|
NV
|
|
MOCK
|
|
chmod +x "$_dir/nvcc"
|
|
echo "$_dir/nvcc"
|
|
}
|
|
|
|
run_check() {
|
|
_nvcc=$1
|
|
bash -c ". '$_FUNC_FILE'; _nvcc_meets_llama_minimum '$_nvcc'"
|
|
}
|
|
|
|
echo "=== test_nvcc_meets_llama_minimum ==="
|
|
|
|
# 1) CUDA 12.4 is the minimum supported -> ok
|
|
_bin=$(make_mock_nvcc "12.4")
|
|
_out=$(run_check "$_bin")
|
|
assert_eq "12.4 status" "ok" "$(echo "$_out" | sed -n '1p')"
|
|
assert_eq "12.4 version" "12.4" "$(echo "$_out" | sed -n '2p')"
|
|
rm -rf "$(dirname "$_bin")"
|
|
|
|
# 2) CUDA 12.3 is the highest version that should be rejected.
|
|
_bin=$(make_mock_nvcc "12.3")
|
|
_out=$(run_check "$_bin")
|
|
assert_eq "12.3 status" "too_old" "$(echo "$_out" | sed -n '1p')"
|
|
rm -rf "$(dirname "$_bin")"
|
|
|
|
# 3) CUDA 12.1 (matches the original bug report in #4437).
|
|
_bin=$(make_mock_nvcc "12.1")
|
|
_out=$(run_check "$_bin")
|
|
assert_eq "12.1 status" "too_old" "$(echo "$_out" | sed -n '1p')"
|
|
rm -rf "$(dirname "$_bin")"
|
|
|
|
# 4) CUDA 11.8 -> too_old (anything < 12.0 is rejected).
|
|
_bin=$(make_mock_nvcc "11.8")
|
|
_out=$(run_check "$_bin")
|
|
assert_eq "11.8 status" "too_old" "$(echo "$_out" | sed -n '1p')"
|
|
rm -rf "$(dirname "$_bin")"
|
|
|
|
# 5) CUDA 12.8 -> ok (mid-range supported).
|
|
_bin=$(make_mock_nvcc "12.8")
|
|
_out=$(run_check "$_bin")
|
|
assert_eq "12.8 status" "ok" "$(echo "$_out" | sed -n '1p')"
|
|
rm -rf "$(dirname "$_bin")"
|
|
|
|
# 6) CUDA 13.0 -> ok.
|
|
_bin=$(make_mock_nvcc "13.0")
|
|
_out=$(run_check "$_bin")
|
|
assert_eq "13.0 status" "ok" "$(echo "$_out" | sed -n '1p')"
|
|
rm -rf "$(dirname "$_bin")"
|
|
|
|
# 7) CUDA 13.3 -> ok (the freshly shipped toolkit this fix targets).
|
|
_bin=$(make_mock_nvcc "13.3")
|
|
_out=$(run_check "$_bin")
|
|
assert_eq "13.3 status" "ok" "$(echo "$_out" | sed -n '1p')"
|
|
assert_eq "13.3 version" "13.3" "$(echo "$_out" | sed -n '2p')"
|
|
rm -rf "$(dirname "$_bin")"
|
|
|
|
# 8) Future CUDA 14.0 -> ok (no upper bound).
|
|
_bin=$(make_mock_nvcc "14.0")
|
|
_out=$(run_check "$_bin")
|
|
assert_eq "14.0 status" "ok" "$(echo "$_out" | sed -n '1p')"
|
|
rm -rf "$(dirname "$_bin")"
|
|
|
|
# 9) Empty argument -> unknown (defensive; never block the build on detection).
|
|
_out=$(run_check "")
|
|
assert_eq "empty path status" "unknown" "$(echo "$_out" | sed -n '1p')"
|
|
|
|
# 10) Mock nvcc that prints garbage -> unknown.
|
|
_dir=$(mktemp -d)
|
|
cat > "$_dir/nvcc" <<'MOCK'
|
|
#!/bin/sh
|
|
echo "totally not nvcc output"
|
|
MOCK
|
|
chmod +x "$_dir/nvcc"
|
|
_out=$(run_check "$_dir/nvcc")
|
|
assert_eq "garbage output status" "unknown" "$(echo "$_out" | sed -n '1p')"
|
|
rm -rf "$_dir"
|
|
|
|
rm -f "$_FUNC_FILE"
|
|
|
|
echo ""
|
|
echo "Results: $PASS passed, $FAIL failed"
|
|
[ "$FAIL" -eq 0 ] || exit 1
|