ggerganov commited on
Commit
f751550
·
unverified ·
1 Parent(s): 87b427e

scripts : sync opencl, gguf

Browse files
Files changed (2) hide show
  1. scripts/sync-ggml-am.sh +9 -0
  2. scripts/sync-ggml.sh +3 -0
scripts/sync-ggml-am.sh CHANGED
@@ -59,6 +59,7 @@ while read c; do
59
  src/ggml*.h \
60
  src/ggml*.c \
61
  src/ggml*.cpp \
 
62
  src/ggml-blas/* \
63
  src/ggml-cann/* \
64
  src/ggml-cpu/* \
@@ -67,10 +68,12 @@ while read c; do
67
  src/ggml-kompute/* \
68
  src/ggml-metal/* \
69
  src/ggml-musa/* \
 
70
  src/ggml-rpc/* \
71
  src/ggml-sycl/* \
72
  src/ggml-vulkan/* \
73
  include/ggml*.h \
 
74
  examples/common.h \
75
  examples/common.cpp \
76
  examples/common-ggml.h \
@@ -109,6 +112,7 @@ if [ -f $SRC_WHISPER/ggml-src.patch ]; then
109
  # src/ggml*.c -> ggml/src/ggml*.c
110
  # src/ggml*.cpp -> ggml/src/ggml*.cpp
111
  # src/ggml*.h -> ggml/src/ggml*.h
 
112
  # src/ggml-blas/* -> ggml/src/ggml-blas/*
113
  # src/ggml-cann/* -> ggml/src/ggml-cann/*
114
  # src/ggml-cpu/* -> ggml/src/ggml-cpu/*
@@ -117,11 +121,13 @@ if [ -f $SRC_WHISPER/ggml-src.patch ]; then
117
  # src/ggml-kompute/* -> ggml/src/ggml-kompute/*
118
  # src/ggml-metal/* -> ggml/src/ggml-metal/*
119
  # src/ggml-musa/* -> ggml/src/ggml-musa/*
 
120
  # src/ggml-rpc/* -> ggml/src/ggml-rpc/*
121
  # src/ggml-sycl/* -> ggml/src/ggml-sycl/*
122
  # src/ggml-vulkan/* -> ggml/src/ggml-vulkan/*
123
  #
124
  # include/ggml*.h -> ggml/include/ggml*.h
 
125
  #
126
  # examples/common.h -> examples/common.h
127
  # examples/common.cpp -> examples/common.cpp
@@ -138,6 +144,7 @@ if [ -f $SRC_WHISPER/ggml-src.patch ]; then
138
  -e 's/([[:space:]]|[ab]\/)src\/ggml(.*)\.c/\1ggml\/src\/ggml\2.c/g' \
139
  -e 's/([[:space:]]|[ab]\/)src\/ggml(.*)\.cpp/\1ggml\/src\/ggml\2.cpp/g' \
140
  -e 's/([[:space:]]|[ab]\/)src\/ggml(.*)\.h/\1ggml\/src\/ggml\2.h/g' \
 
141
  -e 's/([[:space:]]|[ab]\/)src\/ggml-blas\//\1ggml\/src\/ggml-blas\//g' \
142
  -e 's/([[:space:]]|[ab]\/)src\/ggml-cann\//\1ggml\/src\/ggml-cann\//g' \
143
  -e 's/([[:space:]]|[ab]\/)src\/ggml-cpu\//\1ggml\/src\/ggml-cpu\//g' \
@@ -146,10 +153,12 @@ if [ -f $SRC_WHISPER/ggml-src.patch ]; then
146
  -e 's/([[:space:]]|[ab]\/)src\/ggml-kompute\//\1ggml\/src\/ggml-kompute\//g' \
147
  -e 's/([[:space:]]|[ab]\/)src\/ggml-metal\//\1ggml\/src\/ggml-metal\//g' \
148
  -e 's/([[:space:]]|[ab]\/)src\/ggml-musa\//\1ggml\/src\/ggml-musa\//g' \
 
149
  -e 's/([[:space:]]|[ab]\/)src\/ggml-rpc\//\1ggml\/src\/ggml-rpc\//g' \
150
  -e 's/([[:space:]]|[ab]\/)src\/ggml-sycl\//\1ggml\/src\/ggml-sycl\//g' \
151
  -e 's/([[:space:]]|[ab]\/)src\/ggml-vulkan\//\1ggml\/src\/ggml-vulkan\//g' \
152
  -e 's/([[:space:]]|[ab]\/)include\/ggml(.*)\.h/\1ggml\/include\/ggml\2.h/g' \
 
153
  -e 's/(^[[:space:]]|[ab]\/)examples\/common\.h/\1examples\/common.h/g' \
154
  -e 's/(^[[:space:]]|[ab]\/)examples\/common\.cpp/\1examples\/common.cpp/g' \
155
  -e 's/(^[[:space:]]|[ab]\/)examples\/common-ggml\.h/\1examples\/common-ggml.h/g' \
 
59
  src/ggml*.h \
60
  src/ggml*.c \
61
  src/ggml*.cpp \
62
+ src/gguf*.cpp \
63
  src/ggml-blas/* \
64
  src/ggml-cann/* \
65
  src/ggml-cpu/* \
 
68
  src/ggml-kompute/* \
69
  src/ggml-metal/* \
70
  src/ggml-musa/* \
71
+ src/ggml-opencl/* \
72
  src/ggml-rpc/* \
73
  src/ggml-sycl/* \
74
  src/ggml-vulkan/* \
75
  include/ggml*.h \
76
+ include/gguf*.h \
77
  examples/common.h \
78
  examples/common.cpp \
79
  examples/common-ggml.h \
 
112
  # src/ggml*.c -> ggml/src/ggml*.c
113
  # src/ggml*.cpp -> ggml/src/ggml*.cpp
114
  # src/ggml*.h -> ggml/src/ggml*.h
115
+ # src/gguf*.cpp -> ggml/src/gguf*.cpp
116
  # src/ggml-blas/* -> ggml/src/ggml-blas/*
117
  # src/ggml-cann/* -> ggml/src/ggml-cann/*
118
  # src/ggml-cpu/* -> ggml/src/ggml-cpu/*
 
121
  # src/ggml-kompute/* -> ggml/src/ggml-kompute/*
122
  # src/ggml-metal/* -> ggml/src/ggml-metal/*
123
  # src/ggml-musa/* -> ggml/src/ggml-musa/*
124
+ # src/ggml-opencl/* > ggml/src/ggml-opencl/*
125
  # src/ggml-rpc/* -> ggml/src/ggml-rpc/*
126
  # src/ggml-sycl/* -> ggml/src/ggml-sycl/*
127
  # src/ggml-vulkan/* -> ggml/src/ggml-vulkan/*
128
  #
129
  # include/ggml*.h -> ggml/include/ggml*.h
130
+ # include/gguf*.h -> ggml/include/gguf*.h
131
  #
132
  # examples/common.h -> examples/common.h
133
  # examples/common.cpp -> examples/common.cpp
 
144
  -e 's/([[:space:]]|[ab]\/)src\/ggml(.*)\.c/\1ggml\/src\/ggml\2.c/g' \
145
  -e 's/([[:space:]]|[ab]\/)src\/ggml(.*)\.cpp/\1ggml\/src\/ggml\2.cpp/g' \
146
  -e 's/([[:space:]]|[ab]\/)src\/ggml(.*)\.h/\1ggml\/src\/ggml\2.h/g' \
147
+ -e 's/([[:space:]]|[ab]\/)src\/gguf(.*)\.cpp/\1ggml\/src\/gguf\2.cpp/g' \
148
  -e 's/([[:space:]]|[ab]\/)src\/ggml-blas\//\1ggml\/src\/ggml-blas\//g' \
149
  -e 's/([[:space:]]|[ab]\/)src\/ggml-cann\//\1ggml\/src\/ggml-cann\//g' \
150
  -e 's/([[:space:]]|[ab]\/)src\/ggml-cpu\//\1ggml\/src\/ggml-cpu\//g' \
 
153
  -e 's/([[:space:]]|[ab]\/)src\/ggml-kompute\//\1ggml\/src\/ggml-kompute\//g' \
154
  -e 's/([[:space:]]|[ab]\/)src\/ggml-metal\//\1ggml\/src\/ggml-metal\//g' \
155
  -e 's/([[:space:]]|[ab]\/)src\/ggml-musa\//\1ggml\/src\/ggml-musa\//g' \
156
+ -e 's/([[:space:]]|[ab]\/)src\/ggml-opencl\//\1ggml\/src\/ggml-opencl\//g' \
157
  -e 's/([[:space:]]|[ab]\/)src\/ggml-rpc\//\1ggml\/src\/ggml-rpc\//g' \
158
  -e 's/([[:space:]]|[ab]\/)src\/ggml-sycl\//\1ggml\/src\/ggml-sycl\//g' \
159
  -e 's/([[:space:]]|[ab]\/)src\/ggml-vulkan\//\1ggml\/src\/ggml-vulkan\//g' \
160
  -e 's/([[:space:]]|[ab]\/)include\/ggml(.*)\.h/\1ggml\/include\/ggml\2.h/g' \
161
+ -e 's/([[:space:]]|[ab]\/)include\/gguf(.*)\.h/\1ggml\/include\/gguf\2.h/g' \
162
  -e 's/(^[[:space:]]|[ab]\/)examples\/common\.h/\1examples\/common.h/g' \
163
  -e 's/(^[[:space:]]|[ab]\/)examples\/common\.cpp/\1examples\/common.cpp/g' \
164
  -e 's/(^[[:space:]]|[ab]\/)examples\/common-ggml\.h/\1examples\/common-ggml.h/g' \
scripts/sync-ggml.sh CHANGED
@@ -7,6 +7,7 @@ cp -rpv ../ggml/cmake/FindSIMD.cmake ./ggml/cmake/FindSIMD.cmake
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-blas/* ./ggml/src/ggml-blas/
11
  cp -rpv ../ggml/src/ggml-cann/* ./ggml/src/ggml-cann/
12
  cp -rpv ../ggml/src/ggml-cpu/* ./ggml/src/ggml-cpu/
@@ -15,11 +16,13 @@ cp -rpv ../ggml/src/ggml-hip/* ./ggml/src/ggml-hip/
15
  cp -rpv ../ggml/src/ggml-kompute/* ./ggml/src/ggml-kompute/
16
  cp -rpv ../ggml/src/ggml-metal/* ./ggml/src/ggml-metal/
17
  cp -rpv ../ggml/src/ggml-musa/* ./ggml/src/ggml-musa/
 
18
  cp -rpv ../ggml/src/ggml-rpc/* ./ggml/src/ggml-rpc/
19
  cp -rpv ../ggml/src/ggml-sycl/* ./ggml/src/ggml-sycl/
20
  cp -rpv ../ggml/src/ggml-vulkan/* ./ggml/src/ggml-vulkan/
21
 
22
  cp -rpv ../ggml/include/ggml*.h ./ggml/include/
 
23
 
24
  cp -rpv ../ggml/examples/common.h ./examples/common.h
25
  cp -rpv ../ggml/examples/common.cpp ./examples/common.cpp
 
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/gguf*.cpp ./ggml/src/
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/
 
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-opencl/* ./ggml/src/ggml-opencl/
20
  cp -rpv ../ggml/src/ggml-rpc/* ./ggml/src/ggml-rpc/
21
  cp -rpv ../ggml/src/ggml-sycl/* ./ggml/src/ggml-sycl/
22
  cp -rpv ../ggml/src/ggml-vulkan/* ./ggml/src/ggml-vulkan/
23
 
24
  cp -rpv ../ggml/include/ggml*.h ./ggml/include/
25
+ cp -rpv ../ggml/include/gguf*.h ./ggml/include/
26
 
27
  cp -rpv ../ggml/examples/common.h ./examples/common.h
28
  cp -rpv ../ggml/examples/common.cpp ./examples/common.cpp