baalajimaestro/ollama
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update submodule to 6efb8eb30e7025b168f3fda3ff83b9b386428ad6 (#1885)

Browse source 
* update submodule to `6efb8eb30e7025b168f3fda3ff83b9b386428ad6`
* unblock condition variable in `update_slots` when closing server
This commit is contained in:
Jeffrey Morgan 2024-01-10 16:48:38 -05:00 committed by GitHub
parent 34344d801c
commit 2c6e8f5248
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
llm/ext_server/ext_server.cpp
View file

@ -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;

2
llm/llama.cpp

@ -1 +1 @@
Subproject commit 328b83de23b33240e28f4e74900d1d06726f5eb1
Subproject commit 6efb8eb30e7025b168f3fda3ff83b9b386428ad6