e77b27c331
* scripts : add sync-ggml-am.sh
* sync : ggml (VMM, ARM dot prod fix, etc.)
* build : fix CUDA build
* ggml : fix some mul mat cases + add tests for src1 F16
dbd02958fa
139 lines
4.5 KiB
Bash
Executable file
139 lines
4.5 KiB
Bash
Executable file
#!/bin/bash
|
|
#
|
|
# Synchronize ggml changes to whisper.cpp
|
|
#
|
|
# Usage:
|
|
#
|
|
# $ cd /path/to/whisper.cpp
|
|
# $ ./extra/sync-ggml-am.sh
|
|
#
|
|
|
|
set -e
|
|
|
|
sd=$(dirname $0)
|
|
cd $sd/../
|
|
|
|
SRC_WHISPER=$(pwd)
|
|
SRC_GGML=$(cd ../ggml; pwd)
|
|
|
|
if [ ! -d $SRC_GGML ]; then
|
|
echo "ggml not found at $SRC_GGML"
|
|
exit 1
|
|
fi
|
|
|
|
lc=$(cat $SRC_WHISPER/extra/sync-ggml.last)
|
|
echo "Syncing ggml changes since commit $lc"
|
|
|
|
cd $SRC_GGML
|
|
|
|
git log --oneline $lc..HEAD
|
|
|
|
git format-patch $lc --stdout -- \
|
|
include/ggml/ggml*.h \
|
|
src/ggml*.h \
|
|
src/ggml*.c \
|
|
src/ggml*.cpp \
|
|
src/ggml*.m \
|
|
src/ggml*.metal \
|
|
src/ggml*.cu \
|
|
tests/test-opt.cpp \
|
|
tests/test-grad0.cpp \
|
|
tests/test-quantize-fns.cpp \
|
|
tests/test-quantize-perf.cpp \
|
|
tests/test-backend-ops.cpp \
|
|
> $SRC_WHISPER/ggml-src.patch
|
|
|
|
# delete files if empty
|
|
if [ ! -s $SRC_WHISPER/ggml-src.patch ]; then
|
|
rm -v $SRC_WHISPER/ggml-src.patch
|
|
fi
|
|
|
|
cd $SRC_WHISPER
|
|
|
|
if [ -f $SRC_WHISPER/ggml-src.patch ]; then
|
|
# replace PR numbers
|
|
#
|
|
# Subject: some text (#1234)
|
|
# Subject: some text (ggml/1234)
|
|
cat ggml-src.patch | sed -e 's/^Subject: \(.*\) (#\([0-9]*\))/Subject: \1 (ggml\/\2)/' > ggml-src.patch.tmp
|
|
mv ggml-src.patch.tmp ggml-src.patch
|
|
|
|
cat ggml-src.patch | sed -e 's/^\(.*\) (#\([0-9]*\))$/\1 (ggml\/\2)/' > ggml-src.patch.tmp
|
|
mv ggml-src.patch.tmp ggml-src.patch
|
|
|
|
# replace filenames:
|
|
#
|
|
# src/ggml.c -> ggml.c
|
|
# src/ggml-alloc.c -> ggml-alloc.c
|
|
# src/ggml-backend-impl.h -> ggml-backend-impl.h
|
|
# src/ggml-backend.c -> ggml-backend.c
|
|
# src/ggml-cuda.cu -> ggml-cuda.cu
|
|
# src/ggml-cuda.h -> ggml-cuda.h
|
|
# src/ggml-impl.h -> ggml-impl.h
|
|
# src/ggml-metal.h -> ggml-metal.h
|
|
# src/ggml-metal.m -> ggml-metal.m
|
|
# src/ggml-metal.metal -> ggml-metal.metal
|
|
# src/ggml-mpi.h -> ggml-mpi.h
|
|
# src/ggml-mpi.c -> ggml-mpi.c
|
|
# src/ggml-opencl.cpp -> ggml-opencl.cpp
|
|
# src/ggml-opencl.h -> ggml-opencl.h
|
|
# src/ggml-quants.c -> ggml-quants.c
|
|
# src/ggml-quants.h -> ggml-quants.h
|
|
# include/ggml/ggml.h -> ggml.h
|
|
# include/ggml/ggml-alloc.h -> ggml-alloc.h
|
|
# include/ggml/ggml-backend.h -> ggml-backend.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
|
|
#
|
|
# examples/whisper/whisper.h -> whisper.h
|
|
# examples/whisper/whisper.cpp -> whisper.cpp
|
|
# examples/whisper/main.cpp -> examples/main/main.cpp
|
|
# examples/whisper/quantize.cpp -> examples/quantize/quantize.cpp
|
|
|
|
cat ggml-src.patch | sed \
|
|
-e 's/src\/ggml\.c/ggml.c/g' \
|
|
-e 's/src\/ggml-alloc\.c/ggml-alloc.c/g' \
|
|
-e 's/src\/ggml-backend-impl\.h/ggml-backend-impl.h/g' \
|
|
-e 's/src\/ggml-backend\.c/ggml-backend.c/g' \
|
|
-e 's/src\/ggml-cuda\.cu/ggml-cuda.cu/g' \
|
|
-e 's/src\/ggml-cuda\.h/ggml-cuda.h/g' \
|
|
-e 's/src\/ggml-impl\.h/ggml-impl.h/g' \
|
|
-e 's/src\/ggml-metal\.h/ggml-metal.h/g' \
|
|
-e 's/src\/ggml-metal\.m/ggml-metal.m/g' \
|
|
-e 's/src\/ggml-metal\.metal/ggml-metal.metal/g' \
|
|
-e 's/src\/ggml-mpi\.h/ggml-mpi.h/g' \
|
|
-e 's/src\/ggml-mpi\.c/ggml-mpi.c/g' \
|
|
-e 's/src\/ggml-opencl\.cpp/ggml-opencl.cpp/g' \
|
|
-e 's/src\/ggml-opencl\.h/ggml-opencl.h/g' \
|
|
-e 's/src\/ggml-quants\.c/ggml-quants.c/g' \
|
|
-e 's/src\/ggml-quants\.h/ggml-quants.h/g' \
|
|
-e 's/include\/ggml\/ggml\.h/ggml.h/g' \
|
|
-e 's/include\/ggml\/ggml-alloc\.h/ggml-alloc.h/g' \
|
|
-e 's/include\/ggml\/ggml-backend\.h/ggml-backend.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/examples\/whisper\/whisper\.h/whisper.h/g' \
|
|
-e 's/examples\/whisper\/whisper\.cpp/whisper.cpp/g' \
|
|
-e 's/examples\/whisper\/main\.cpp/examples\/main\/main.cpp/g' \
|
|
-e 's/examples\/whisper\/quantize\.cpp/examples\/quantize\/quantize.cpp/g' \
|
|
> ggml-src.patch.tmp
|
|
mv ggml-src.patch.tmp ggml-src.patch
|
|
|
|
git am ggml-src.patch
|
|
|
|
rm -v $SRC_WHISPER/ggml-src.patch
|
|
fi
|
|
|
|
# update last commit
|
|
cd $SRC_GGML
|
|
git log -1 --format=%H > $SRC_WHISPER/extra/sync-ggml.last
|
|
|
|
echo "Done"
|
|
|
|
exit 0
|