Compare commits
2 commits
main
...
studio-pre
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
24931d455c | ||
|
|
70b1fe92cd |
2 changed files with 30 additions and 5 deletions
|
|
@ -4768,8 +4768,10 @@ def runtime_patterns_for_choice(choice: AssetChoice) -> list[str]:
|
||||||
# repackage the SO/DLL set (e.g. ggml-org/llama.cpp#23462 split the
|
# repackage the SO/DLL set (e.g. ggml-org/llama.cpp#23462 split the
|
||||||
# per-binary entry code into paired ``lib<binary>-impl.so`` shared
|
# per-binary entry code into paired ``lib<binary>-impl.so`` shared
|
||||||
# libraries between b9279 and b9283) without us re-enumerating
|
# libraries between b9279 and b9283) without us re-enumerating
|
||||||
# every new file. Studio only invokes llama-server and llama-quantize;
|
# every new file. Studio invokes llama-server, llama-quantize, and the
|
||||||
# other CLIs upstream ships (llama-cli, llama-bench, ...) are skipped.
|
# DiffusionGemma visual-server (when the bundle ships it, for native
|
||||||
|
# DiffusionGemma serving); other CLIs upstream ships (llama-cli,
|
||||||
|
# llama-bench, ...) are skipped.
|
||||||
if choice.install_kind in {
|
if choice.install_kind in {
|
||||||
"linux-cpu",
|
"linux-cpu",
|
||||||
"linux-cuda",
|
"linux-cuda",
|
||||||
|
|
@ -4777,9 +4779,14 @@ def runtime_patterns_for_choice(choice: AssetChoice) -> list[str]:
|
||||||
"linux-rocm",
|
"linux-rocm",
|
||||||
"linux-arm64",
|
"linux-arm64",
|
||||||
}:
|
}:
|
||||||
return ["llama-server", "llama-quantize", "lib*.so*"]
|
return ["llama-server", "llama-quantize", "llama-diffusion-gemma-visual-server", "lib*.so*"]
|
||||||
if choice.install_kind in {"macos-arm64", "macos-x64"}:
|
if choice.install_kind in {"macos-arm64", "macos-x64"}:
|
||||||
return ["llama-server", "llama-quantize", "lib*.dylib"]
|
return [
|
||||||
|
"llama-server",
|
||||||
|
"llama-quantize",
|
||||||
|
"llama-diffusion-gemma-visual-server",
|
||||||
|
"lib*.dylib",
|
||||||
|
]
|
||||||
if choice.install_kind in {
|
if choice.install_kind in {
|
||||||
"windows-cpu",
|
"windows-cpu",
|
||||||
"windows-cuda",
|
"windows-cuda",
|
||||||
|
|
@ -4787,7 +4794,12 @@ def runtime_patterns_for_choice(choice: AssetChoice) -> list[str]:
|
||||||
"windows-rocm",
|
"windows-rocm",
|
||||||
"windows-arm64",
|
"windows-arm64",
|
||||||
}:
|
}:
|
||||||
return ["llama-server.exe", "llama-quantize.exe", "*.dll"]
|
return [
|
||||||
|
"llama-server.exe",
|
||||||
|
"llama-quantize.exe",
|
||||||
|
"llama-diffusion-gemma-visual-server.exe",
|
||||||
|
"*.dll",
|
||||||
|
]
|
||||||
raise PrebuiltFallback(f"unsupported install kind for runtime overlay: {choice.install_kind}")
|
raise PrebuiltFallback(f"unsupported install kind for runtime overlay: {choice.install_kind}")
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -393,6 +393,19 @@ class TestRuntimePatterns:
|
||||||
patterns = runtime_patterns_for_choice(choice)
|
patterns = runtime_patterns_for_choice(choice)
|
||||||
assert "lib*.dylib" in patterns
|
assert "lib*.dylib" in patterns
|
||||||
|
|
||||||
|
def test_diffusion_visual_server_kept(self):
|
||||||
|
# The DiffusionGemma visual-server ships in the prebuilt bundle and must
|
||||||
|
# survive the prune so Studio can serve DiffusionGemma GGUFs natively.
|
||||||
|
for kind, name in (
|
||||||
|
("linux-cuda", "llama-diffusion-gemma-visual-server"),
|
||||||
|
("macos-arm64", "llama-diffusion-gemma-visual-server"),
|
||||||
|
("windows-cuda", "llama-diffusion-gemma-visual-server.exe"),
|
||||||
|
):
|
||||||
|
choice = AssetChoice(
|
||||||
|
repo = "", tag = "", name = "", url = "", source_label = "", install_kind = kind
|
||||||
|
)
|
||||||
|
assert name in runtime_patterns_for_choice(choice)
|
||||||
|
|
||||||
|
|
||||||
# TEST: install_llama_prebuilt.py -- HostInfo.has_rocm field
|
# TEST: install_llama_prebuilt.py -- HostInfo.has_rocm field
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue