Skip to content

Commit 5848020

Browse files
fix: use env var configured multimodal library override paths when loading shared libraries (abetlen#1782)
* 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. * docs: update multimodal override changelog entry --------- Co-authored-by: Andrei <abetlen@gmail.com>
1 parent e8ee64b commit 5848020

3 files changed

Lines changed: 3 additions & 2 deletions

File tree

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## [Unreleased]
99

10+
- fix: use env var configured multimodal library override paths when loading shared libraries by @navratil-matej in #1782
1011
- feat: add Jinja2 loop controls to chat templates by @handshape in #2018
1112
- fix: avoid cleanup errors for partially initialized `LlamaModel` objects by @usernames122 in #2173
1213
- fix: suppress stdout and stderr in Jupyter notebooks by @Anai-Guo in #2181

llama_cpp/llava_cpp.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
_libllava_base_path = (
4040
pathlib.Path(os.path.abspath(os.path.dirname(__file__))) / "lib"
4141
if _libllava_override_path is None
42-
else pathlib.Path()
42+
else pathlib.Path(_libllava_override_path)
4343
)
4444

4545
# Load the library

llama_cpp/mtmd_cpp.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
_libmtmd_base_path = (
4444
pathlib.Path(os.path.abspath(os.path.dirname(__file__))) / "lib"
4545
if _libmtmd_override_path is None
46-
else pathlib.Path()
46+
else pathlib.Path(_libmtmd_override_path)
4747
)
4848

4949
# Load the library

0 commit comments

Comments
 (0)