From 64e64aa2557d97490b2fe1262b313e2f4a1607e3 Mon Sep 17 00:00:00 2001
From: Jared Van Bortel <jared@nomic.ai>
Date: Tue, 28 Nov 2023 04:51:11 -0500
Subject: [PATCH 1/3] ggml : restore abort() in GGML_ASSERT (#4242)

---
 ggml.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/ggml.h b/ggml.h
index f2fce0f22..4d6d4edfd 100644
--- a/ggml.h
+++ b/ggml.h
@@ -244,11 +244,10 @@
 #define GGML_ASSERT(x) \
     do { \
         if (!(x)) { \
-            fprintf(stderr, "GGML_ASSERT: %s:%d: %s\n", __FILE__, __LINE__, #x); \
-            fflush(stderr); \
             fflush(stdout); \
+            fprintf(stderr, "GGML_ASSERT: %s:%d: %s\n", __FILE__, __LINE__, #x); \
             ggml_print_backtrace(); \
-            exit(1); \
+            abort(); \
         } \
     } while (0)
 

From 4fea3420ee3918d125d74c94d962a6ea82875351 Mon Sep 17 00:00:00 2001
From: Peter Sugihara <peter@campsh.com>
Date: Tue, 28 Nov 2023 23:16:34 -0800
Subject: [PATCH 2/3] readme : add FreeChat (#4248)

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index d0d6c9666..44cc94093 100644
--- a/README.md
+++ b/README.md
@@ -117,6 +117,7 @@ as the main playground for developing new features for the [ggml](https://github
 - [oobabooga/text-generation-webui](https://github.com/oobabooga/text-generation-webui)
 - [withcatai/catai](https://github.com/withcatai/catai)
 - [semperai/amica](https://github.com/semperai/amica)
+- [psugihara/FreeChat](https://github.com/psugihara/FreeChat)
 
 ---
 

From 1f5cd83275fabb43f2ae92c30033b384a3eb37b4 Mon Sep 17 00:00:00 2001
From: Georgi Gerganov <ggerganov@gmail.com>
Date: Wed, 29 Nov 2023 11:00:17 +0200
Subject: [PATCH 3/3] examples : add readme files

---
 examples/lookahead/README.md   | 7 +++++++
 examples/speculative/README.md | 8 ++++++++
 2 files changed, 15 insertions(+)
 create mode 100644 examples/lookahead/README.md
 create mode 100644 examples/speculative/README.md

diff --git a/examples/lookahead/README.md b/examples/lookahead/README.md
new file mode 100644
index 000000000..252a6689e
--- /dev/null
+++ b/examples/lookahead/README.md
@@ -0,0 +1,7 @@
+# llama.cpp/examples/lookahead
+
+Demonstartion of lookahead decoding technique:
+
+https://lmsys.org/blog/2023-11-21-lookahead-decoding/
+
+More info: https://github.com/ggerganov/llama.cpp/pull/4207
diff --git a/examples/speculative/README.md b/examples/speculative/README.md
new file mode 100644
index 000000000..d88fd3790
--- /dev/null
+++ b/examples/speculative/README.md
@@ -0,0 +1,8 @@
+# llama.cpp/examples/speculative
+
+Demonstartion of speculative decoding and tree-based speculative decoding techniques
+
+More info:
+
+- https://github.com/ggerganov/llama.cpp/pull/2926
+- https://github.com/ggerganov/llama.cpp/pull/3624