mirror of
https://github.com/ikawrakow/ik_llama.cpp.git
synced 2026-06-28 04:30:15 -05:00
f645ed1e2d
common/chat, server: refactor, move all conversion functions to common, add tests (#20690) jinja : remove unused header (#22310) common : fix jinja warnings with clang 21 (#22313) Signed-off-by: Adrien Gallouët <angt@huggingface.co> chat: fix handling of space in reasoning markers (#22353) * chat: fix handling of space in reasoning markers common : re-arm reasoning budget after DONE on new <think> (#22323) common : determine generation prompt using longest common prefix (#22657) common/autoparser: fixes for newline handling / forced tool calls (#22654) * chat/autoparser: the fixes * Move optspace() to chat-peg-parser, comment out server tests invalidated due to content now allowed with forced tool calls. * Trim whitespace on apply instead common/chat : preserve media markers for typed-content templates (#22634) common : revert reasoning budget +inf logit bias (#22740) common : do not wrap raw strings in schema parser for tagged parsers (#22827) common : enable streaming JSON argument values (#23173) * common : remove atomic from json arguments * common : remove parsing logic on JSON arguments common : do not pass prompt tokens to reasoning budget sampler (#22488) reasoning-budget: clone should do a deep-copy (#23095) Co-authored-by: Piotr Wilkin (ilintar) <piotr.wilkin@syndatis.com>
104 lines
3.3 KiB
CMake
104 lines
3.3 KiB
CMake
set(TARGET llama-server)
|
|
option(LLAMA_SERVER_VERBOSE "Build verbose logging option for Server" ON)
|
|
option(LLAMA_SERVER_SSL "Build SSL support for the server" OFF)
|
|
option(LLAMA_SERVER_SQLITE3 "Build SQlite3 support for the server" OFF)
|
|
|
|
include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
|
|
|
|
if (MINGW)
|
|
# fix: https://github.com/ggerganov/llama.cpp/actions/runs/9651004652/job/26617901362?pr=8006
|
|
add_compile_definitions(_WIN32_WINNT=${GGML_WIN_VER})
|
|
endif()
|
|
|
|
set(TARGET_SRCS
|
|
server.cpp
|
|
server-chat.cpp
|
|
server-chat.h
|
|
server-task.cpp
|
|
server-task.h
|
|
server-queue.cpp
|
|
server-queue.h
|
|
server-common.cpp
|
|
server-common.h
|
|
server-context.cpp
|
|
server-context.h
|
|
)
|
|
set(PUBLIC_ASSETS
|
|
index.html.gz
|
|
|
|
)
|
|
|
|
foreach(asset ${PUBLIC_ASSETS})
|
|
set(input "${CMAKE_CURRENT_SOURCE_DIR}/public/${asset}")
|
|
set(output "${CMAKE_CURRENT_BINARY_DIR}/${asset}.hpp")
|
|
list(APPEND TARGET_SRCS ${output})
|
|
add_custom_command(
|
|
DEPENDS "${input}"
|
|
OUTPUT "${output}"
|
|
COMMAND "${CMAKE_COMMAND}" "-DINPUT=${input}" "-DOUTPUT=${output}" -P "${PROJECT_SOURCE_DIR}/scripts/xxd.cmake"
|
|
)
|
|
message("TARGET_SRCS contains: ${input}")
|
|
set_source_files_properties(${output} PROPERTIES GENERATED TRUE)
|
|
|
|
endforeach()
|
|
|
|
# include new llamacpp webui
|
|
set(ALT_PUBLIC_ASSETS
|
|
index_llamacpp.html.gz
|
|
loading.html
|
|
)
|
|
|
|
foreach(asset ${ALT_PUBLIC_ASSETS})
|
|
set(input "${CMAKE_CURRENT_SOURCE_DIR}/public_llamacpp/${asset}")
|
|
set(output "${CMAKE_CURRENT_BINARY_DIR}/${asset}.hpp")
|
|
list(APPEND TARGET_SRCS ${output})
|
|
add_custom_command(
|
|
DEPENDS "${input}"
|
|
OUTPUT "${output}"
|
|
COMMAND "${CMAKE_COMMAND}" "-DINPUT=${input}" "-DOUTPUT=${output}" -P "${PROJECT_SOURCE_DIR}/scripts/xxd.cmake"
|
|
)
|
|
message("TARGET_SRCS contains: ${input}")
|
|
set_source_files_properties(${output} PROPERTIES GENERATED TRUE)
|
|
|
|
endforeach()
|
|
|
|
|
|
add_executable(${TARGET} ${TARGET_SRCS})
|
|
install(TARGETS ${TARGET} RUNTIME)
|
|
target_compile_definitions(${TARGET} PRIVATE
|
|
SERVER_VERBOSE=$<BOOL:${LLAMA_SERVER_VERBOSE}>
|
|
)
|
|
if (MSVC)
|
|
target_link_options(${TARGET} PRIVATE
|
|
$<$<CONFIG:DEBUG>:/STACK:20971520,1048576 >
|
|
$<$<CONFIG:RELEASE>:/STACK:20971520,1048576>
|
|
)
|
|
endif()
|
|
# target_link_libraries(${TARGET} PRIVATE "/STACK:104857600")
|
|
target_include_directories(${TARGET} PRIVATE ${CMAKE_SOURCE_DIR})
|
|
#target_link_libraries(${TARGET} PRIVATE common ${CMAKE_THREAD_LIBS_INIT})
|
|
|
|
target_include_directories(${TARGET} PRIVATE ../mtmd)
|
|
target_link_libraries(${TARGET} PRIVATE common mtmd cpp-httplib ${CMAKE_THREAD_LIBS_INIT})
|
|
|
|
if (LLAMA_SERVER_SSL)
|
|
find_package(OpenSSL REQUIRED)
|
|
target_link_libraries(${TARGET} PRIVATE OpenSSL::SSL OpenSSL::Crypto)
|
|
target_compile_definitions(${TARGET} PRIVATE CPPHTTPLIB_OPENSSL_SUPPORT)
|
|
target_compile_definitions(cpp-httplib PRIVATE CPPHTTPLIB_OPENSSL_SUPPORT)
|
|
target_link_libraries(cpp-httplib PRIVATE OpenSSL::SSL OpenSSL::Crypto)
|
|
endif()
|
|
|
|
if (LLAMA_SERVER_SQLITE3)
|
|
find_package(SQLite3 REQUIRED)
|
|
target_link_libraries(${TARGET} PRIVATE SQLite::SQLite3)
|
|
target_include_directories(${TARGET} PUBLIC ./sqlite_modern_cpp/hdr)
|
|
target_compile_definitions(${TARGET} PRIVATE SQLITE3_MODERN_CPP_SUPPORT)
|
|
endif()
|
|
|
|
if (WIN32)
|
|
TARGET_LINK_LIBRARIES(${TARGET} PRIVATE ws2_32)
|
|
endif()
|
|
|
|
target_compile_features(${TARGET} PRIVATE cxx_std_17)
|