ggerganov commited on
Commit
1741306
·
1 Parent(s): 414329d

scripts : update sync

Browse files
Files changed (2) hide show
  1. scripts/sync-ggml-am.sh +39 -26
  2. scripts/sync-ggml.sh +15 -10
scripts/sync-ggml-am.sh CHANGED
@@ -59,14 +59,18 @@ while read c; do
59
  src/ggml*.h \
60
  src/ggml*.c \
61
  src/ggml*.cpp \
62
- src/ggml*.m \
63
- src/ggml*.metal \
64
- src/ggml*.cu \
65
  src/ggml-amx/* \
 
66
  src/ggml-cann/* \
 
67
  src/ggml-cuda/* \
 
 
 
 
 
68
  src/ggml-sycl/* \
69
- src/vulkan-shaders/* \
70
  include/ggml*.h \
71
  examples/common.h \
72
  examples/common.cpp \
@@ -103,16 +107,21 @@ if [ -f $SRC_WHISPER/ggml-src.patch ]; then
103
  # src/CMakeLists.txt -> ggml/src/CMakeLists.txt
104
  # cmake/FindSIMD.cmake -> ggml/cmake/FindSIMD.cmake
105
  #
106
- # src/ggml*.c -> ggml/src/ggml*.c
107
- # src/ggml*.cpp -> ggml/src/ggml*.cpp
108
- # src/ggml*.h -> ggml/src/ggml*.h
109
- # src/ggml*.cu -> ggml/src/ggml*.cu
110
- # src/ggml*.m -> ggml/src/ggml*.m
111
- # src/ggml-amx/* -> ggml/src/ggml-amx/
112
- # src/ggml-cann/* -> ggml/src/ggml-cann/
113
- # src/ggml-cuda/* -> ggml/src/ggml-cuda/
114
- # src/ggml-sycl/* -> ggml/src/ggml-sycl/*
115
- # src/vulkan-shaders/* -> ggml/src/vulkan-shaders/*
 
 
 
 
 
116
  #
117
  # include/ggml*.h -> ggml/include/ggml*.h
118
  #
@@ -128,18 +137,22 @@ if [ -f $SRC_WHISPER/ggml-src.patch ]; then
128
  -e 's/(^[[:space:]]|[ab]\/)CMakeLists.txt/\1ggml\/CMakeLists.txt/g' \
129
  -e 's/(^[[:space:]]|[ab]\/)src\/CMakeLists.txt/\1ggml\/src\/CMakeLists.txt/g' \
130
  -e 's/(^[[:space:]]|[ab]\/)cmake\/FindSIMD.cmake/\1ggml\/cmake\/FindSIMD.cmake/g' \
131
- -e 's/(^[[:space:]]|[ab]\/)src\/ggml(.*)\.c/\1ggml\/src\/ggml\2.c/g' \
132
- -e 's/(^[[:space:]]|[ab]\/)src\/ggml(.*)\.cpp/\1ggml\/src\/ggml\2.cpp/g' \
133
- -e 's/(^[[:space:]]|[ab]\/)src\/ggml(.*)\.h/\1ggml\/src\/ggml\2.h/g' \
134
- -e 's/(^[[:space:]]|[ab]\/)src\/ggml(.*)\.cu/\1ggml\/src\/ggml\2.cu/g' \
135
- -e 's/(^[[:space:]]|[ab]\/)src\/ggml(.*)\.m/\1ggml\/src\/ggml\2.m/g' \
136
- -e 's/(^[[:space:]]|[ab]\/)src\/ggml-amx\//\1ggml\/src\/ggml-amx\//g' \
137
- -e 's/(^[[:space:]]|[ab]\/)src\/ggml-cann\//\1ggml\/src\/ggml-cann\//g' \
138
- -e 's/(^[[:space:]]|[ab]\/)src\/ggml-cuda\//\1ggml\/src\/ggml-cuda\//g' \
139
- -e 's/(^[[:space:]]|[ab]\/)src\/ggml-kompute\.cpp/\1ggml\/src\/ggml-kompute.cpp/g' \
140
- -e 's/(^[[:space:]]|[ab]\/)src\/ggml-sycl\//\1ggml\/src\/ggml-sycl\//g' \
141
- -e 's/(^[[:space:]]|[ab]\/)src\/vulkan-shaders\//\1ggml\/src\/vulkan-shaders\//g' \
142
- -e 's/(^[[:space:]]|[ab]\/)include\/ggml(.*)\.h/\1ggml\/include\/ggml\2.h/g' \
 
 
 
 
143
  -e 's/(^[[:space:]]|[ab]\/)examples\/common\.h/\1examples\/common.h/g' \
144
  -e 's/(^[[:space:]]|[ab]\/)examples\/common\.cpp/\1examples\/common.cpp/g' \
145
  -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/ggml-amx/* \
63
+ src/ggml-blas/* \
64
  src/ggml-cann/* \
65
+ src/ggml-cpu/* \
66
  src/ggml-cuda/* \
67
+ src/ggml-hip/* \
68
+ src/ggml-kompute/* \
69
+ src/ggml-metal/* \
70
+ src/ggml-musa/* \
71
+ src/ggml-rpc/* \
72
  src/ggml-sycl/* \
73
+ src/ggml-vulkan/* \
74
  include/ggml*.h \
75
  examples/common.h \
76
  examples/common.cpp \
 
107
  # src/CMakeLists.txt -> ggml/src/CMakeLists.txt
108
  # cmake/FindSIMD.cmake -> ggml/cmake/FindSIMD.cmake
109
  #
110
+ # src/ggml*.c -> ggml/src/ggml*.c
111
+ # src/ggml*.cpp -> ggml/src/ggml*.cpp
112
+ # src/ggml*.h -> ggml/src/ggml*.h
113
+ # src/ggml-amx/* -> ggml/src/ggml-amx/*
114
+ # src/ggml-blas/* -> ggml/src/ggml-blas/*
115
+ # src/ggml-cann/* -> ggml/src/ggml-cann/*
116
+ # src/ggml-cpu/* -> ggml/src/ggml-cpu/*
117
+ # src/ggml-cuda/* -> ggml/src/ggml-cuda/*
118
+ # src/ggml-hip/* -> ggml/src/ggml-hip/*
119
+ # src/ggml-kompute/* -> ggml/src/ggml-kompute/*
120
+ # src/ggml-metal/* -> ggml/src/ggml-metal/*
121
+ # src/ggml-musa/* -> ggml/src/ggml-musa/*
122
+ # src/ggml-rpc/* -> ggml/src/ggml-rpc/*
123
+ # src/ggml-sycl/* -> ggml/src/ggml-sycl/*
124
+ # src/ggml-vulkan/* -> ggml/src/ggml-vulkan/*
125
  #
126
  # include/ggml*.h -> ggml/include/ggml*.h
127
  #
 
137
  -e 's/(^[[:space:]]|[ab]\/)CMakeLists.txt/\1ggml\/CMakeLists.txt/g' \
138
  -e 's/(^[[:space:]]|[ab]\/)src\/CMakeLists.txt/\1ggml\/src\/CMakeLists.txt/g' \
139
  -e 's/(^[[:space:]]|[ab]\/)cmake\/FindSIMD.cmake/\1ggml\/cmake\/FindSIMD.cmake/g' \
140
+ -e 's/([[:space:]]|[ab]\/)src\/ggml(.*)\.c/\1ggml\/src\/ggml\2.c/g' \
141
+ -e 's/([[:space:]]|[ab]\/)src\/ggml(.*)\.cpp/\1ggml\/src\/ggml\2.cpp/g' \
142
+ -e 's/([[:space:]]|[ab]\/)src\/ggml(.*)\.h/\1ggml\/src\/ggml\2.h/g' \
143
+ -e 's/([[:space:]]|[ab]\/)src\/ggml-amx\//\1ggml\/src\/ggml-amx\//g' \
144
+ -e 's/([[:space:]]|[ab]\/)src\/ggml-blas\//\1ggml\/src\/ggml-blas\//g' \
145
+ -e 's/([[:space:]]|[ab]\/)src\/ggml-cann\//\1ggml\/src\/ggml-cann\//g' \
146
+ -e 's/([[:space:]]|[ab]\/)src\/ggml-cpu\//\1ggml\/src\/ggml-cpu\//g' \
147
+ -e 's/([[:space:]]|[ab]\/)src\/ggml-cuda\//\1ggml\/src\/ggml-cuda\//g' \
148
+ -e 's/([[:space:]]|[ab]\/)src\/ggml-hip\//\1ggml\/src\/ggml-hip\//g' \
149
+ -e 's/([[:space:]]|[ab]\/)src\/ggml-kompute\//\1ggml\/src\/ggml-kompute\//g' \
150
+ -e 's/([[:space:]]|[ab]\/)src\/ggml-metal\//\1ggml\/src\/ggml-metal\//g' \
151
+ -e 's/([[:space:]]|[ab]\/)src\/ggml-musa\//\1ggml\/src\/ggml-musa\//g' \
152
+ -e 's/([[:space:]]|[ab]\/)src\/ggml-rpc\//\1ggml\/src\/ggml-rpc\//g' \
153
+ -e 's/([[:space:]]|[ab]\/)src\/ggml-sycl\//\1ggml\/src\/ggml-sycl\//g' \
154
+ -e 's/([[:space:]]|[ab]\/)src\/ggml-vulkan\//\1ggml\/src\/ggml-vulkan\//g' \
155
+ -e 's/([[:space:]]|[ab]\/)include\/ggml(.*)\.h/\1ggml\/include\/ggml\2.h/g' \
156
  -e 's/(^[[:space:]]|[ab]\/)examples\/common\.h/\1examples\/common.h/g' \
157
  -e 's/(^[[:space:]]|[ab]\/)examples\/common\.cpp/\1examples\/common.cpp/g' \
158
  -e 's/(^[[:space:]]|[ab]\/)examples\/common-ggml\.h/\1examples\/common-ggml.h/g' \
scripts/sync-ggml.sh CHANGED
@@ -4,16 +4,21 @@ cp -rpv ../ggml/CMakeLists.txt ./ggml/CMakeLists.txt
4
  cp -rpv ../ggml/src/CMakeLists.txt ./ggml/src/CMakeLists.txt
5
  cp -rpv ../ggml/cmake/FindSIMD.cmake ./ggml/cmake/FindSIMD.cmake
6
 
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/
 
 
 
 
 
17
 
18
  cp -rpv ../ggml/include/ggml*.h ./ggml/include/
19
 
 
4
  cp -rpv ../ggml/src/CMakeLists.txt ./ggml/src/CMakeLists.txt
5
  cp -rpv ../ggml/cmake/FindSIMD.cmake ./ggml/cmake/FindSIMD.cmake
6
 
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/
22
 
23
  cp -rpv ../ggml/include/ggml*.h ./ggml/include/
24