Update upstream

diff --git a/Makefile b/Makefile
index 99621dc9a89f1218aff6caa3b03378f60c6ce66f..4b580395c987c7003362fdc503ed99b0ce457abc 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,5 @@
+# FIXME update, now that ggml has proper versions
+

 # Pinned commits / tags
 GGML_CHECKOUT=323951f
 LLAMA_CPP_CHECKOUT=f08c4c0
 # Pinned commits / tags
 GGML_CHECKOUT=323951f
 LLAMA_CPP_CHECKOUT=f08c4c0


@@ -7,10 +9,10 @@ LLAMA_CPP_BASE=sources/llama.cpp
 WHISPER_CPP_BASE=sources/whisper.cpp
 
 define publish_updates # (repobase)
 WHISPER_CPP_BASE=sources/whisper.cpp
 
 define publish_updates # (repobase)

-       git -C $(1) push --tags origin master
+#      git -C $(1) push --tags origin master

        git -C $(1) push --tags origin upstream/latest
        git -C $(1) push --tags origin debian/latest
        git -C $(1) push --tags origin upstream/latest
        git -C $(1) push --tags origin debian/latest

-       git -C $(1) push --tags mbaudier@github master
+#      git -C $(1) push --tags mbaudier@github master

        git -C $(1) push --tags mbaudier@github upstream/latest
        git -C $(1) push --tags mbaudier@github debian/latest
 endef
        git -C $(1) push --tags mbaudier@github upstream/latest
        git -C $(1) push --tags mbaudier@github debian/latest
 endef

diff --git a/sources/ggml b/sources/ggml
index 5a89d3ddb410abeba7313f11411180359b72b33c..82ac87802931443e515a129ae535c0c7d06e9272 160000 (submodule)
--- a/sources/ggml
+++ b/sources/ggml
@@ -1 +1 @@
-Subproject commit 5a89d3ddb410abeba7313f11411180359b72b33c
+Subproject commit 82ac87802931443e515a129ae535c0c7d06e9272

diff --git a/sources/llama.cpp b/sources/llama.cpp
index 49c14887229ab1528efee14d91827b5439cb555b..b927966cbcb767aed5e34eba0dc3e0786bba6c86 160000 (submodule)
--- a/sources/llama.cpp
+++ b/sources/llama.cpp
@@ -1 +1 @@
-Subproject commit 49c14887229ab1528efee14d91827b5439cb555b
+Subproject commit b927966cbcb767aed5e34eba0dc3e0786bba6c86