Skip to content

Commit 5c9a8b2

Browse files
ggerganovggerganov
committed
scripts : update sync
1 parent 0fff7fd commit 5c9a8b2

File tree

2 files changed

+45
-35
lines changed

2 files changed

+45
-35
lines changed

‎scripts/sync-ggml-am.sh‎

Lines changed: 30 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -73,17 +73,20 @@ while read c; do
7373
src/ggml*.h \
7474
src/ggml*.c \
7575
src/ggml*.cpp \
76-
src/ggml*.m \
77-
src/ggml*.metal \
78-
src/ggml*.cu \
7976
src/ggml-amx/* \
77+
src/ggml-blas/* \
8078
src/ggml-cann/* \
79+
src/ggml-cpu/* \
8180
src/ggml-cuda/* \
81+
src/ggml-hip/* \
82+
src/ggml-kompute/* \
83+
src/ggml-metal/* \
84+
src/ggml-musa/* \
85+
src/ggml-rpc/* \
8286
src/ggml-sycl/* \
83-
src/vulkan-shaders/* \
87+
src/ggml-vulkan/* \
8488
include/ggml*.h \
8589
tests/test-opt.cpp \
86-
tests/test-grad0.cpp \
8790
tests/test-quantize-fns.cpp \
8891
tests/test-quantize-perf.cpp \
8992
tests/test-backend-ops.cpp \
@@ -121,21 +124,22 @@ if [ -f $SRC_LLAMA/ggml-src.patch ]; then
121124
# src/ggml*.c -> ggml/src/ggml*.c
122125
# src/ggml*.cpp -> ggml/src/ggml*.cpp
123126
# 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/
127+
# src/ggml-amx/* -> ggml/src/ggml-amx/*
128+
# src/ggml-blas/* -> ggml/src/ggml-blas/*
129+
# src/ggml-cann/* -> ggml/src/ggml-cann/*
130+
# src/ggml-cpu/* -> ggml/src/ggml-cpu/*
131+
# src/ggml-cuda/* -> ggml/src/ggml-cuda/*
132+
# src/ggml-hip/* -> ggml/src/ggml-hip/*
133+
# src/ggml-kompute/* -> ggml/src/ggml-kompute/*
134+
# src/ggml-metal/* -> ggml/src/ggml-metal/*
135+
# src/ggml-musa/* -> ggml/src/ggml-musa/*
136+
# src/ggml-rpc/* -> ggml/src/ggml-rpc/*
137+
# src/ggml-sycl/* -> ggml/src/ggml-sycl/*
138+
# src/ggml-vulkan/* -> ggml/src/ggml-vulkan/*
131139
#
132140
# include/ggml*.h -> ggml/include/ggml*.h
133141
#
134-
# tests/test-opt.cpp -> tests/test-opt.cpp
135-
# tests/test-grad0.cpp -> tests/test-grad0.cpp
136-
# tests/test-quantize-fns.cpp -> tests/test-quantize-fns.cpp
137-
# tests/test-quantize-perf.cpp -> tests/test-quantize-perf.cpp
138-
# tests/test-backend-ops.cpp -> tests/test-backend-ops.cpp
142+
# tests/test*.cpp -> tests/
139143
#
140144
# LICENSE -> LICENSE
141145
# scripts/gen-authors.sh -> scripts/gen-authors.sh
@@ -147,18 +151,20 @@ if [ -f $SRC_LLAMA/ggml-src.patch ]; then
147151
-e 's/([[:space:]]|[ab]\/)src\/ggml(.*)\.c/\1ggml\/src\/ggml\2.c/g' \
148152
-e 's/([[:space:]]|[ab]\/)src\/ggml(.*)\.cpp/\1ggml\/src\/ggml\2.cpp/g' \
149153
-e 's/([[:space:]]|[ab]\/)src\/ggml(.*)\.h/\1ggml\/src\/ggml\2.h/g' \
150-
-e 's/([[:space:]]|[ab]\/)src\/ggml(.*)\.cu/\1ggml\/src\/ggml\2.cu/g' \
151-
-e 's/([[:space:]]|[ab]\/)src\/ggml(.*)\.m/\1ggml\/src\/ggml\2.m/g' \
152154
-e 's/([[:space:]]|[ab]\/)src\/ggml-amx\//\1ggml\/src\/ggml-amx\//g' \
155+
-e 's/([[:space:]]|[ab]\/)src\/ggml-blas\//\1ggml\/src\/ggml-blas\//g' \
153156
-e 's/([[:space:]]|[ab]\/)src\/ggml-cann\//\1ggml\/src\/ggml-cann\//g' \
157+
-e 's/([[:space:]]|[ab]\/)src\/ggml-cpu\//\1ggml\/src\/ggml-cpu\//g' \
154158
-e 's/([[:space:]]|[ab]\/)src\/ggml-cuda\//\1ggml\/src\/ggml-cuda\//g' \
159+
-e 's/([[:space:]]|[ab]\/)src\/ggml-hip\//\1ggml\/src\/ggml-hip\//g' \
160+
-e 's/([[:space:]]|[ab]\/)src\/ggml-kompute\//\1ggml\/src\/ggml-kompute\//g' \
161+
-e 's/([[:space:]]|[ab]\/)src\/ggml-metal\//\1ggml\/src\/ggml-metal\//g' \
162+
-e 's/([[:space:]]|[ab]\/)src\/ggml-musa\//\1ggml\/src\/ggml-musa\//g' \
163+
-e 's/([[:space:]]|[ab]\/)src\/ggml-rpc\//\1ggml\/src\/ggml-rpc\//g' \
155164
-e 's/([[:space:]]|[ab]\/)src\/ggml-sycl\//\1ggml\/src\/ggml-sycl\//g' \
156-
-e 's/([[:space:]]|[ab]\/)src\/vulkan-shaders\//\1ggml\/src\/vulkan-shaders\//g' \
165+
-e 's/([[:space:]]|[ab]\/)src\/ggml-vulkan\//\1ggml\/src\/ggml-vulkan\//g' \
157166
-e 's/([[:space:]]|[ab]\/)include\/ggml(.*)\.h/\1ggml\/include\/ggml\2.h/g' \
158-
-e 's/([[:space:]]|[ab]\/)examples\/common\.h/\1examples\/common.h/g' \
159-
-e 's/([[:space:]]|[ab]\/)examples\/common\.cpp/\1examples\/common.cpp/g' \
160-
-e 's/([[:space:]]|[ab]\/)examples\/common-ggml\.h/\1examples\/common-ggml.h/g' \
161-
-e 's/([[:space:]]|[ab]\/)examples\/common-ggml\.cpp/\1examples\/common-ggml.cpp/g' \
167+
-e 's/([[:space:]]|[ab]\/)tests\/(.*)\.cpp/\1tests\/\2.cpp/g' \
162168
-e 's/([[:space:]]|[ab]\/)LICENSE/\1LICENSE/g' \
163169
-e 's/([[:space:]]|[ab]\/)scripts\/gen-authors\.sh/\1scripts\/gen-authors.sh/g' \
164170
> ggml-src.patch.tmp

‎scripts/sync-ggml.sh‎

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,25 @@ 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/
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-amx/* ./ggml/src/ggml-amx/
13-
cp -rpv ../ggml/src/ggml-cann/* ./ggml/src/ggml-cann/
14-
cp -rpv ../ggml/src/ggml-cuda/* ./ggml/src/ggml-cuda/
15-
cp -rpv ../ggml/src/ggml-sycl/* ./ggml/src/ggml-sycl/
16-
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-amx/* ./ggml/src/ggml-amx/
11+
cp -rpv ../ggml/src/ggml-blas/* ./ggml/src/ggml-blas/
12+
cp -rpv ../ggml/src/ggml-cann/* ./ggml/src/ggml-cann/
13+
cp -rpv ../ggml/src/ggml-cpu/* ./ggml/src/ggml-cpu/
14+
cp -rpv ../ggml/src/ggml-cuda/* ./ggml/src/ggml-cuda/
15+
cp -rpv ../ggml/src/ggml-hip/* ./ggml/src/ggml-hip/
16+
cp -rpv ../ggml/src/ggml-kompute/* ./ggml/src/ggml-kompute/
17+
cp -rpv ../ggml/src/ggml-metal/* ./ggml/src/ggml-metal/
18+
cp -rpv ../ggml/src/ggml-musa/* ./ggml/src/ggml-musa/
19+
cp -rpv ../ggml/src/ggml-rpc/* ./ggml/src/ggml-rpc/
20+
cp -rpv ../ggml/src/ggml-sycl/* ./ggml/src/ggml-sycl/
21+
cp -rpv ../ggml/src/ggml-vulkan/* ./ggml/src/ggml-vulkan/
1722

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

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

0 commit comments

Comments
 (0)