Skip to content

Commit a2c6fd7

Browse files
ggerganovggerganov
committed
scripts : sync update
1 parent 97404c4 commit a2c6fd7

File tree

2 files changed

+30
-104
lines changed

2 files changed

+30
-104
lines changed

‎scripts/sync-ggml-am.sh‎

Lines changed: 20 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -114,46 +114,22 @@ if [ -f $SRC_LLAMA/ggml-src.patch ]; then
114114

115115
# replace filenames:
116116
#
117-
# CMakelists.txt -> ggml/CMakeLists.txt
118-
# src/CMakeLists.txt -> ggml/src/CMakeLists.txt
119-
# cmake/FindSIMD.cmake -> ggml/cmake/FindSIMD.cmake
117+
# CMakelists.txt -> ggml/CMakeLists.txt
118+
# src/CMakeLists.txt -> ggml/src/CMakeLists.txt
119+
# cmake/FindSIMD.cmake -> ggml/cmake/FindSIMD.cmake
120120
#
121-
# src/ggml.c -> ggml/src/ggml.c
122-
# src/ggml-aarch64.c -> ggml/src/ggml-aarch64.c
123-
# src/ggml-aarch64.h -> ggml/src/ggml-aarch64.h
124-
# src/ggml-alloc.c -> ggml/src/ggml-alloc.c
125-
# src/ggml-amx/* -> ggml/src/ggml-amx/
126-
# src/ggml-amx.cpp -> ggml/src/ggml-amx.cpp
127-
# src/ggml-backend-impl.h -> ggml/src/ggml-backend-impl.h
128-
# src/ggml-backend.cpp -> ggml/src/ggml-backend.cpp
129-
# src/ggml-cann/* -> ggml/src/ggml-cann/
130-
# src/ggml-cann.cpp -> ggml/src/ggml-cann.cpp
131-
# src/ggml-common.h -> ggml/src/ggml-common.h
132-
# src/ggml-cuda/* -> ggml/src/ggml-cuda/
133-
# src/ggml-cuda.cu -> ggml/src/ggml-cuda.cu
134-
# src/ggml-impl.h -> ggml/src/ggml-impl.h
135-
# src/ggml-kompute.cpp -> ggml/src/ggml-kompute.cpp
136-
# src/ggml-metal.m -> ggml/src/ggml-metal.m
137-
# src/ggml-quants.c -> ggml/src/ggml-quants.c
138-
# src/ggml-quants.h -> ggml/src/ggml-quants.h
139-
# src/ggml-rpc.cpp -> ggml/src/ggml-rpc.cpp
140-
# src/ggml-sycl/* -> ggml/src/ggml-sycl/
141-
# src/ggml-sycl.cpp -> ggml/src/ggml-sycl.cpp
142-
# src/ggml-vulkan.cpp -> ggml/src/ggml-vulkan.cpp
143-
# src/vulkan-shaders/* -> ggml/src/vulkan-shaders/
121+
# src/ggml*.c -> ggml/src/ggml*.c
122+
# src/ggml*.cpp -> ggml/src/ggml*.cpp
123+
# src/ggml*.h -> ggml/src/ggml*.h
124+
# src/ggml*.cu -> ggml/src/ggml*.cu
125+
# src/ggml*.m -> ggml/src/ggml*.m
126+
# src/ggml-amx/* -> ggml/src/ggml-amx/
127+
# src/ggml-cann/* -> ggml/src/ggml-cann/
128+
# src/ggml-cuda/* -> ggml/src/ggml-cuda/
129+
# src/ggml-sycl/* -> ggml/src/ggml-sycl/
130+
# src/vulkan-shaders/* -> ggml/src/vulkan-shaders/
144131
#
145-
# include/ggml.h -> ggml/include/ggml.h
146-
# include/ggml-alloc.h -> ggml/include/ggml-alloc.h
147-
# include/ggml-amx.h -> ggml/include/ggml-amx.h
148-
# include/ggml-backend.h -> ggml/include/ggml-backend.h
149-
# include/ggml-blas.h -> ggml/include/ggml-blas.h
150-
# include/ggml-cann.h -> ggml/include/ggml-cann.h
151-
# include/ggml-cuda.h -> ggml/include/ggml-cuda.h
152-
# include/ggml-kompute.h -> ggml/include/ggml-kompute.h
153-
# include/ggml-metal.h -> ggml/include/ggml-metal.h
154-
# include/ggml-rpc.h -> ggml/include/ggml-rpc.h
155-
# include/ggml-sycl.h -> ggml/include/ggml-sycl.h
156-
# include/ggml-vulkan.h -> ggml/include/ggml-vulkan.h
132+
# include/ggml*.h -> ggml/include/ggml*.h
157133
#
158134
# tests/test-opt.cpp -> tests/test-opt.cpp
159135
# tests/test-grad0.cpp -> tests/test-grad0.cpp
@@ -168,41 +144,17 @@ if [ -f $SRC_LLAMA/ggml-src.patch ]; then
168144
-e 's/([[:space:]]|[ab]\/)CMakeLists.txt/\1ggml\/CMakeLists.txt/g' \
169145
-e 's/([[:space:]]|[ab]\/)src\/CMakeLists.txt/\1ggml\/src\/CMakeLists.txt/g' \
170146
-e 's/([[:space:]]|[ab]\/)cmake\/FindSIMD.cmake/\1ggml\/cmake\/FindSIMD.cmake/g' \
171-
-e 's/([[:space:]]|[ab]\/)src\/ggml\.c/\1ggml\/src\/ggml.c/g' \
172-
-e 's/([[:space:]]|[ab]\/)src\/ggml-aarch64\.c/\1ggml\/src\/ggml-aarch64.c/g' \
173-
-e 's/([[:space:]]|[ab]\/)src\/ggml-aarch64\.h/\1ggml\/src\/ggml-aarch64.h/g' \
174-
-e 's/([[:space:]]|[ab]\/)src\/ggml-alloc\.c/\1ggml\/src\/ggml-alloc.c/g' \
147+
-e 's/([[:space:]]|[ab]\/)src\/ggml(.*)\.c/\1ggml\/src\/ggml\1.c/g' \
148+
-e 's/([[:space:]]|[ab]\/)src\/ggml(.*)\.cpp/\1ggml\/src\/ggml\1.cpp/g' \
149+
-e 's/([[:space:]]|[ab]\/)src\/ggml(.*)\.h/\1ggml\/src\/ggml\1.h/g' \
150+
-e 's/([[:space:]]|[ab]\/)src\/ggml(.*)\.cu/\1ggml\/src\/ggml\1.cu/g' \
151+
-e 's/([[:space:]]|[ab]\/)src\/ggml(.*)\.m/\1ggml\/src\/ggml\1.m/g' \
175152
-e 's/([[:space:]]|[ab]\/)src\/ggml-amx\//\1ggml\/src\/ggml-amx\//g' \
176-
-e 's/([[:space:]]|[ab]\/)src\/ggml-amx\.cpp/\1ggml\/src\/ggml-amx.cpp/g' \
177-
-e 's/([[:space:]]|[ab]\/)src\/ggml-backend-impl\.h/\1ggml\/src\/ggml-backend-impl.h/g' \
178-
-e 's/([[:space:]]|[ab]\/)src\/ggml-backend\.cpp/\1ggml\/src\/ggml-backend.cpp/g' \
179153
-e 's/([[:space:]]|[ab]\/)src\/ggml-cann\//\1ggml\/src\/ggml-cann\//g' \
180-
-e 's/([[:space:]]|[ab]\/)src\/ggml-cann\.cpp/\1ggml\/src\/ggml-cann.cpp/g' \
181-
-e 's/([[:space:]]|[ab]\/)src\/ggml-common\.h/\1ggml\/src\/ggml-common.h/g' \
182154
-e 's/([[:space:]]|[ab]\/)src\/ggml-cuda\//\1ggml\/src\/ggml-cuda\//g' \
183-
-e 's/([[:space:]]|[ab]\/)src\/ggml-cuda\.cu/\1ggml\/src\/ggml-cuda.cu/g' \
184-
-e 's/([[:space:]]|[ab]\/)src\/ggml-impl\.h/\1ggml\/src\/ggml-impl.h/g' \
185-
-e 's/([[:space:]]|[ab]\/)src\/ggml-kompute\.cpp/\1ggml\/src\/ggml-kompute.cpp/g' \
186-
-e 's/([[:space:]]|[ab]\/)src\/ggml-metal\.m/\1ggml\/src\/ggml-metal.m/g' \
187-
-e 's/([[:space:]]|[ab]\/)src\/ggml-quants\.c/\1ggml\/src\/ggml-quants.c/g' \
188-
-e 's/([[:space:]]|[ab]\/)src\/ggml-quants\.h/\1ggml\/src\/ggml-quants.h/g' \
189-
-e 's/([[:space:]]|[ab]\/)src\/ggml-rpc\.cpp/\1ggml\/src\/ggml-rpc.cpp/g' \
190155
-e 's/([[:space:]]|[ab]\/)src\/ggml-sycl\//\1ggml\/src\/ggml-sycl\//g' \
191-
-e 's/([[:space:]]|[ab]\/)src\/ggml-sycl\.cpp/\1ggml\/src\/ggml-sycl.cpp/g' \
192-
-e 's/([[:space:]]|[ab]\/)src\/ggml-vulkan\.cpp/\1ggml\/src\/ggml-vulkan.cpp/g' \
193156
-e 's/([[:space:]]|[ab]\/)src\/vulkan-shaders\//\1ggml\/src\/vulkan-shaders\//g' \
194-
-e 's/([[:space:]]|[ab]\/)include\/ggml\.h/\1ggml\/include\/ggml.h/g' \
195-
-e 's/([[:space:]]|[ab]\/)include\/ggml-alloc\.h/\1ggml\/include\/ggml-alloc.h/g' \
196-
-e 's/([[:space:]]|[ab]\/)include\/ggml-amx\.h/\1ggml\/include\/ggml-amx.h/g' \
197-
-e 's/([[:space:]]|[ab]\/)include\/ggml-backend\.h/\1ggml\/include\/ggml-backend.h/g' \
198-
-e 's/([[:space:]]|[ab]\/)include\/ggml-blas\.h/\1ggml\/include\/ggml-blas.h/g' \
199-
-e 's/([[:space:]]|[ab]\/)include\/ggml-cann\.h/\1ggml\/include\/ggml-cann.h/g' \
200-
-e 's/([[:space:]]|[ab]\/)include\/ggml-cuda\.h/\1ggml\/include\/ggml-cuda.h/g' \
201-
-e 's/([[:space:]]|[ab]\/)include\/ggml-kompute\.h/\1ggml\/include\/ggml-kompute.h/g' \
202-
-e 's/([[:space:]]|[ab]\/)include\/ggml-metal\.h/\1ggml\/include\/ggml-metal.h/g' \
203-
-e 's/([[:space:]]|[ab]\/)include\/ggml-rpc\.h/\1ggml\/include\/ggml-rpc.h/g' \
204-
-e 's/([[:space:]]|[ab]\/)include\/ggml-sycl\.h/\1ggml\/include\/ggml-sycl.h/g' \
205-
-e 's/([[:space:]]|[ab]\/)include\/ggml-vulkan\.h/\1ggml\/include\/ggml-vulkan.h/g' \
157+
-e 's/([[:space:]]|[ab]\/)include\/ggml(.*)\.h/\1ggml\/include\/ggml\1.h/g' \
206158
-e 's/([[:space:]]|[ab]\/)examples\/common\.h/\1examples\/common.h/g' \
207159
-e 's/([[:space:]]|[ab]\/)examples\/common\.cpp/\1examples\/common.cpp/g' \
208160
-e 's/([[:space:]]|[ab]\/)examples\/common-ggml\.h/\1examples\/common-ggml.h/g' \

