From 09da4b14f90add38e37a6fc758482e4aefec6230 Mon Sep 17 00:00:00 2001 From: Ziad Ben Hadj-Alouane Date: Wed, 29 Nov 2023 22:03:50 -0500 Subject: [PATCH 1/4] Update examples/server/server.cpp Co-authored-by: Jared Van Bortel --- examples/server/server.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/server/server.cpp b/examples/server/server.cpp index c79b54940..e8726027d 100644 --- a/examples/server/server.cpp +++ b/examples/server/server.cpp @@ -1548,7 +1548,7 @@ struct llama_server_context if (queue_iterator->subtasks_remaining.empty()) { // all subtasks done == multitask is done - task_result aggregate_result{}; + task_result aggregate_result; aggregate_result.id = queue_iterator->id; aggregate_result.stop = true; aggregate_result.error = false; From 0e1a5aa5faabaece1f6abfbf5a0f2f8a1fd254d7 Mon Sep 17 00:00:00 2001 From: Ziad Ben Hadj-Alouane Date: Wed, 29 Nov 2023 22:03:55 -0500 Subject: [PATCH 2/4] Update examples/server/server.cpp Co-authored-by: Jared Van Bortel --- examples/server/server.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/server/server.cpp b/examples/server/server.cpp index e8726027d..ebfc60f5f 100644 --- a/examples/server/server.cpp +++ b/examples/server/server.cpp @@ -169,8 +169,8 @@ struct task_result { struct task_multi { int id; - std::unordered_set subtasks_remaining{}; - std::vector results{}; + std::unordered_set subtasks_remaining; + std::vector results; }; // TODO: can become bool if we can't find use of more states From 14785e11485c128109ff190128ee917e906279db Mon Sep 17 00:00:00 2001 From: Ziad Ben Hadj-Alouane Date: Wed, 29 Nov 2023 22:04:00 -0500 Subject: [PATCH 3/4] Update examples/server/server.cpp Co-authored-by: Jared Van Bortel --- examples/server/server.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/examples/server/server.cpp b/examples/server/server.cpp index ebfc60f5f..d024cfbcb 100644 --- a/examples/server/server.cpp +++ b/examples/server/server.cpp @@ -1346,8 +1346,7 @@ struct llama_server_context if (task.data.at("prompt").size() > 1) { lock.unlock(); // entering new func scope - auto id = split_multiprompt_task(task); - return id; + return split_multiprompt_task(task); } // otherwise, it's a single-prompt task, we actually queue it From 3b371e10c4f75f0e2b7e3b1955f4ec7d369d8999 Mon Sep 17 00:00:00 2001 From: Ziad Ben Hadj-Alouane Date: Wed, 29 Nov 2023 22:04:08 -0500 Subject: [PATCH 4/4] Update examples/server/server.cpp Co-authored-by: Jared Van Bortel --- examples/server/server.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/server/server.cpp b/examples/server/server.cpp index d024cfbcb..e12420491 100644 --- a/examples/server/server.cpp +++ b/examples/server/server.cpp @@ -1553,7 +1553,7 @@ struct llama_server_context aggregate_result.error = false; // collect json results into one json result - std::vector result_jsons{}; + std::vector result_jsons; for (auto& subres : queue_iterator->results) { result_jsons.push_back(subres.result_json);