misc: Install shared libraries to lib subdirectory

abetlen · abetlen · commit c546c94b4806 · 2024-07-01T22:03:19.000-04:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -8,11 +8,13 @@ option(LLAVA_BUILD "Build llava shared library and install alongside python pack
 if(SKBUILD_STATE STREQUAL "editable")
     # Install into the source directory
     # Temporary fix for https://github.com/scikit-build/scikit-build-core/issues/374
-    set(LLAMA_CPP_PYTHON_INSTALL_DIR ${CMAKE_CURRENT_SOURCE_DIR}/llama_cpp)
+    set(LLAMA_CPP_PYTHON_INSTALL_DIR ${CMAKE_CURRENT_SOURCE_DIR}/llama_cpp/lib)
 else()
-    set(LLAMA_CPP_PYTHON_INSTALL_DIR ${SKBUILD_PLATLIB_DIR}/llama_cpp)
+    set(LLAMA_CPP_PYTHON_INSTALL_DIR ${SKBUILD_PLATLIB_DIR}/llama_cpp/lib)
 endif()
 
+message(STATUS "LLAMA_CPP_PYTHON_INSTALL_DIR: ${LLAMA_CPP_PYTHON_INSTALL_DIR}")
+
 if (LLAMA_BUILD)
     set(BUILD_SHARED_LIBS "On")
 
diff --git a/llama_cpp/llama_cpp.py b/llama_cpp/llama_cpp.py
@@ -23,7 +23,7 @@
 # Load the library
 def _load_shared_library(lib_base_name: str):
     # Construct the paths to the possible shared library names
-    _base_path = pathlib.Path(os.path.abspath(os.path.dirname(__file__)))
+    _base_path = pathlib.Path(os.path.abspath(os.path.dirname(__file__))) / "lib"
     # Searching for the library in the current directory under the name "libllama" (default name
     # for llamacpp) and "llama" (default name for this repo)
     _lib_paths: List[pathlib.Path] = []
diff --git a/llama_cpp/llava_cpp.py b/llama_cpp/llava_cpp.py
@@ -35,7 +35,7 @@
 # Load the library
 def _load_shared_library(lib_base_name: str):
     # Construct the paths to the possible shared library names
-    _base_path = pathlib.Path(os.path.abspath(os.path.dirname(__file__)))
+    _base_path = pathlib.Path(os.path.abspath(os.path.dirname(__file__))) / "lib"
     # Searching for the library in the current directory under the name "libllama" (default name
     # for llamacpp) and "llama" (default name for this repo)
     _lib_paths: List[pathlib.Path] = []