‎scripts/sync-ggml.sh‎

Lines changed: 10 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -4,43 +4,17 @@ cp -rpv ../ggml/CMakeLists.txt ./ggml/CMakeLists.txt
44
cp -rpv ../ggml/src/CMakeLists.txt ./ggml/src/CMakeLists.txt
55
cp -rpv ../ggml/cmake/FindSIMD.cmake ./ggml/cmake/FindSIMD.cmake
66

7-
cp -rpv ../ggml/src/ggml.c ./ggml/src/ggml.c
8-
cp -rpv ../ggml/src/ggml-aarch64.c ./ggml/src/ggml-aarch64.c
9-
cp -rpv ../ggml/src/ggml-aarch64.h ./ggml/src/ggml-aarch64.h
10-
cp -rpv ../ggml/src/ggml-alloc.c ./ggml/src/ggml-alloc.c
11-
cp -rpv ../ggml/src/ggml-amx/* ./ggml/src/ggml-amx/
12-
cp -rpv ../ggml/src/ggml-amx.cpp ./ggml/src/ggml-amx.cpp
13-
cp -rpv ../ggml/src/ggml-backend-impl.h ./ggml/src/ggml-backend-impl.h
14-
cp -rpv ../ggml/src/ggml-backend.cpp ./ggml/src/ggml-backend.cpp
15-
cp -rpv ../ggml/src/ggml-cann/* ./ggml/src/ggml-cann/
16-
cp -rpv ../ggml/src/ggml-cann.cpp ./ggml/src/ggml-cann.cpp
17-
cp -rpv ../ggml/src/ggml-common.h ./ggml/src/ggml-common.h
18-
cp -rpv ../ggml/src/ggml-cuda/* ./ggml/src/ggml-cuda/
19-
cp -rpv ../ggml/src/ggml-cuda.cu ./ggml/src/ggml-cuda.cu
20-
cp -rpv ../ggml/src/ggml-impl.h ./ggml/src/ggml-impl.h
21-
cp -rpv ../ggml/src/ggml-kompute.cpp ./ggml/src/ggml-kompute.cpp
22-
cp -rpv ../ggml/src/ggml-metal.m ./ggml/src/ggml-metal.m
23-
cp -rpv ../ggml/src/ggml-metal.metal ./ggml/src/ggml-metal.metal
24-
cp -rpv ../ggml/src/ggml-quants.c ./ggml/src/ggml-quants.c
25-
cp -rpv ../ggml/src/ggml-quants.h ./ggml/src/ggml-quants.h
26-
cp -rpv ../ggml/src/ggml-rpc.cpp ./ggml/src/ggml-rpc.cpp
27-
cp -rpv ../ggml/src/ggml-sycl/* ./ggml/src/ggml-sycl/
28-
cp -rpv ../ggml/src/ggml-sycl.cpp ./ggml/src/ggml-sycl.cpp
29-
cp -rpv ../ggml/src/ggml-vulkan.cpp ./ggml/src/ggml-vulkan.cpp
30-
cp -rpv ../ggml/src/vulkan-shaders/* ./ggml/src/vulkan-shaders/
7+
cp -rpv ../ggml/src/ggml*.c ./ggml/src/
8+
cp -rpv ../ggml/src/ggml*.cpp ./ggml/src/
9+
cp -rpv ../ggml/src/ggml*.h ./ggml/src/
10+
cp -rpv ../ggml/src/ggml*.cu ./ggml/src/
11+
cp -rpv ../ggml/src/ggml*.m ./ggml/src/
12+
cp -rpv ../ggml/src/ggml-cann/* ./ggml/src/ggml-cann/
13+
cp -rpv ../ggml/src/ggml-cuda/* ./ggml/src/ggml-cuda/
14+
cp -rpv ../ggml/src/ggml-sycl/* ./ggml/src/ggml-sycl/
15+
cp -rpv ../ggml/src/vulkan-shaders/* ./ggml/src/vulkan-shaders/
3116

32-
cp -rpv ../ggml/include/ggml.h ./ggml/include/ggml.h
33-
cp -rpv ../ggml/include/ggml-alloc.h ./ggml/include/ggml-alloc.h
34-
cp -rpv ../ggml/include/ggml-amx.h ./ggml/include/ggml-amx.h
35-
cp -rpv ../ggml/include/ggml-backend.h ./ggml/include/ggml-backend.h
36-
cp -rpv ../ggml/include/ggml-blas.h ./ggml/include/ggml-blas.h
37-
cp -rpv ../ggml/include/ggml-cann.h ./ggml/include/ggml-cann.h
38-
cp -rpv ../ggml/include/ggml-cuda.h ./ggml/include/ggml-cuda.h
39-
cp -rpv ../ggml/include/ggml-kompute.h ./ggml/include/ggml-kompute.h
40-
cp -rpv ../ggml/include/ggml-metal.h ./ggml/include/ggml-metal.h
41-
cp -rpv ../ggml/include/ggml-rpc.h ./ggml/include/ggml-rpc.h
42-
cp -rpv ../ggml/include/ggml-sycl.h ./ggml/include/ggml-sycl.h
43-
cp -rpv ../ggml/include/ggml-vulkan.h ./ggml/include/ggml-vulkan.h
17+
cp -rpv ../ggml/include/ggml*.h ./ggml/include/
4418

4519
cp -rpv ../ggml/tests/test-opt.cpp ./tests/test-opt.cpp
4620
cp -rpv ../ggml/tests/test-grad0.cpp ./tests/test-grad0.cpp

0 commit comments

Comments
 (0)