|
@@ -5,7 +5,7 @@
|
|
|
# Usage:
|
|
# Usage:
|
|
|
#
|
|
#
|
|
|
# $ cd /path/to/llama.cpp
|
|
# $ cd /path/to/llama.cpp
|
|
|
-# $ ./scripts/sync-ggml-am.sh -skip hash0,hash1,hash2...
|
|
|
|
|
|
|
+# $ ./scripts/sync-ggml-am.sh -skip hash0,hash1,hash2... -C 3
|
|
|
#
|
|
#
|
|
|
|
|
|
|
|
set -e
|
|
set -e
|
|
@@ -25,9 +25,23 @@ lc=$(cat $SRC_LLAMA/scripts/sync-ggml.last)
|
|
|
echo "Syncing ggml changes since commit $lc"
|
|
echo "Syncing ggml changes since commit $lc"
|
|
|
|
|
|
|
|
to_skip=""
|
|
to_skip=""
|
|
|
-if [ "$1" == "-skip" ]; then
|
|
|
|
|
- to_skip=$2
|
|
|
|
|
-fi
|
|
|
|
|
|
|
+
|
|
|
|
|
+# context for git patches in number of lines
|
|
|
|
|
+ctx="8"
|
|
|
|
|
+
|
|
|
|
|
+while [ "$1" != "" ]; do
|
|
|
|
|
+ case $1 in
|
|
|
|
|
+ -skip )
|
|
|
|
|
+ shift
|
|
|
|
|
+ to_skip=$1
|
|
|
|
|
+ ;;
|
|
|
|
|
+ -C )
|
|
|
|
|
+ shift
|
|
|
|
|
+ ctx=$1
|
|
|
|
|
+ ;;
|
|
|
|
|
+ esac
|
|
|
|
|
+ shift
|
|
|
|
|
+done
|
|
|
|
|
|
|
|
cd $SRC_GGML
|
|
cd $SRC_GGML
|
|
|
|
|
|
|
@@ -52,7 +66,7 @@ while read c; do
|
|
|
fi
|
|
fi
|
|
|
fi
|
|
fi
|
|
|
|
|
|
|
|
- git format-patch -k $c~1..$c --stdout -- \
|
|
|
|
|
|
|
+ git format-patch -U${ctx} -k $c~1..$c --stdout -- \
|
|
|
CMakeLists.txt \
|
|
CMakeLists.txt \
|
|
|
src/CMakeLists.txt \
|
|
src/CMakeLists.txt \
|
|
|
cmake/FindSIMD.cmake \
|
|
cmake/FindSIMD.cmake \
|
|
@@ -191,7 +205,7 @@ if [ -f $SRC_LLAMA/ggml-src.patch ]; then
|
|
|
> ggml-src.patch.tmp
|
|
> ggml-src.patch.tmp
|
|
|
mv ggml-src.patch.tmp ggml-src.patch
|
|
mv ggml-src.patch.tmp ggml-src.patch
|
|
|
|
|
|
|
|
- git am ggml-src.patch
|
|
|
|
|
|
|
+ git am -C${ctx} ggml-src.patch
|
|
|
|
|
|
|
|
rm -v $SRC_LLAMA/ggml-src.patch
|
|
rm -v $SRC_LLAMA/ggml-src.patch
|
|
|
fi
|
|
fi
|