From 4040af64a450cf967a8ee92a4ac7eb57d87011d8 Mon Sep 17 00:00:00 2001 From: navratil-matej <62650355+navratil-matej@users.noreply.github.com> Date: Thu, 3 Oct 2024 11:16:11 +0200 Subject: [PATCH 1/2] Fix LLAVA_CPP_LIB creating empty path The LLAVA_CPP_LIB environmental variable was correctly checked for, but if found, an empty path was created. --- llama_cpp/llava_cpp.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/llama_cpp/llava_cpp.py b/llama_cpp/llava_cpp.py index d9dfaf5fd0..fa84974838 100644 --- a/llama_cpp/llava_cpp.py +++ b/llama_cpp/llava_cpp.py @@ -36,7 +36,7 @@ # Specify the base name of the shared library to load _libllava_base_name = "llava" _libllava_override_path = os.environ.get("LLAVA_CPP_LIB") -_libllava_base_path = pathlib.Path(os.path.abspath(os.path.dirname(__file__))) / "lib" if _libllava_override_path is None else pathlib.Path() +_libllava_base_path = pathlib.Path(os.path.abspath(os.path.dirname(__file__))) / "lib" if _libllava_override_path is None else pathlib.Path(_libllava_override_path) # Load the library _libllava = load_shared_library(_libllava_base_name, _libllava_base_path) From 8256f4315222607a7bf531e7d6554d7be1e28d96 Mon Sep 17 00:00:00 2001 From: abetlen Date: Sun, 31 May 2026 17:49:21 -0700 Subject: [PATCH 2/2] docs: update multimodal override changelog entry --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 66f7664a33..9e6cd903b9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] -- fix: use configured multimodal library override paths by @navratil-matej in #1782 +- fix: use env var configured multimodal library override paths when loading shared libraries by @navratil-matej in #1782 - fix: avoid cleanup errors for partially initialized `LlamaModel` objects by @usernames122 in #2173 - fix: suppress stdout and stderr in Jupyter notebooks by @Anai-Guo in #2181 - feat: enable arm64 musl builds by @acon96 in #2221