From ac73a765b00f75af2782ef98af6c7cf4232fae9d Mon Sep 17 00:00:00 2001 From: tikikun Date: Fri, 12 Jan 2024 13:13:47 +0700 Subject: [PATCH] feat: minor fix for more correct condition --- controllers/llamaCPP.h | 2 +- llama.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/controllers/llamaCPP.h b/controllers/llamaCPP.h index 2d4b9884b..c07bc144c 100644 --- a/controllers/llamaCPP.h +++ b/controllers/llamaCPP.h @@ -1546,7 +1546,7 @@ struct llama_server_context { std::unique_lock lock(mutex_tasks); condition_tasks.wait(lock, [&] { return (!queue_tasks.empty() && model_loaded_external) || - (!model_loaded_external); + (queue_tasks.empty() && !model_loaded_external); }); } diff --git a/llama.cpp b/llama.cpp index 18c2e1752..326b418b5 160000 --- a/llama.cpp +++ b/llama.cpp @@ -1 +1 @@ -Subproject commit 18c2e1752c3b387689e9e73d7d8a1a3b1511ce23 +Subproject commit 326b418b59b6d48d854c4461a2303e8ac0a311e6