Skip to content

Commit f8de1bb

Browse files
ggerganovhodlen
authored andcommitted
ggml : add ggml-common.h to deduplicate shared code (ggml-org#5940)
* ggml : add ggml-common.h to shared code ggml-ci * scripts : update sync scripts * sycl : reuse quantum tables ggml-ci * ggml : minor * ggml : minor * sycl : try to fix build
1 parent f8b9bb1 commit f8de1bb

10 files changed

+799
-2536
lines changed

CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,8 @@ if (LLAMA_METAL)
199199
# get full path to the file
200200
#add_compile_definitions(GGML_METAL_DIR_KERNELS="${CMAKE_CURRENT_SOURCE_DIR}/")
201201

202-
# copy ggml-metal.metal to bin directory
202+
# copy ggml-common.h and ggml-metal.metal to bin directory
203+
configure_file(ggml-common.h ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/ggml-common.h COPYONLY)
203204
configure_file(ggml-metal.metal ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/ggml-metal.metal COPYONLY)
204205

205206
if (LLAMA_METAL_EMBED_LIBRARY)

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -453,7 +453,7 @@ endif # LLAMA_CUDA_PEER_MAX_BATCH_SIZE
453453
ifdef LLAMA_CUDA_CCBIN
454454
MK_NVCCFLAGS += -ccbin $(LLAMA_CUDA_CCBIN)
455455
endif
456-
ggml-cuda.o: ggml-cuda.cu ggml-cuda.h
456+
ggml-cuda.o: ggml-cuda.cu ggml-cuda.h ggml-common.h
457457
ifdef JETSON_EOL_MODULE_DETECT
458458
$(NVCC) -I. -Icommon -D_XOPEN_SOURCE=600 -D_GNU_SOURCE -DNDEBUG -DGGML_USE_CUBLAS -I/usr/local/cuda/include -I/opt/cuda/include -I/usr/local/cuda/targets/aarch64-linux/include -std=c++11 -O3 $(NVCCFLAGS) $(CPPFLAGS) -Xcompiler "$(CUDA_CXXFLAGS)" -c $< -o $@
459459
else
@@ -630,7 +630,7 @@ ggml-alloc.o: ggml-alloc.c ggml.h ggml-alloc.h
630630
ggml-backend.o: ggml-backend.c ggml.h ggml-backend.h
631631
$(CC) $(CFLAGS) -c $< -o $@
632632

633-
ggml-quants.o: ggml-quants.c ggml.h ggml-quants.h
633+
ggml-quants.o: ggml-quants.c ggml.h ggml-quants.h ggml-common.h
634634
$(CC) $(CFLAGS) -c $< -o $@
635635

636636
OBJS += ggml-alloc.o ggml-backend.o ggml-quants.o

ggml-common.h

Lines changed: 779 additions & 0 deletions
Large diffs are not rendered by default.

ggml-cuda.cu

Lines changed: 3 additions & 740 deletions
Large diffs are not rendered by default.

ggml-metal.metal

Lines changed: 3 additions & 704 deletions
Large diffs are not rendered by default.

ggml-quants.c

Lines changed: 3 additions & 705 deletions
Large diffs are not rendered by default.

ggml-quants.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#pragma once
22

3-
#include "ggml-impl.h"
4-
53
// GGML internal header
64

5+
#include "ggml-impl.h"
6+
77
#include <stdint.h>
88
#include <stddef.h>
99

ggml-sycl.cpp

Lines changed: 2 additions & 382 deletions
Large diffs are not rendered by default.

scripts/sync-ggml-am.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ if [ -f $SRC_LLAMA/ggml-src.patch ]; then
9494
# src/ggml-alloc.c -> ggml-alloc.c
9595
# src/ggml-backend-impl.h -> ggml-backend-impl.h
9696
# src/ggml-backend.c -> ggml-backend.c
97+
# src/ggml-common.h -> ggml-common.h
9798
# src/ggml-cuda.cu -> ggml-cuda.cu
9899
# src/ggml-cuda.h -> ggml-cuda.h
99100
# src/ggml-impl.h -> ggml-impl.h
@@ -126,6 +127,7 @@ if [ -f $SRC_LLAMA/ggml-src.patch ]; then
126127
-e 's/src\/ggml-alloc\.c/ggml-alloc.c/g' \
127128
-e 's/src\/ggml-backend-impl\.h/ggml-backend-impl.h/g' \
128129
-e 's/src\/ggml-backend\.c/ggml-backend.c/g' \
130+
-e 's/src\/ggml-common\.h/ggml-common.h/g' \
129131
-e 's/src\/ggml-cuda\.cu/ggml-cuda.cu/g' \
130132
-e 's/src\/ggml-cuda\.h/ggml-cuda.h/g' \
131133
-e 's/src\/ggml-impl\.h/ggml-impl.h/g' \

scripts/sync-ggml.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ cp -rpv ../ggml/src/ggml.c ./ggml.c
44
cp -rpv ../ggml/src/ggml-alloc.c ./ggml-alloc.c
55
cp -rpv ../ggml/src/ggml-backend-impl.h ./ggml-backend-impl.h
66
cp -rpv ../ggml/src/ggml-backend.c ./ggml-backend.c
7+
cp -rpv ../ggml/src/ggml-common.h ./ggml-common.h
78
cp -rpv ../ggml/src/ggml-cuda.cu ./ggml-cuda.cu
89
cp -rpv ../ggml/src/ggml-cuda.h ./ggml-cuda.h
910
cp -rpv ../ggml/src/ggml-impl.h ./ggml-impl.h

0 commit comments

Comments
 (0)