Skip to content

Commit e33cebe

Browse files
committed
cmake : restore CMakeLists.txt (llama/10256)
ggml-ci
1 parent 73dfb06 commit e33cebe

File tree

3 files changed

+62
-1214
lines changed

3 files changed

+62
-1214
lines changed

scripts/sync-llama-am.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,9 @@ while read c; do
6666
fi
6767
fi
6868

69-
#ggml/src/CMakeLists.txt \
7069
git format-patch -U${ctx} -k $c~1..$c --stdout -- \
7170
ggml/CMakeLists.txt \
71+
ggml/src/CMakeLists.txt \
7272
ggml/src/ggml*.h \
7373
ggml/src/ggml*.c \
7474
ggml/src/ggml*.cpp \
@@ -118,7 +118,6 @@ if [ -f $SRC_GGML/llama-src.patch ]; then
118118
#
119119
# ggml/CMakelists.txt -> CMakeLists.txt
120120
# ggml/src/CMakelists.txt -> src/CMakeLists.txt
121-
# ggml/cmake/FindSIMD.cmake -> src/ggml-cpu/cmake/FindSIMD.cmake (FIXME)
122121
#
123122
# ggml/src/ggml*.c -> src/ggml*.c
124123
# ggml/src/ggml*.cpp -> src/ggml*.cpp
@@ -149,7 +148,6 @@ if [ -f $SRC_GGML/llama-src.patch ]; then
149148
cat llama-src.patch | sed -E \
150149
-e 's/\/ggml\/CMakeLists\.txt/\/CMakeLists.txt/g' \
151150
-e 's/\/ggml\/src\/CMakeLists\.txt/\/src\/CMakeLists.txt/g' \
152-
-e 's/\/ggml\/cmake\/FindSIMD\.cmake/\/src\/ggml-cpu\/cmake\/FindSIMD.cmake/g' \
153151
-e 's/\/ggml\/src\/ggml(.*)\.c/\/src\/ggml\1.c/g' \
154152
-e 's/\/ggml\/src\/ggml(.*)\.cpp/\/src\/ggml\1.cpp/g' \
155153
-e 's/\/ggml\/src\/ggml(.*)\.h/\/src\/ggml\1.h/g' \

scripts/sync-llama.last

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
5ea926dad7f62ebccff7b24784bd1e01a06d13ae
1+
09ecbcb596ed8fa97d503d7440f0b3eff872e8f1

0 commit comments

Comments
 (0)