1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
|
#!/bin/bash
#
# Synchronize whisper.cpp changes to ggml
#
# Usage:
#
# $ cd /path/to/ggml
# $ ./scripts/sync-whisper-am.sh -skip hash0,hash1,hash2...
#
set -e
sd=$(dirname $0)
cd $sd/../
SRC_GGML=$(pwd)
SRC_WHISPER=$(cd ../whisper.cpp; pwd)
if [ ! -d $SRC_WHISPER ]; then
echo "whisper.cpp not found at $SRC_WHISPER"
exit 1
fi
lc=$(cat $SRC_GGML/scripts/sync-whisper.last)
echo "Syncing whisper.cpp changes since commit $lc"
to_skip=""
if [ "$1" == "-skip" ]; then
to_skip=$2
fi
cd $SRC_WHISPER
git log --oneline $lc..HEAD
git log --oneline $lc..HEAD --reverse | grep -v "(ggml/[0-9]*)" | grep -v "(llama/[0-9]*)" | cut -d' ' -f1 > $SRC_GGML/whisper-commits
if [ ! -s $SRC_GGML/whisper-commits ]; then
rm -v $SRC_GGML/whisper-commits
echo "No new commits"
exit 0
fi
if [ -f $SRC_GGML/whisper-src.patch ]; then
rm -v $SRC_GGML/whisper-src.patch
fi
while read c; do
if [ -n "$to_skip" ]; then
if [[ $to_skip == *"$c"* ]]; then
echo "Skipping $c"
continue
fi
fi
git format-patch -k $c~1..$c --stdout -- \
ggml/CMakeLists.txt \
ggml/src/CMakeLists.txt \
ggml/cmake/FindSIMD.cmake \
ggml/src/ggml* \
ggml/include/ggml*.h \
ggml/include/gguf*.h \
examples/common-ggml.h \
examples/common-ggml.cpp \
LICENSE \
scripts/gen-authors.sh \
>> $SRC_GGML/whisper-src.patch
done < $SRC_GGML/whisper-commits
rm -v $SRC_GGML/whisper-commits
# delete files if empty
if [ ! -s $SRC_GGML/whisper-src.patch ]; then
rm -v $SRC_GGML/whisper-src.patch
fi
cd $SRC_GGML
if [ -f $SRC_GGML/whisper-src.patch ]; then
# replace PR numbers
#
# Subject: some text (#1234)
# Subject: some text (whisper/1234)
cat whisper-src.patch | sed -e 's/^Subject: \(.*\) (#\([0-9]*\))/Subject: \1 (whisper\/\2)/' > whisper-src.patch.tmp
mv whisper-src.patch.tmp whisper-src.patch
cat whisper-src.patch | sed -e 's/^\(.*\) (#\([0-9]*\))$/\1 (whisper\/\2)/' > whisper-src.patch.tmp
mv whisper-src.patch.tmp whisper-src.patch
# replace filenames:
#
# ggml/CMakelists.txt -> CMakeLists.txt
# ggml/src/CMakelists.txt -> src/CMakeLists.txt
# ggml/cmake/FindSIMD.cmake -> cmake/FindSIMD.cmake
#
# ggml/src/ggml* -> src/ggml*
#
# ggml/include/ggml*.h -> include/ggml*.h
# ggml/include/gguf*.h -> include/gguf*.h
#
# examples/common.h -> examples/common.h
# examples/common.cpp -> examples/common.cpp
# examples/common-ggml.h -> examples/common-ggml.h
# examples/common-ggml.cpp -> examples/common-ggml.cpp
#
# LICENSE -> LICENSE
# scripts/gen-authors.sh -> scripts/gen-authors.sh
cat whisper-src.patch | sed -E \
-e 's/\/ggml\/CMakeLists\.txt/\/CMakeLists.txt/g' \
-e 's/\/ggml\/src\/CMakeLists\.txt/\/src\/CMakeLists.txt/g' \
-e 's/\/ggml\/cmake\/FindSIMD\.cmake/\/cmake\/FindSIMD.cmake/g' \
-e 's/\/ggml\/src\/ggml(.*)/\/src\/ggml\1/g' \
-e 's/\/ggml\/include\/ggml(.*)\.h/\/include\/ggml\1.h/g' \
-e 's/\/ggml\/include\/gguf(.*)\.h/\/include\/gguf\1.h/g' \
-e 's/\/examples\/common\.h/\/examples\/common.h/g' \
-e 's/\/examples\/common\.cpp/\/examples\/common.cpp/g' \
-e 's/\/examples\/common-ggml\.h/\/examples\/common-ggml.h/g' \
-e 's/\/examples\/common-ggml\.cpp/\/examples\/common-ggml.cpp/g' \
-e 's/\/LICENSE/\/LICENSE/g' \
-e 's/\/scripts\/gen-authors\.sh/\/scripts\/gen-authors.sh/g' \
> whisper-src.patch.tmp
mv whisper-src.patch.tmp whisper-src.patch
git am whisper-src.patch
rm -v $SRC_GGML/whisper-src.patch
fi
# update last commit
cd $SRC_WHISPER
git log -1 --format=%H > $SRC_GGML/scripts/sync-whisper.last
echo "Done"
exit 0
|
