root/llama.cpp
1
0
Fork 0
mirror of https://github.com/ggerganov/llama.cpp.git synced 2024-11-15 07:19:53 +00:00
Code Issues Actions 13 Packages Projects Releases Wiki Activity

remove remaining GGML_EXTRA_* and GGML_CDEF_* uses

Browse Source 
ggml-ci
This commit is contained in:
slaren 2024-11-12 21:39:00 +01:00
parent c8da7d0f70
commit 5cfaecd34c
1 changed files with 17 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
ggml/src/CMakeLists.txt
View File

@ -1,7 +1,5 @@
include(CheckCXXCompilerFlag) include(CheckCXXCompilerFlag)
unset(GGML_CDEF_PUBLIC)
add_compile_definitions(GGML_SCHED_MAX_COPIES=${GGML_SCHED_MAX_COPIES}) add_compile_definitions(GGML_SCHED_MAX_COPIES=${GGML_SCHED_MAX_COPIES})
# enable libstdc++ assertions for debug builds # enable libstdc++ assertions for debug builds
@ -26,9 +24,6 @@ if (NOT MSVC)
endif() endif()
endif() endif()
unset(GGML_EXTRA_LIBS_PRIVATE)
unset(GGML_EXTRA_LIBS_PUBLIC)
function(get_flags CCID CCVER) function(get_flags CCID CCVER)
set(C_FLAGS "") set(C_FLAGS "")
set(CXX_FLAGS "") set(CXX_FLAGS "")
@ -222,6 +217,8 @@ add_library(ggml-base
ggml-aarch64.c ggml-aarch64.c
ggml-aarch64.h) ggml-aarch64.h)
target_include_directories(ggml-base PRIVATE .)
add_library(ggml add_library(ggml
ggml-backend-reg.cpp) ggml-backend-reg.cpp)
@ -232,6 +229,9 @@ function(ggml_add_backend backend)
if (${backend_id}) if (${backend_id})
string(TOLOWER "ggml-${backend}" backend_target) string(TOLOWER "ggml-${backend}" backend_target)
add_subdirectory(${backend_target}) add_subdirectory(${backend_target})
# check again in case the backend disabled itself
# note that this should NOT be the normal behavior, in case of errors the backend should fail the build
# however, currently it is necessary for AMX, since it is enabled by default on llama.cpp
if (${backend_id}) if (${backend_id})
message(STATUS "Including ${backend} backend") message(STATUS "Including ${backend} backend")
if (${BUILD_SHARED_LIBS}) if (${BUILD_SHARED_LIBS})
@ -257,40 +257,28 @@ ggml_add_backend(RPC)
ggml_add_backend(SYCL) ggml_add_backend(SYCL)
ggml_add_backend(Vulkan) ggml_add_backend(Vulkan)
target_compile_definitions(ggml-base PUBLIC ${GGML_CDEF_PUBLIC}) foreach (target ggml-base ggml)
target_include_directories(ggml-base PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include> $<INSTALL_INTERFACE:include>) target_include_directories(${target} PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include> $<INSTALL_INTERFACE:include>)
target_compile_features (ggml-base PRIVATE c_std_11) # don't bump target_compile_features (${target} PRIVATE c_std_11) # don't bump
endforeach()
target_compile_definitions(ggml PUBLIC ${GGML_CDEF_PUBLIC}) target_link_libraries(ggml-base PRIVATE Threads::Threads)
target_include_directories(ggml PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include> $<INSTALL_INTERFACE:include>)
target_compile_features (ggml PRIVATE c_std_11) # don't bump
# this probably should be removed
target_include_directories(ggml-base PRIVATE . ${GGML_EXTRA_INCLUDES})
target_link_directories (ggml-base PRIVATE ${GGML_EXTRA_LIBDIRS})
list(APPEND GGML_EXTRA_LIBS_PRIVATE Threads::Threads)
find_library(MATH_LIBRARY m) find_library(MATH_LIBRARY m)
if (MATH_LIBRARY) if (MATH_LIBRARY)
if (NOT WIN32 OR NOT DEFINED ENV{ONEAPI_ROOT}) if (NOT WIN32 OR NOT DEFINED ENV{ONEAPI_ROOT})
list(APPEND GGML_EXTRA_LIBS_PRIVATE m) target_link_libraries(ggml-base PRIVATE m)
endif() endif()
endif() endif()
if (CMAKE_SYSTEM_NAME MATCHES "Android") if (CMAKE_SYSTEM_NAME MATCHES "Android")
list(APPEND GGML_EXTRA_LIBS_PRIVATE dl) # Must be linked explicitly target_link_libraries(ggml-base PRIVATE dl)
endif() endif()
list(REMOVE_DUPLICATES GGML_EXTRA_LIBS_PRIVATE)
list(REMOVE_DUPLICATES GGML_EXTRA_LIBS_PUBLIC)
target_link_libraries(ggml PRIVATE ${GGML_EXTRA_LIBS_PRIVATE} PUBLIC ${GGML_EXTRA_LIBS_PUBLIC})
if (BUILD_SHARED_LIBS) if (BUILD_SHARED_LIBS)
set_target_properties(ggml-base PROPERTIES POSITION_INDEPENDENT_CODE ON) foreach (target ggml-base ggml)
set_target_properties(ggml PROPERTIES POSITION_INDEPENDENT_CODE ON) set_target_properties(${target} PROPERTIES POSITION_INDEPENDENT_CODE ON)
target_compile_definitions(ggml-base PRIVATE GGML_BUILD) target_compile_definitions(${target} PRIVATE GGML_BUILD)
target_compile_definitions(ggml PRIVATE GGML_BUILD) target_compile_definitions(${target} PUBLIC GGML_SHARED)
target_compile_definitions(ggml-base PUBLIC GGML_SHARED) endforeach()
target_compile_definitions(ggml PUBLIC GGML_SHARED)
endif() endif()