Skip to content

Commit 6039bd4

Browse files
ggerganovggerganov
committed
scripts : update sync llama.cpp
1 parent 9d0708e commit 6039bd4

File tree

2 files changed

+35
-21
lines changed

2 files changed

+35
-21
lines changed

‎scripts/sync-llama-am.sh‎

Lines changed: 27 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -66,24 +66,26 @@ while read c; do
6666
fi
6767
fi
6868

69+
#ggml/src/CMakeLists.txt \
6970
git format-patch -U${ctx} -k $c~1..$c --stdout -- \
7071
ggml/CMakeLists.txt \
71-
ggml/src/CMakeLists.txt \
72-
ggml/cmake/FindSIMD.cmake \
7372
ggml/src/ggml*.h \
7473
ggml/src/ggml*.c \
7574
ggml/src/ggml*.cpp \
76-
ggml/src/ggml*.m \
77-
ggml/src/ggml*.metal \
78-
ggml/src/ggml*.cu \
7975
ggml/src/ggml-amx/* \
76+
ggml/src/ggml-blas/* \
8077
ggml/src/ggml-cann/* \
78+
ggml/src/ggml-cpu/* \
8179
ggml/src/ggml-cuda/* \
80+
ggml/src/ggml-hip/* \
81+
ggml/src/ggml-kompute/* \
82+
ggml/src/ggml-metal/* \
83+
ggml/src/ggml-musa/* \
84+
ggml/src/ggml-rpc/* \
8285
ggml/src/ggml-sycl/* \
83-
ggml/src/vulkan-shaders/* \
86+
ggml/src/ggml-vulkan/* \
8487
ggml/include/ggml*.h \
8588
tests/test-opt.cpp \
86-
tests/test-grad0.cpp \
8789
tests/test-quantize-fns.cpp \
8890
tests/test-quantize-perf.cpp \
8991
tests/test-backend-ops.cpp \
@@ -116,23 +118,27 @@ if [ -f $SRC_GGML/llama-src.patch ]; then
116118
#
117119
# ggml/CMakelists.txt -> CMakeLists.txt
118120
# ggml/src/CMakelists.txt -> src/CMakeLists.txt
119-
# ggml/cmake/FindSIMD.cmake -> cmake/FindSIMD.cmake
121+
# ggml/cmake/FindSIMD.cmake -> src/ggml-cpu/cmake/FindSIMD.cmake (FIXME)
120122
#
121123
# ggml/src/ggml*.c -> src/ggml*.c
122124
# ggml/src/ggml*.cpp -> src/ggml*.cpp
123125
# ggml/src/ggml*.h -> src/ggml*.h
124-
# ggml/src/ggml*.cu -> src/ggml*.cu
125-
# ggml/src/ggml*.m -> src/ggml*.m
126126
# ggml/src/ggml-amx/* -> src/ggml-amx/*
127+
# ggml/src/ggml-blas/* -> src/ggml-blas/*
127128
# ggml/src/ggml-cann/* -> src/ggml-cann/*
129+
# ggml/src/ggml-cpu/* -> src/ggml-cpu/*
128130
# ggml/src/ggml-cuda/* -> src/ggml-cuda/*
131+
# ggml/src/ggml-hip/* -> src/ggml-hip/*
132+
# ggml/src/ggml-kompute/* -> src/ggml-kompute/*
133+
# ggml/src/ggml-metal/* -> src/ggml-metal/*
134+
# ggml/src/ggml-musa/* -> src/ggml-musa/*
135+
# ggml/src/ggml-rpc/* -> src/ggml-rpc/*
129136
# ggml/src/ggml-sycl/* -> src/ggml-sycl/*
130-
# ggml/src/vulkan-shaders/* -> src/vulkan-shaders/*
137+
# ggml/src/ggml-vulkan/* -> src/ggml-vulkan/*
131138
#
132139
# ggml/include/ggml*.h -> include/ggml*.h
133140
#
134141
# tests/test-opt.cpp -> tests/test-opt.cpp
135-
# tests/test-grad0.cpp -> tests/test-grad0.cpp
136142
# tests/test-quantize-fns.cpp -> tests/test-quantize-fns.cpp
137143
# tests/test-quantize-perf.cpp -> tests/test-quantize-perf.cpp
138144
# tests/test-backend-ops.cpp -> tests/test-backend-ops.cpp
@@ -143,20 +149,24 @@ if [ -f $SRC_GGML/llama-src.patch ]; then
143149
cat llama-src.patch | sed -E \
144150
-e 's/\/ggml\/CMakeLists\.txt/\/CMakeLists.txt/g' \
145151
-e 's/\/ggml\/src\/CMakeLists\.txt/\/src\/CMakeLists.txt/g' \
146-
-e 's/\/ggml\/cmake\/FindSIMD\.cmake/\/cmake\/FindSIMD.cmake/g' \
152+
-e 's/\/ggml\/cmake\/FindSIMD\.cmake/\/src\/ggml-cpu\/cmake\/FindSIMD.cmake/g' \
147153
-e 's/\/ggml\/src\/ggml(.*)\.c/\/src\/ggml\1.c/g' \
148154
-e 's/\/ggml\/src\/ggml(.*)\.cpp/\/src\/ggml\1.cpp/g' \
149155
-e 's/\/ggml\/src\/ggml(.*)\.h/\/src\/ggml\1.h/g' \
150-
-e 's/\/ggml\/src\/ggml(.*)\.cu/\/src\/ggml\1.cu/g' \
151-
-e 's/\/ggml\/src\/ggml(.*)\.m/\/src\/ggml\1.m/g' \
152156
-e 's/\/ggml\/src\/ggml-amx\//\/src\/ggml-amx\//g' \
157+
-e 's/\/ggml\/src\/ggml-blas\//\/src\/ggml-blas\//g' \
153158
-e 's/\/ggml\/src\/ggml-cann\//\/src\/ggml-cann\//g' \
159+
-e 's/\/ggml\/src\/ggml-cpu\//\/src\/ggml-cpu\//g' \
154160
-e 's/\/ggml\/src\/ggml-cuda\//\/src\/ggml-cuda\//g' \
161+
-e 's/\/ggml\/src\/ggml-hip\//\/src\/ggml-hip\//g' \
162+
-e 's/\/ggml\/src\/ggml-kompute\//\/src\/ggml-kompute\//g' \
163+
-e 's/\/ggml\/src\/ggml-metal\//\/src\/ggml-metal\//g' \
164+
-e 's/\/ggml\/src\/ggml-musa\//\/src\/ggml-musa\//g' \
165+
-e 's/\/ggml\/src\/ggml-rpc\//\/src\/ggml-rpc\//g' \
155166
-e 's/\/ggml\/src\/ggml-sycl\//\/src\/ggml-sycl\//g' \
156-
-e 's/\/ggml\/src\/vulkan-shaders\//\/src\/vulkan-shaders\//g' \
167+
-e 's/\/ggml\/src\/ggml-vulkan\//\/src\/ggml-vulkan\//g' \
157168
-e 's/\/ggml\/include\/ggml(.*)\.h/\/include\/ggml\1.h/g' \
158169
-e 's/\/tests\/test-opt\.cpp/\/tests\/test-opt.cpp/g' \
159-
-e 's/\/tests\/test-grad0\.cpp/\/tests\/test-grad0.cpp/g' \
160170
-e 's/\/tests\/test-quantize-fns\.cpp/\/tests\/test-quantize-fns.cpp/g' \
161171
-e 's/\/tests\/test-quantize-perf\.cpp/\/tests\/test-quantize-perf.cpp/g' \
162172
-e 's/\/tests\/test-backend-ops\.cpp/\/tests\/test-backend-ops.cpp/g' \

‎scripts/sync-llama.sh‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,22 @@ cp -rpv ../llama.cpp/ggml/cmake/FindSIMD.cmake cmake/FindSIMD.cmake
77
cp -rpv ../llama.cpp/ggml/src/ggml*.c src/
88
cp -rpv ../llama.cpp/ggml/src/ggml*.cpp src/
99
cp -rpv ../llama.cpp/ggml/src/ggml*.h src/
10-
cp -rpv ../llama.cpp/ggml/src/ggml*.cu src/
11-
cp -rpv ../llama.cpp/ggml/src/ggml*.m src/
1210
cp -rpv ../llama.cpp/ggml/src/ggml-amx/* src/ggml-amx/
11+
cp -rpv ../llama.cpp/ggml/src/ggml-blas/* src/ggml-blas/
1312
cp -rpv ../llama.cpp/ggml/src/ggml-cann/* src/ggml-cann/
13+
cp -rpv ../llama.cpp/ggml/src/ggml-cpu/* src/ggml-cpu/
1414
cp -rpv ../llama.cpp/ggml/src/ggml-cuda/* src/ggml-cuda/
15+
cp -rpv ../llama.cpp/ggml/src/ggml-hip/* src/ggml-hip/
16+
cp -rpv ../llama.cpp/ggml/src/ggml-kompute/* src/ggml-kompute/
17+
cp -rpv ../llama.cpp/ggml/src/ggml-metal/* src/ggml-metal/
18+
cp -rpv ../llama.cpp/ggml/src/ggml-musa/* src/ggml-musa/
19+
cp -rpv ../llama.cpp/ggml/src/ggml-rpc/* src/ggml-rpc/
1520
cp -rpv ../llama.cpp/ggml/src/ggml-sycl/* src/ggml-sycl/
16-
cp -rpv ../llama.cpp/ggml/src/vulkan-shaders/* src/vulkan-shaders/
21+
cp -rpv ../llama.cpp/ggml/src/ggml-vulkan/* src/ggml-vulkan/
1722

1823
cp -rpv ../llama.cpp/ggml/include/ggml*.h include/
1924

2025
cp -rpv ../llama.cpp/tests/test-opt.cpp tests/test-opt.cpp
21-
cp -rpv ../llama.cpp/tests/test-grad0.cpp tests/test-grad0.cpp
2226
cp -rpv ../llama.cpp/tests/test-quantize-fns.cpp tests/test-quantize-fns.cpp
2327
cp -rpv ../llama.cpp/tests/test-quantize-perf.cpp tests/test-quantize-perf.cpp
2428
cp -rpv ../llama.cpp/tests/test-backend-ops.cpp tests/test-backend-ops.cpp

0 commit comments

Comments
 (0)