Skip to content

Commit 7d94f01

Browse files
ggerganovggerganov
committed
files : move headers to include
1 parent 14b5375 commit 7d94f01

14 files changed

+96
-92
lines changed

‎Makefile

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -612,9 +612,9 @@ ggml/src/ggml-cuda/%.o: \
612612

613613
ggml/src/ggml-cuda.o: \
614614
ggml/src/ggml-cuda.cu \
615-
ggml/src/ggml-cuda.h \
616615
ggml/include/ggml.h \
617616
ggml/include/ggml-backend.h \
617+
ggml/include/ggml-cuda.h \
618618
ggml/src/ggml-backend-impl.h \
619619
ggml/src/ggml-common.h \
620620
$(wildcard ggml/src/ggml-cuda/*.cuh)
@@ -652,7 +652,7 @@ endif
652652

653653
ggml/src/ggml-vulkan.o: \
654654
ggml/src/ggml-vulkan.cpp \
655-
ggml/src/ggml-vulkan.h
655+
ggml/include/ggml-vulkan.h
656656
$(CXX) $(CXXFLAGS) -c $< -o $@
657657
endif # GGML_VULKAN
658658

@@ -700,9 +700,9 @@ endif # GGML_CUDA_NO_PEER_COPY
700700

701701
ggml/src/ggml-cuda.o: \
702702
ggml/src/ggml-cuda.cu \
703-
ggml/src/ggml-cuda.h \
704703
ggml/include/ggml.h \
705704
ggml/include/ggml-backend.h \
705+
ggml/include/ggml-cuda.h \
706706
ggml/src/ggml-backend-impl.h \
707707
ggml/src/ggml-common.h \
708708
$(wildcard ggml/src/ggml-cuda/*.cuh)
@@ -744,7 +744,7 @@ endif
744744
ifdef GGML_METAL
745745
ggml/src/ggml-metal.o: \
746746
ggml/src/ggml-metal.m \
747-
ggml/src/ggml-metal.h \
747+
ggml/include/ggml-metal.h \
748748
ggml/include/ggml.h
749749
$(CC) $(CFLAGS) -c $< -o $@
750750

@@ -913,7 +913,7 @@ ggml/src/ggml-quants.o: \
913913

914914
ggml/src/ggml-blas.o: \
915915
ggml/src/ggml-blas.cpp \
916-
ggml/src/ggml-blas.h
916+
ggml/include/ggml-blas.h
917917
$(CXX) $(CXXFLAGS) -c $< -o $@
918918

919919
ifdef GGML_LLAMAFILE
@@ -927,7 +927,7 @@ endif # GGML_LLAMAFILE
927927
ifdef GGML_RPC
928928
ggml/src/ggml-rpc.o: \
929929
ggml/src/ggml-rpc.cpp \
930-
ggml/src/ggml-rpc.h
930+
ggml/include/ggml-rpc.h
931931
$(CXX) $(CXXFLAGS) -c $< -o $@
932932
endif # GGML_RPC
933933

@@ -945,11 +945,11 @@ src/whisper.o: \
945945
src/whisper.cpp \
946946
src/whisper-mel.hpp \
947947
include/whisper.h \
948-
ggml/src/ggml-cuda.h \
949-
ggml/src/ggml-metal.h \
950948
ggml/include/ggml.h \
951949
ggml/include/ggml-alloc.h \
952-
ggml/include/ggml-backend.h
950+
ggml/include/ggml-backend.h \
951+
ggml/include/ggml-cuda.h \
952+
ggml/include/ggml-metal.h
953953
$(CXX) $(CXXFLAGS) -c $< -o $@
954954

955955
$(LIB_WHISPER): \

‎ggml/src/ggml-blas.h renamed to ‎ggml/include/ggml-blas.h

File renamed without changes.

‎ggml/src/ggml-cuda.h renamed to ‎ggml/include/ggml-cuda.h

File renamed without changes.

‎ggml/src/ggml-kompute.h renamed to ‎ggml/include/ggml-kompute.h

File renamed without changes.

‎ggml/src/ggml-metal.h renamed to ‎ggml/include/ggml-metal.h

File renamed without changes.

‎ggml/src/ggml-rpc.h renamed to ‎ggml/include/ggml-rpc.h

File renamed without changes.

‎ggml/src/ggml-sycl.h renamed to ‎ggml/include/ggml-sycl.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88

99
#include "ggml.h"
1010
#include "ggml-backend.h"
11-
#include "ggml-sycl/presets.hpp"
11+
12+
#define GGML_SYCL_NAME "SYCL"
13+
#define GGML_SYCL_MAX_DEVICES 48
1214

1315
#ifdef __cplusplus
1416
extern "C" {

‎ggml/src/ggml-vulkan.h renamed to ‎ggml/include/ggml-vulkan.h

File renamed without changes.

‎ggml/src/CMakeLists.txt

Lines changed: 51 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
include(CheckCXXCompilerFlag)
22

3-
unset(GGML_CDEF_PRIVATE)
43
unset(GGML_CDEF_PUBLIC)
54

6-
list(APPEND GGML_CDEF_PRIVATE GGML_SCHED_MAX_COPIES=${GGML_SCHED_MAX_COPIES})
5+
add_compile_definitions(GGML_SCHED_MAX_COPIES=${GGML_SCHED_MAX_COPIES})
76

87
# enable libstdc++ assertions for debug builds
98
if (CMAKE_SYSTEM_NAME MATCHES "Linux")
@@ -32,9 +31,9 @@ if (APPLE AND GGML_ACCELERATE)
3231
if (ACCELERATE_FRAMEWORK)
3332
message(STATUS "Accelerate framework found")
3433

35-
list(APPEND GGML_CDEF_PRIVATE GGML_USE_ACCELERATE)
36-
list(APPEND GGML_CDEF_PRIVATE ACCELERATE_NEW_LAPACK)
37-
list(APPEND GGML_CDEF_PRIVATE ACCELERATE_LAPACK_ILP64)
34+
add_compile_definitions(GGML_USE_ACCELERATE)
35+
add_compile_definitions(ACCELERATE_NEW_LAPACK)
36+
add_compile_definitions(ACCELERATE_LAPACK_ILP64)
3837

3938
set(GGML_EXTRA_LIBS ${GGML_EXTRA_LIBS} ${ACCELERATE_FRAMEWORK})
4039
else()
@@ -48,12 +47,12 @@ if (GGML_METAL)
4847
find_library(METALKIT_FRAMEWORK MetalKit REQUIRED)
4948

5049
message(STATUS "Metal framework found")
51-
set(GGML_HEADERS_METAL ggml-metal.h)
50+
set(GGML_HEADERS_METAL ../include/ggml-metal.h)
5251
set(GGML_SOURCES_METAL ggml-metal.m)
5352

5453
list(APPEND GGML_CDEF_PUBLIC GGML_USE_METAL)
5554
if (GGML_METAL_NDEBUG)
56-
list(APPEND GGML_CDEF_PRIVATE GGML_METAL_NDEBUG)
55+
add_compile_definitions(GGML_METAL_NDEBUG)
5756
endif()
5857

5958
# copy ggml-common.h and ggml-metal.metal to bin directory
@@ -63,7 +62,7 @@ if (GGML_METAL)
6362
if (GGML_METAL_EMBED_LIBRARY)
6463
enable_language(ASM)
6564

66-
list(APPEND GGML_CDEF_PRIVATE GGML_METAL_EMBED_LIBRARY)
65+
add_compile_definitions(GGML_METAL_EMBED_LIBRARY)
6766

6867
set(METALLIB_COMMON "${CMAKE_CURRENT_SOURCE_DIR}/ggml-common.h")
6968
set(METALLIB_SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/ggml-metal.metal")
@@ -145,7 +144,7 @@ if (GGML_OPENMP)
145144
if (OpenMP_FOUND)
146145
message(STATUS "OpenMP found")
147146

148-
list(APPEND GGML_CDEF_PRIVATE GGML_USE_OPENMP)
147+
add_compile_definitions(GGML_USE_OPENMP)
149148

150149
set(GGML_EXTRA_LIBS ${GGML_EXTRA_LIBS} OpenMP::OpenMP_C OpenMP::OpenMP_CXX)
151150
else()
@@ -223,10 +222,10 @@ if (GGML_BLAS)
223222
list(APPEND GGML_CDEF_PUBLIC GGML_USE_BLAS)
224223

225224
if (${BLAS_INCLUDE_DIRS} MATCHES "mkl" AND (${GGML_BLAS_VENDOR} MATCHES "Generic" OR ${GGML_BLAS_VENDOR} MATCHES "Intel"))
226-
list(APPEND GGML_CDEF_PRIVATE GGML_BLAS_USE_MKL)
225+
add_compile_definitions(GGML_BLAS_USE_MKL)
227226
endif()
228227

229-
set(GGML_HEADERS_BLAS ggml-blas.h)
228+
set(GGML_HEADERS_BLAS ../include/ggml-blas.h)
230229
set(GGML_SOURCES_BLAS ggml-blas.cpp)
231230

232231
set(GGML_EXTRA_LIBS ${GGML_EXTRA_LIBS} ${BLAS_LIBRARIES})
@@ -241,7 +240,7 @@ endif()
241240
if (GGML_LLAMAFILE)
242241
message(STATUS "Using ggml SGEMM")
243242

244-
list(APPEND GGML_CDEF_PRIVATE GGML_USE_LLAMAFILE)
243+
add_compile_definitions(GGML_USE_LLAMAFILE)
245244

246245
set(GGML_HEADERS_LLAMAFILE sgemm.h)
247246
set(GGML_SOURCES_LLAMAFILE sgemm.cpp)
@@ -272,7 +271,7 @@ if (GGML_CUDA)
272271
enable_language(CUDA)
273272

274273
file(GLOB GGML_HEADERS_CUDA "ggml-cuda/*.cuh")
275-
list(APPEND GGML_HEADERS_CUDA "ggml-cuda.h")
274+
list(APPEND GGML_HEADERS_CUDA "../include/ggml-cuda.h")
276275

277276
file(GLOB GGML_SOURCES_CUDA "ggml-cuda/*.cu")
278277
list(APPEND GGML_SOURCES_CUDA "ggml-cuda.cu")
@@ -284,7 +283,7 @@ if (GGML_CUDA)
284283
if (GGML_CUDA_FA_ALL_QUANTS)
285284
file(GLOB SRCS "ggml-cuda/template-instances/fattn-vec*.cu")
286285
list(APPEND GGML_SOURCES_CUDA ${SRCS})
287-
list(APPEND GGML_CDEF_PRIVATE GGML_CUDA_FA_ALL_QUANTS)
286+
add_compile_definitions(GGML_CUDA_FA_ALL_QUANTS)
288287
else()
289288
file(GLOB SRCS "ggml-cuda/template-instances/fattn-vec*q4_0-q4_0.cu")
290289
list(APPEND GGML_SOURCES_CUDA ${SRCS})
@@ -296,38 +295,38 @@ if (GGML_CUDA)
296295

297296
list(APPEND GGML_CDEF_PUBLIC GGML_USE_CUDA)
298297

299-
list(APPEND GGML_CDEF_PRIVATE GGML_CUDA_USE_GRAPHS)
300-
list(APPEND GGML_CDEF_PRIVATE GGML_CUDA_DMMV_X=${GGML_CUDA_DMMV_X})
301-
list(APPEND GGML_CDEF_PRIVATE GGML_CUDA_MMV_Y=${GGML_CUDA_MMV_Y})
302-
list(APPEND GGML_CDEF_PRIVATE K_QUANTS_PER_ITERATION=${GGML_CUDA_KQUANTS_ITER})
303-
list(APPEND GGML_CDEF_PRIVATE GGML_CUDA_PEER_MAX_BATCH_SIZE=${GGML_CUDA_PEER_MAX_BATCH_SIZE})
298+
add_compile_definitions(GGML_CUDA_USE_GRAPHS)
299+
add_compile_definitions(GGML_CUDA_DMMV_X=${GGML_CUDA_DMMV_X})
300+
add_compile_definitions(GGML_CUDA_MMV_Y=${GGML_CUDA_MMV_Y})
301+
add_compile_definitions(K_QUANTS_PER_ITERATION=${GGML_CUDA_KQUANTS_ITER})
302+
add_compile_definitions(GGML_CUDA_PEER_MAX_BATCH_SIZE=${GGML_CUDA_PEER_MAX_BATCH_SIZE})
304303

305304
if (GGML_CUDA_FORCE_DMMV)
306-
list(APPEND GGML_CDEF_PRIVATE GGML_CUDA_FORCE_DMMV)
305+
add_compile_definitions(GGML_CUDA_FORCE_DMMV)
307306
endif()
308307

309308
if (GGML_CUDA_FORCE_MMQ)
310-
list(APPEND GGML_CDEF_PRIVATE GGML_CUDA_FORCE_MMQ)
309+
add_compile_definitions(GGML_CUDA_FORCE_MMQ)
311310
endif()
312311

313312
if (GGML_CUDA_FORCE_CUBLAS)
314313
add_compile_definitions(GGML_CUDA_FORCE_CUBLAS)
315314
endif()
316315

317316
if (GGML_CUDA_NO_VMM)
318-
list(APPEND GGML_CDEF_PRIVATE GGML_CUDA_NO_VMM)
317+
add_compile_definitions(GGML_CUDA_NO_VMM)
319318
endif()
320319

321320
if (DEFINED GGML_CUDA_DMMV_Y)
322-
list(APPEND GGML_CDEF_PRIVATE GGML_CUDA_MMV_Y=${GGML_CUDA_DMMV_Y}) # for backwards compatibility
321+
add_compile_definitions(GGML_CUDA_MMV_Y=${GGML_CUDA_DMMV_Y}) # for backwards compatibility
323322
endif()
324323

325324
if (GGML_CUDA_F16 OR GGML_CUDA_DMMV_F16)
326-
list(APPEND GGML_CDEF_PRIVATE GGML_CUDA_F16)
325+
add_compile_definitions(GGML_CUDA_F16)
327326
endif()
328327

329328
if (GGML_CUDA_NO_PEER_COPY)
330-
list(APPEND GGML_CDEF_PRIVATE GGML_CUDA_NO_PEER_COPY)
329+
add_compile_definitions(GGML_CUDA_NO_PEER_COPY)
331330
endif()
332331

333332
if (GGML_STATIC)
@@ -397,7 +396,7 @@ if (GGML_HIPBLAS)
397396
message(STATUS "HIP and hipBLAS found")
398397

399398
file(GLOB GGML_HEADERS_ROCM "ggml-cuda/*.cuh")
400-
list(APPEND GGML_HEADERS_ROCM "ggml-cuda.h")
399+
list(APPEND GGML_HEADERS_ROCM "../include/ggml-cuda.h")
401400

402401
file(GLOB GGML_SOURCES_ROCM "ggml-cuda/*.cu")
403402
list(APPEND GGML_SOURCES_ROCM "ggml-cuda.cu")
@@ -409,7 +408,7 @@ if (GGML_HIPBLAS)
409408
if (GGML_CUDA_FA_ALL_QUANTS)
410409
file(GLOB SRCS "ggml-cuda/template-instances/fattn-vec*.cu")
411410
list(APPEND GGML_SOURCES_ROCM ${SRCS})
412-
list(APPEND GGML_CDEF_PRIVATE GGML_CUDA_FA_ALL_QUANTS)
411+
add_compile_definitions(GGML_CUDA_FA_ALL_QUANTS)
413412
else()
414413
file(GLOB SRCS "ggml-cuda/template-instances/fattn-vec*q4_0-q4_0.cu")
415414
list(APPEND GGML_SOURCES_ROCM ${SRCS})
@@ -421,25 +420,25 @@ if (GGML_HIPBLAS)
421420

422421
list(APPEND GGML_CDEF_PUBLIC GGML_USE_CUDA)
423422

424-
list(APPEND GGML_CDEF_PRIVATE GGML_USE_HIPBLAS)
425-
list(APPEND GGML_CDEF_PRIVATE GGML_CUDA_DMMV_X=${GGML_CUDA_DMMV_X})
426-
list(APPEND GGML_CDEF_PRIVATE GGML_CUDA_MMV_Y=${GGML_CUDA_MMV_Y})
427-
list(APPEND GGML_CDEF_PRIVATE K_QUANTS_PER_ITERATION=${GGML_CUDA_KQUANTS_ITER})
423+
add_compile_definitions(GGML_USE_HIPBLAS)
424+
add_compile_definitions(GGML_CUDA_DMMV_X=${GGML_CUDA_DMMV_X})
425+
add_compile_definitions(GGML_CUDA_MMV_Y=${GGML_CUDA_MMV_Y})
426+
add_compile_definitions(K_QUANTS_PER_ITERATION=${GGML_CUDA_KQUANTS_ITER})
428427

429428
if (GGML_HIP_UMA)
430-
list(APPEND GGML_CDEF_PRIVATE GGML_HIP_UMA)
429+
add_compile_definitions(GGML_HIP_UMA)
431430
endif()
432431

433432
if (GGML_CUDA_FORCE_DMMV)
434-
list(APPEND GGML_CDEF_PRIVATE GGML_CUDA_FORCE_DMMV)
433+
add_compile_definitions(GGML_CUDA_FORCE_DMMV)
435434
endif()
436435

437436
if (GGML_CUDA_FORCE_MMQ)
438-
list(APPEND GGML_CDEF_PRIVATE GGML_CUDA_FORCE_MMQ)
437+
add_compile_definitions(GGML_CUDA_FORCE_MMQ)
439438
endif()
440439

441440
if (GGML_CUDA_NO_PEER_COPY)
442-
list(APPEND GGML_CDEF_PRIVATE GGML_CUDA_NO_PEER_COPY)
441+
add_compile_definitions(GGML_CUDA_NO_PEER_COPY)
443442
endif()
444443

445444
if (CXX_IS_HIPCC)
@@ -474,11 +473,11 @@ if (GGML_SYCL)
474473
list(APPEND GGML_CDEF_PUBLIC GGML_USE_SYCL)
475474

476475
if (GGML_SYCL_F16)
477-
list(APPEND GGML_CDEF_PRIVATE GGML_SYCL_F16)
476+
add_compile_definitions(GGML_SYCL_F16)
478477
endif()
479478

480479
if (GGML_CUDA_FORCE_MMQ)
481-
list(APPEND GGML_CDEF_PRIVATE GGML_SYCL_FORCE_MMQ)
480+
add_compile_definitions(GGML_SYCL_FORCE_MMQ)
482481
endif()
483482

484483
add_compile_options(-I./) #include DPCT
@@ -490,7 +489,7 @@ if (GGML_SYCL)
490489
endif()
491490

492491
file(GLOB GGML_HEADERS_SYCL "ggml-sycl/*.hpp")
493-
list(APPEND GGML_HEADERS_SYCL "ggml-sycl.h")
492+
list(APPEND GGML_HEADERS_SYCL "../include/ggml-sycl.h")
494493

495494
file(GLOB GGML_SOURCES_SYCL "ggml-sycl/*.cpp")
496495
list(APPEND GGML_SOURCES_SYCL "ggml-sycl.cpp")
@@ -518,7 +517,7 @@ if (GGML_RPC)
518517
set(GGML_EXTRA_LIBS ${GGML_EXTRA_LIBS} ws2_32)
519518
endif()
520519

521-
set(GGML_HEADERS_RPC ggml-rpc.h)
520+
set(GGML_HEADERS_RPC ../include/ggml-rpc.h)
522521
set(GGML_SOURCES_RPC ggml-rpc.cpp)
523522
endif()
524523

@@ -528,7 +527,7 @@ if (GGML_VULKAN)
528527
if (Vulkan_FOUND)
529528
message(STATUS "Vulkan found")
530529

531-
set(GGML_HEADERS_VULKAN ggml-vulkan.h)
530+
set(GGML_HEADERS_VULKAN ../include/ggml-vulkan.h)
532531
set(GGML_SOURCES_VULKAN ggml-vulkan.cpp)
533532

534533
list(APPEND GGML_CDEF_PUBLIC GGML_USE_VULKAN)
@@ -540,23 +539,23 @@ if (GGML_VULKAN)
540539
endif()
541540

542541
if (GGML_VULKAN_CHECK_RESULTS)
543-
list(APPEND GGML_CDEF_PRIVATE GGML_VULKAN_CHECK_RESULTS)
542+
add_compile_definitions(GGML_VULKAN_CHECK_RESULTS)
544543
endif()
545544

546545
if (GGML_VULKAN_DEBUG)
547-
list(APPEND GGML_CDEF_PRIVATE GGML_VULKAN_DEBUG)
546+
add_compile_definitions(GGML_VULKAN_DEBUG)
548547
endif()
549548

550549
if (GGML_VULKAN_MEMORY_DEBUG)
551-
list(APPEND GGML_CDEF_PRIVATE GGML_VULKAN_MEMORY_DEBUG)
550+
add_compile_definitions(GGML_VULKAN_MEMORY_DEBUG)
552551
endif()
553552

554553
if (GGML_VULKAN_VALIDATE)
555-
list(APPEND GGML_CDEF_PRIVATE GGML_VULKAN_VALIDATE)
554+
add_compile_definitions(GGML_VULKAN_VALIDATE)
556555
endif()
557556

558557
if (GGML_VULKAN_RUN_TESTS)
559-
list(APPEND GGML_CDEF_PRIVATE GGML_VULKAN_RUN_TESTS)
558+
add_compile_definitions(GGML_VULKAN_RUN_TESTS)
560559
endif()
561560

562561
set(GGML_EXTRA_LIBS ${GGML_EXTRA_LIBS} Vulkan::Vulkan)
@@ -713,8 +712,8 @@ if (GGML_KOMPUTE)
713712
)
714713

715714
# Add the stamp to the main sources to ensure dependency tracking
716-
set(GGML_SOURCES_KOMPUTE ggml-kompute.cpp ${CMAKE_CURRENT_BINARY_DIR}/ggml-kompute.stamp)
717-
set(GGML_HEADERS_KOMPUTE ggml-kompute.h ${CMAKE_CURRENT_BINARY_DIR}/ggml-kompute.stamp)
715+
set(GGML_SOURCES_KOMPUTE ggml-kompute.cpp ${CMAKE_CURRENT_BINARY_DIR}/ggml-kompute.stamp)
716+
set(GGML_HEADERS_KOMPUTE ../include/ggml-kompute.h ${CMAKE_CURRENT_BINARY_DIR}/ggml-kompute.stamp)
718717

719718
list(APPEND GGML_CDEF_PUBLIC GGML_USE_KOMPUTE)
720719

@@ -730,7 +729,7 @@ if (GGML_CPU_HBM)
730729

731730
message(STATUS "Using memkind for CPU HBM")
732731

733-
list(APPEND GGML_CDEF_PRIVATE GGML_USE_CPU_HBM)
732+
add_compile_definitions(GGML_USE_CPU_HBM)
734733

735734
target_link_libraries(ggml PUBLIC memkind)
736735
endif()
@@ -874,7 +873,7 @@ execute_process(
874873
)
875874

876875
if (output MATCHES "dyld-1015\.7")
877-
list(APPEND GGML_CDEF_PRIVATE HAVE_BUGGY_APPLE_LINKER)
876+
add_compile_definitions(HAVE_BUGGY_APPLE_LINKER)
878877
endif()
879878

880879
# architecture specific
@@ -1156,10 +1155,9 @@ if (EMSCRIPTEN)
11561155
endif()
11571156

11581157
target_compile_definitions(ggml PUBLIC ${GGML_CDEF_PUBLIC})
1159-
target_compile_definitions(ggml PRIVATE ${GGML_CDEF_PRIVATE})
1160-
1161-
target_include_directories(ggml PUBLIC . ../include ${GGML_EXTRA_INCLUDES})
1162-
target_compile_features (ggml PUBLIC c_std_11) # don't bump
1158+
target_include_directories(ggml PUBLIC ../include)
1159+
target_include_directories(ggml PRIVATE . ${GGML_EXTRA_INCLUDES})
1160+
target_compile_features (ggml PRIVATE c_std_11) # don't bump
11631161

11641162
target_link_libraries(ggml PRIVATE Threads::Threads ${GGML_EXTRA_LIBS})
11651163

0 commit comments

Comments
 (0)