baalajimaestro/llama.cpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Make building llava optional

Browse source
This commit is contained in:
Andrei Betlen 2023-11-28 04:55:21 -05:00
parent 74f1949206
commit e3941d9c67
2 changed files with 28 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
CMakeLists.txt
View file

@ -3,6 +3,7 @@ cmake_minimum_required(VERSION 3.21)
project(llama_cpp) project(llama_cpp)
option(LLAMA_BUILD "Build llama.cpp shared library and install alongside python package" ON) option(LLAMA_BUILD "Build llama.cpp shared library and install alongside python package" ON)
option(LLAVA_BUILD "Build llava shared library and install alongside python package" ON)
if (LLAMA_BUILD) if (LLAMA_BUILD)
set(BUILD_SHARED_LIBS "On") set(BUILD_SHARED_LIBS "On")
@ -44,28 +45,30 @@ if (LLAMA_BUILD)
DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/llama_cpp DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/llama_cpp
) )
# Building llava if (LLAVA_BUILD)
add_subdirectory(vendor/llama.cpp/examples/llava) # Building llava
set_target_properties(llava_shared PROPERTIES OUTPUT_NAME "llava") add_subdirectory(vendor/llama.cpp/examples/llava)
# Set CUDA_ARCHITECTURES to OFF on windows set_target_properties(llava_shared PROPERTIES OUTPUT_NAME "llava")
if (WIN32) # Set CUDA_ARCHITECTURES to OFF on windows
set_target_properties(llava_shared PROPERTIES CUDA_ARCHITECTURES OFF) if (WIN32)
set_target_properties(llava_shared PROPERTIES CUDA_ARCHITECTURES OFF)
endif()
install(
TARGETS llava_shared
LIBRARY DESTINATION ${SKBUILD_PLATLIB_DIR}/llama_cpp
RUNTIME DESTINATION ${SKBUILD_PLATLIB_DIR}/llama_cpp
ARCHIVE DESTINATION ${SKBUILD_PLATLIB_DIR}/llama_cpp
FRAMEWORK DESTINATION ${SKBUILD_PLATLIB_DIR}/llama_cpp
RESOURCE DESTINATION ${SKBUILD_PLATLIB_DIR}/llama_cpp
)
# Temporary fix for https://github.com/scikit-build/scikit-build-core/issues/374
install(
TARGETS llava_shared
LIBRARY DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/llama_cpp
RUNTIME DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/llama_cpp
ARCHIVE DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/llama_cpp
FRAMEWORK DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/llama_cpp
RESOURCE DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/llama_cpp
)
endif() endif()
install(
TARGETS llava_shared
LIBRARY DESTINATION ${SKBUILD_PLATLIB_DIR}/llama_cpp
RUNTIME DESTINATION ${SKBUILD_PLATLIB_DIR}/llama_cpp
ARCHIVE DESTINATION ${SKBUILD_PLATLIB_DIR}/llama_cpp
FRAMEWORK DESTINATION ${SKBUILD_PLATLIB_DIR}/llama_cpp
RESOURCE DESTINATION ${SKBUILD_PLATLIB_DIR}/llama_cpp
)
# Temporary fix for https://github.com/scikit-build/scikit-build-core/issues/374
install(
TARGETS llava_shared
LIBRARY DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/llama_cpp
RUNTIME DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/llama_cpp
ARCHIVE DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/llama_cpp
FRAMEWORK DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/llama_cpp
RESOURCE DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/llama_cpp
)
endif() endif()

4
llama_cpp/llava_cpp.py
View file

@ -48,8 +48,8 @@ def _load_shared_library(lib_base_name: str):
else: else:
raise RuntimeError("Unsupported platform") raise RuntimeError("Unsupported platform")
if "LLAMA_CPP_LIB" in os.environ: if "LLAVA_CPP_LIB" in os.environ:
lib_base_name = os.environ["LLAMA_CPP_LIB"] lib_base_name = os.environ["LLAVA_CPP_LIB"]
_lib = pathlib.Path(lib_base_name) _lib = pathlib.Path(lib_base_name)
_base_path = _lib.parent.resolve() _base_path = _lib.parent.resolve()
_lib_paths = [_lib.resolve()] _lib_paths = [_lib.resolve()]