From 2c6e8f52484f36a39e8bc0c8d7389fd4c55e3533 Mon Sep 17 00:00:00 2001 From: Jeffrey Morgan Date: Wed, 10 Jan 2024 16:48:38 -0500 Subject: [PATCH] Update submodule to `6efb8eb30e7025b168f3fda3ff83b9b386428ad6` (#1885) * update submodule to `6efb8eb30e7025b168f3fda3ff83b9b386428ad6` * unblock condition variable in `update_slots` when closing server --- llm/ext_server/ext_server.cpp | 4 ++++ llm/llama.cpp | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/llm/ext_server/ext_server.cpp b/llm/ext_server/ext_server.cpp index d0a036b3..c30d4220 100644 --- a/llm/ext_server/ext_server.cpp +++ b/llm/ext_server/ext_server.cpp @@ -111,6 +111,10 @@ void llama_server_stop() { // TODO - too verbose, remove once things are solid LOG_TEE("requesting llama server shutdown\n"); ext_server_running = false; + + // unblocks the update_slots() loop so it can clean up and exit + llama->request_cancel(0); + ext_server_thread.join(); delete llama; llama = NULL; diff --git a/llm/llama.cpp b/llm/llama.cpp index 328b83de..6efb8eb3 160000 --- a/llm/llama.cpp +++ b/llm/llama.cpp @@ -1 +1 @@ -Subproject commit 328b83de23b33240e28f4e74900d1d06726f5eb1 +Subproject commit 6efb8eb30e7025b168f3fda3ff83b9b386428ad6