Get up and running with Kimi, GLM, MiniMax, DeepSeek, gpt-oss, Qwen, Gemma and other models.
llm: fix missing dylibs by restoring old build behavior on Linux and macOS (#5511)
Jeffrey Morgan2cc854f8cb5b
diff --git a/llm/ext_server/CMakeLists.txt b/llm/ext_server/CMakeLists.txtindex c300244f9..b63f3c0e5 100644--- a/llm/ext_server/CMakeLists.txt+++ b/llm/ext_server/CMakeLists.txt@@ -1,17 +1,13 @@--set(TARGET ollama_llama_server)-option(LLAMA_SERVER_VERBOSE "Build verbose logging option for Server" ON)-include_directories(${CMAKE_CURRENT_SOURCE_DIR})-add_executable(${TARGET} server.cpp utils.hpp json.hpp httplib.h)-target_compile_definitions(${TARGET} PRIVATE- SERVER_VERBOSE=$<BOOL:${LLAMA_SERVER_VERBOSE}>-)-target_link_libraries(${TARGET} PRIVATE ggml llama common llava ${CMAKE_THREAD_LIBS_INIT})-install(TARGETS ollama_llama_server ggml llama- RUNTIME DESTINATION "${CMAKE_BINARY_DIR}/bin"- LIBRARY DESTINATION "${CMAKE_BINARY_DIR}/bin"- COMPONENT ollama_llama_server)-if (WIN32)- TARGET_LINK_LIBRARIES(${TARGET} PRIVATE ws2_32)-endif()+set(TARGET ollama_llama_server)+option(LLAMA_SERVER_VERBOSE "Build verbose logging option for Server" ON)+include_directories(${CMAKE_CURRENT_SOURCE_DIR})+add_executable(${TARGET} server.cpp utils.hpp json.hpp httplib.h)+install(TARGETS ${TARGET} RUNTIME)+target_compile_definitions(${TARGET} PRIVATE+ SERVER_VERBOSE=$<BOOL:${LLAMA_SERVER_VERBOSE}>+)+target_link_libraries(${TARGET} PRIVATE ggml llama common llava ${CMAKE_THREAD_LIBS_INIT})+if (WIN32)+ TARGET_LINK_LIBRARIES(${TARGET} PRIVATE ws2_32)+endif()target_compile_features(${TARGET} PRIVATE cxx_std_11)\ No newline at end of filediff --git a/llm/generate/gen_common.sh b/llm/generate/gen_common.shindex 23feaf99d..da1b06882 100644--- a/llm/generate/gen_common.sh+++ b/llm/generate/gen_common.sh@@ -81,7 +81,6 @@ apply_patches() {build() {cmake -S ${LLAMACPP_DIR} -B ${BUILD_DIR} ${CMAKE_DEFS}cmake --build ${BUILD_DIR} ${CMAKE_TARGETS} -j8- cmake --install ${BUILD_DIR} --component ollama_llama_server}compress() {diff --git a/llm/generate/gen_darwin.sh b/llm/generate/gen_darwin.shindex 02577545a..8b4779f95 100755--- a/llm/generate/gen_darwin.sh+++ b/llm/generate/gen_darwin.sh@@ -18,7 +18,7 @@ sign() {fi}-COMMON_DARWIN_DEFS="-DCMAKE_OSX_DEPLOYMENT_TARGET=11.3 -DLLAMA_METAL_MACOSX_VERSION_MIN=11.3 -DCMAKE_SYSTEM_NAME=Darwin -DGGML_METAL_EMBED_LIBRARY=on -DGGML_OPENMP=off"+COMMON_DARWIN_DEFS="-DBUILD_SHARED_LIBS=off -DCMAKE_OSX_DEPLOYMENT_TARGET=11.3 -DLLAMA_METAL_MACOSX_VERSION_MIN=11.3 -DCMAKE_SYSTEM_NAME=Darwin -DGGML_METAL_EMBED_LIBRARY=on -DGGML_OPENMP=off"case "${GOARCH}" in"amd64")@@ -27,7 +27,7 @@ case "${GOARCH}" in# Static build for linking into the Go binaryinit_varsCMAKE_TARGETS="--target llama --target ggml"- CMAKE_DEFS="${COMMON_CPU_DEFS} -DBUILD_SHARED_LIBS=off -DGGML_BLAS=off -DGGML_ACCELERATE=off -DGGML_AVX=off -DGGML_AVX2=off -DGGML_AVX512=off -DGGML_FMA=off -DGGML_F16C=off ${CMAKE_DEFS}"+ CMAKE_DEFS="${COMMON_CPU_DEFS} -DGGML_BLAS=off -DGGML_ACCELERATE=off -DGGML_AVX=off -DGGML_AVX2=off -DGGML_AVX512=off -DGGML_FMA=off -DGGML_F16C=off ${CMAKE_DEFS}"BUILD_DIR="../build/darwin/${ARCH}_static"echo "Building static library"build@@ -75,7 +75,7 @@ case "${GOARCH}" in# Static build for linking into the Go binaryinit_varsCMAKE_TARGETS="--target llama --target ggml"- CMAKE_DEFS="-DCMAKE_OSX_DEPLOYMENT_TARGET=11.3 -DCMAKE_SYSTEM_NAME=Darwin -DBUILD_SHARED_LIBS=off -DCMAKE_SYSTEM_PROCESSOR=${ARCH} -DCMAKE_OSX_ARCHITECTURES=${ARCH} ${CMAKE_DEFS}"+ CMAKE_DEFS="-DCMAKE_OSX_DEPLOYMENT_TARGET=11.3 -DCMAKE_SYSTEM_NAME=Darwin -DCMAKE_SYSTEM_PROCESSOR=${ARCH} -DCMAKE_OSX_ARCHITECTURES=${ARCH} ${CMAKE_DEFS}"BUILD_DIR="../build/darwin/${ARCH}_static"echo "Building static library"builddiff --git a/llm/generate/gen_linux.sh b/llm/generate/gen_linux.shindex c36862520..2bea1c4e6 100755--- a/llm/generate/gen_linux.sh+++ b/llm/generate/gen_linux.sh@@ -51,7 +51,7 @@ if [ -z "${CUDACXX}" ]; thenexport CUDACXX=$(command -v nvcc)fifi-COMMON_CMAKE_DEFS="-DCMAKE_POSITION_INDEPENDENT_CODE=on -DGGML_NATIVE=off -DGGML_AVX=on -DGGML_AVX2=off -DGGML_AVX512=off -DGGML_FMA=off -DGGML_F16C=off -DGGML_OPENMP=off"+COMMON_CMAKE_DEFS="-DBUILD_SHARED_LIBS=off -DCMAKE_POSITION_INDEPENDENT_CODE=on -DGGML_NATIVE=off -DGGML_AVX=on -DGGML_AVX2=off -DGGML_AVX512=off -DGGML_FMA=off -DGGML_F16C=off -DGGML_OPENMP=off"source $(dirname $0)/gen_common.shinit_varsgit_module_setup