Merge pull request #343 from janhq/pump-version-and-hotfix

tikikun · web-flow · commit f64301396a6c · 2024-01-12T13:17:58.000+07:00
feat: minor fix for more correct condition
diff --git a/controllers/llamaCPP.h b/controllers/llamaCPP.h
@@ -1546,7 +1546,7 @@ struct llama_server_context {
       std::unique_lock<std::mutex> 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
@@ -1 +1 @@
-Subproject commit 18c2e1752c3b387689e9e73d7d8a1a3b1511ce23
+Subproject commit 326b418b59b6d48d854c4461a2303e8ac0a311e6

Original file line number	Diff line number	Diff line change
`@@ -1546,7 +1546,7 @@ struct llama_server_context {`
`1546`	`1546`	`std::unique_lock<std::mutex> lock(mutex_tasks);`
`1547`	`1547`	`condition_tasks.wait(lock, [&] {`
`1548`	`1548`	`return (!queue_tasks.empty() && model_loaded_external) \|\|`
`1549`		`- (!model_loaded_external);`
	`1549`	`+ (queue_tasks.empty() && !model_loaded_external);`
`1550`	`1550`	`});`
`1551`	`1551`	`}`
`1552`	`1552`