1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
|
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -343,16 +343,20 @@
#if (GGML_METAL)
# set_target_properties(ggml PROPERTIES RESOURCE "${CMAKE_CURRENT_SOURCE_DIR}/src/ggml-metal.metal")
#endif()
+if (NOT GGML_USE_SYSTEM_BASE)
install(TARGETS ggml LIBRARY PUBLIC_HEADER)
install(TARGETS ggml-base LIBRARY)
+endif()
if (GGML_STANDALONE)
+ if (NOT GGML_USE_SYSTEM_BASE)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/ggml.pc.in
${CMAKE_CURRENT_BINARY_DIR}/ggml.pc
@ONLY)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ggml.pc
DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+ endif()
endif()
#
@@ -405,16 +409,20 @@
VERSION ${GGML_INSTALL_VERSION}
COMPATIBILITY SameMajorVersion)
+if (NOT GGML_USE_SYSTEM_BASE)
target_compile_definitions(ggml-base PRIVATE
GGML_VERSION="${GGML_INSTALL_VERSION}"
GGML_COMMIT="${GGML_BUILD_COMMIT}"
)
+endif()
message(STATUS "ggml version: ${GGML_INSTALL_VERSION}")
message(STATUS "ggml commit: ${GGML_BUILD_COMMIT}")
+if (NOT GGML_USE_SYSTEM_BASE)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ggml-config.cmake
${CMAKE_CURRENT_BINARY_DIR}/ggml-version.cmake
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/ggml)
+endif()
if (MSVC)
set(MSVC_WARNING_FLAGS
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -185,10 +185,19 @@
# ggml
+option(GGML_USE_SYSTEM_BASE "ggml: use system-installed libggml-base instead of building it" OFF)
if (GGML_BACKEND_DL AND NOT BUILD_SHARED_LIBS)
message(FATAL_ERROR "GGML_BACKEND_DL requires BUILD_SHARED_LIBS")
endif()
+if (GGML_USE_SYSTEM_BASE)
+ find_library(GGML_SYSTEM_BASE_LIBRARY ggml-base REQUIRED)
+ add_library(ggml::ggml-base UNKNOWN IMPORTED)
+ set_target_properties(ggml::ggml-base PROPERTIES IMPORTED_LOCATION "${GGML_SYSTEM_BASE_LIBRARY}")
+ add_library(ggml-base INTERFACE)
+ target_link_libraries(ggml-base INTERFACE ggml::ggml-base)
+ set(GGML_OPENMP_ENABLED "OFF" CACHE INTERNAL "")
+else()
add_library(ggml-base
../include/ggml.h
../include/ggml-alloc.h
@@ -238,6 +247,7 @@
target_compile_definitions(ggml-base PRIVATE GGML_USE_OPENMP)
target_link_libraries(ggml-base PRIVATE OpenMP::OpenMP_C OpenMP::OpenMP_CXX)
endif()
+endif()
add_library(ggml
ggml-backend-dl.cpp
@@ -487,6 +497,7 @@
ggml_add_backend(ZenDNN)
ggml_add_backend(OPENVINO)
+if (NOT GGML_USE_SYSTEM_BASE)
foreach (target ggml-base ggml)
target_include_directories(${target} PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include> $<INSTALL_INTERFACE:include>)
target_compile_features (${target} PRIVATE c_std_11 cxx_std_17) # don't bump
@@ -515,3 +526,4 @@
target_compile_definitions(${target} PUBLIC GGML_SHARED)
endforeach()
endif()
+endif()
--- a/src/ggml-cuda/CMakeLists.txt
+++ b/src/ggml-cuda/CMakeLists.txt
@@ -100,6 +100,8 @@
message(STATUS "Using CMAKE_CUDA_ARCHITECTURES=${CMAKE_CUDA_ARCHITECTURES} CMAKE_CUDA_ARCHITECTURES_NATIVE=${CMAKE_CUDA_ARCHITECTURES_NATIVE}")
file(GLOB GGML_HEADERS_CUDA "*.cuh")
- list(APPEND GGML_HEADERS_CUDA "../../include/ggml-cuda.h")
+ if (NOT GGML_USE_SYSTEM_BASE)
+ list(APPEND GGML_HEADERS_CUDA "../../include/ggml-cuda.h")
+ endif()
file(GLOB GGML_SOURCES_CUDA "*.cu")
--- a/src/ggml-hip/CMakeLists.txt
+++ b/src/ggml-hip/CMakeLists.txt
@@ -58,6 +58,8 @@
message(STATUS "HIP and hipBLAS found")
file(GLOB GGML_HEADERS_ROCM "../ggml-cuda/*.cuh")
-list(APPEND GGML_HEADERS_ROCM "../../include/ggml-cuda.h")
+if (NOT GGML_USE_SYSTEM_BASE)
+ list(APPEND GGML_HEADERS_ROCM "../../include/ggml-cuda.h")
+endif()
file(GLOB GGML_SOURCES_ROCM "../ggml-cuda/*.cu")
--- a/src/ggml-vulkan/CMakeLists.txt
+++ b/src/ggml-vulkan/CMakeLists.txt
@@ -62,6 +62,8 @@
ggml_add_backend_library(ggml-vulkan
ggml-vulkan.cpp
- ../../include/ggml-vulkan.h
)
+ if (NOT GGML_USE_SYSTEM_BASE)
+ target_sources(ggml-vulkan PRIVATE ../../include/ggml-vulkan.h)
+ endif()
set(VULKAN_SHADER_GEN_CMAKE_ARGS "")
|