Studio: source-build arm64 Linux GPU hosts, with a CPU prebuilt fallback (#5924)
* Studio: fall back to source build for arm64 Linux GPU hosts setup.sh routes a Linux host with any GPU tool to the unslothai/llama.cpp fork, which publishes only linux-x64 bundles. On an arm64 host with a GPU (GH200, GB200, DGX Spark) the resolver then selected an x64 CUDA bundle, which cannot run on aarch64. Routing those hosts to ggml-org instead would install a CPU-only arm64 build, silently losing the GPU. Guard resolve_simple_install_release_plans so an arm64 Linux host on the fork raises PrebuiltFallback before any release is fetched, letting setup.sh do a source build that actually targets the GPU. x86_64 hosts and arm64 CPU hosts (which route to ggml-org) are unaffected. Add tests covering the arm64 fork raise, the x86_64 pass-through, and the arm64 CPU ggml-org path. * Studio: install ggml-org arm64 CPU prebuilt when the arm64 GPU source build fails Per review of #5924: arm64 Linux GPU hosts have no CUDA prebuilt anywhere (the unslothai fork is x64 only, ggml-org ships no Linux CUDA build), so they source build for the GPU. If that build produces no binary, the host was left without llama.cpp. Add a --cpu-fallback flag to install_llama_prebuilt.py that drops the host GPU attributes so the CPU prebuilt for the host arch is selected (a GPU host cannot otherwise pick the CPU bundle). setup.sh calls it against ggml-org as a last resort for arm64 Linux when the source build degraded, installing the ubuntu-arm64 CPU build instead of leaving the host with no llama.cpp. Add tests: force_cpu drops GPU attrs before planning, a CPU-forced arm64 host selects the ggml-org ubuntu-arm64 bundle, and setup.sh wires the fallback. * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
This commit is contained in:
parent
f695fbd0fe
commit
172d9d1c8e
3 changed files with 220 additions and 0 deletions
|
|
@ -1661,6 +1661,15 @@ def resolve_simple_install_release_plans(
|
|||
) -> tuple[str, list[InstallReleasePlan]]:
|
||||
repo = published_repo or DEFAULT_PUBLISHED_REPO
|
||||
requested_tag = normalized_requested_llama_tag(llama_tag)
|
||||
# The unslothai/llama.cpp fork ships only linux-x64 bundles. An arm64 Linux
|
||||
# host with a GPU (GH200/GB200/DGX Spark) routes here; it must not install an
|
||||
# x64 binary, so fall back to a source build that targets the GPU rather than
|
||||
# selecting the wrong arch (or silently dropping to a CPU arm64 build).
|
||||
if host.is_linux and not host.is_x86_64 and repo == DEFAULT_PUBLISHED_REPO:
|
||||
raise PrebuiltFallback(
|
||||
f"{repo} ships only linux-x64 prebuilts; "
|
||||
f"{host.machine or 'non-x64'} Linux falls back to source build"
|
||||
)
|
||||
allow_older_release_fallback = (
|
||||
requested_tag == "latest" and not published_release_tag
|
||||
)
|
||||
|
|
@ -6451,10 +6460,22 @@ def install_prebuilt(
|
|||
*,
|
||||
simple_policy: bool = False,
|
||||
override_has_rocm: bool = False,
|
||||
force_cpu: bool = False,
|
||||
) -> None:
|
||||
host = detect_host()
|
||||
if override_has_rocm and not host.has_rocm:
|
||||
host = dataclasses_replace(host, has_rocm = True)
|
||||
if force_cpu:
|
||||
# Explicit CPU fallback: drop GPU attributes so the CPU prebuilt for this
|
||||
# OS/arch is selected. setup.sh uses this for arm64 Linux GPU hosts whose
|
||||
# source build failed, where no arm64 CUDA prebuilt exists anywhere.
|
||||
host = dataclasses_replace(
|
||||
host,
|
||||
has_usable_nvidia = False,
|
||||
has_physical_nvidia = False,
|
||||
has_rocm = False,
|
||||
rocm_gfx_target = None,
|
||||
)
|
||||
choice: AssetChoice | None = None
|
||||
try:
|
||||
with install_lock(install_lock_path(install_dir)):
|
||||
|
|
@ -6599,6 +6620,16 @@ def parse_args() -> argparse.Namespace:
|
|||
"so the HIP llama.cpp prebuilt is selected even when hipinfo is not on PATH."
|
||||
),
|
||||
)
|
||||
parser.add_argument(
|
||||
"--cpu-fallback",
|
||||
action = "store_true",
|
||||
default = False,
|
||||
help = (
|
||||
"Select the CPU prebuilt for this OS/arch even when a GPU is present. "
|
||||
"setup.sh uses this as a last resort for arm64 Linux GPU hosts whose "
|
||||
"source build failed (no arm64 CUDA prebuilt exists anywhere)."
|
||||
),
|
||||
)
|
||||
resolve_group = parser.add_mutually_exclusive_group()
|
||||
resolve_group.add_argument(
|
||||
"--resolve-llama-tag",
|
||||
|
|
@ -6720,6 +6751,7 @@ def main() -> int:
|
|||
published_release_tag = args.published_release_tag or "",
|
||||
simple_policy = args.simple_policy,
|
||||
override_has_rocm = args.has_rocm,
|
||||
force_cpu = args.cpu_fallback,
|
||||
)
|
||||
return EXIT_SUCCESS
|
||||
|
||||
|
|
|
|||
|
|
@ -1363,6 +1363,32 @@ else
|
|||
}
|
||||
fi # end _SKIP_GGUF_BUILD check
|
||||
|
||||
# ── arm64 Linux GPU: CPU prebuilt as a last resort ──
|
||||
# arm64 Linux with a GPU has no CUDA prebuilt anywhere (the unslothai fork is
|
||||
# x64 only; ggml-org ships no Linux CUDA build), so it source-builds for the
|
||||
# GPU above. If that produced no binary, install ggml-org's arm64 CPU prebuilt
|
||||
# instead of leaving the host without llama.cpp.
|
||||
if [ "$_LLAMA_CPP_DEGRADED" = true ] \
|
||||
&& [ "$_HOST_SYSTEM" = "Linux" ] \
|
||||
&& { [ "$_HOST_MACHINE" = "aarch64" ] || [ "$_HOST_MACHINE" = "arm64" ]; }; then
|
||||
substep "GPU source build unavailable; trying ggml-org arm64 CPU prebuilt..."
|
||||
_ARM64_CPU_CMD=(
|
||||
python "$SCRIPT_DIR/install_llama_prebuilt.py"
|
||||
--install-dir "$LLAMA_CPP_DIR"
|
||||
--llama-tag "$_REQUESTED_LLAMA_TAG"
|
||||
--published-repo "ggml-org/llama.cpp"
|
||||
--simple-policy
|
||||
--cpu-fallback
|
||||
)
|
||||
# Trust the installer's exit code: it validates the server before exiting 0,
|
||||
# the same signal the primary prebuilt path above relies on.
|
||||
if run_quiet_no_exit "arm64 CPU prebuilt" "${_ARM64_CPU_CMD[@]}"; then
|
||||
step "llama.cpp" "arm64 CPU prebuilt installed (GPU build unavailable)" "$C_WARN"
|
||||
_LLAMA_CPP_DEGRADED=false
|
||||
print_installed_llama_prebuilt_release "$LLAMA_CPP_DIR"
|
||||
fi
|
||||
fi
|
||||
|
||||
# ── Footer ──
|
||||
if [ "$_LLAMA_ONLY" = "1" ]; then
|
||||
echo ""
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue