matt/ollama37
1
0
Fork 0
mirror of https://github.com/dogkeeper886/ollama37.git synced 2025-12-11 16:26:59 +00:00
Code Issues Packages Projects Releases 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
2 changed files with 5 additions and 1 deletions
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 // TODO - too verbose, remove once things are solid
LOG_TEE("requesting llama server shutdown\n"); LOG_TEE("requesting llama server shutdown\n");
ext_server_running = false; ext_server_running = false;
// unblocks the update_slots() loop so it can clean up and exit
llama->request_cancel(0);
ext_server_thread.join(); ext_server_thread.join();
delete llama; delete llama;
llama = NULL; llama = NULL;

2
llm/llama.cpp

Submodule llm/llama.cpp updated: 328b83de23...6efb8eb30e