vbatts/llama.cpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* merge with base

Browse source
This commit is contained in:
ziadb 2023-11-30 17:16:48 -05:00
commit 73df0c4364
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
examples/server/server.cpp
View file

@ -1345,8 +1345,7 @@ struct llama_server_context
if (task.data.at("prompt").size() > 1) if (task.data.at("prompt").size() > 1)
{ {
lock.unlock(); // entering new func scope lock.unlock(); // entering new func scope
auto id = split_multiprompt_task(task); return split_multiprompt_task(task);
return id;
} }
// otherwise, it's a single-prompt task, we actually queue it // otherwise, it's a single-prompt task, we actually queue it
@ -1547,13 +1546,13 @@ struct llama_server_context
if (queue_iterator->subtasks_remaining.empty()) if (queue_iterator->subtasks_remaining.empty())
{ {
// all subtasks done == multitask is done // all subtasks done == multitask is done
task_result aggregate_result{}; task_result aggregate_result;
aggregate_result.id = queue_iterator->id; aggregate_result.id = queue_iterator->id;
aggregate_result.stop = true; aggregate_result.stop = true;
aggregate_result.error = false; aggregate_result.error = false;
// collect json results into one json result // collect json results into one json result
std::vector<json> result_jsons{}; std::vector<json> result_jsons;
for (auto& subres : queue_iterator->results) for (auto& subres : queue_iterator->results)
{ {
result_jsons.push_back(subres.result_json); result_jsons.push_back(subres.result_json);