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

Restore bind to lambda, requires C++14

Browse source
This commit is contained in:
Michael Klimenko 2024-01-27 22:45:23 +01:00
parent 0f18ada7bb
commit 4e067a0b6d
2 changed files with 14 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
examples/perplexity/perplexity.cpp
View file

@ -1221,7 +1221,7 @@ static bool deserialize_string(std::istream & in, std::string & str) {
uint32_t size; uint32_t size;
if (!in.read((char *)&size, sizeof(size)).fail()) { if (!in.read((char *)&size, sizeof(size)).fail()) {
str.resize(size); str.resize(size);
if (!in.read((char *)str.data(), size).fail()) return true; if (!in.read((char *)&str[0], size).fail()) return true;
} }
return false; return false;
} }

24
examples/server/server.cpp
View file

@ -2822,17 +2822,19 @@ int main(int argc, char **argv)
}*/ }*/
//); //);
llama.queue_tasks.on_new_task([ObjectPtr = &llama](auto&& PH1) { llama.queue_tasks.on_new_task(std::bind(
ObjectPtr->process_single_task(std::forward<decltype(PH1)>(PH1)); &llama_server_context::process_single_task, &llama, std::placeholders::_1));
}); llama.queue_tasks.on_finish_multitask(std::bind(
llama.queue_tasks.on_finish_multitask([ObjectPtr = &llama](auto&& PH1) { &llama_server_context::on_finish_multitask, &llama, std::placeholders::_1));
ObjectPtr->on_finish_multitask(std::forward<decltype(PH1)>(PH1)); llama.queue_tasks.on_all_tasks_finished(std::bind(
}); &llama_server_context::run_on_all_tasks_finished, &llama));
llama.queue_tasks.on_all_tasks_finished([ObjectPtr = &llama] { ObjectPtr->run_on_all_tasks_finished(); }); llama.queue_results.on_multitask_update(std::bind(
llama.queue_results.on_multitask_update([ObjectPtr = &llama.queue_tasks](auto&& PH1, auto&& PH2, auto&& PH3) { &llama_server_queue::update_multitask,
ObjectPtr->update_multitask(std::forward<decltype(PH1)>(PH1), std::forward<decltype(PH2)>(PH2), &llama.queue_tasks,
std::forward<decltype(PH3)>(PH3)); std::placeholders::_1,
}); std::placeholders::_2,
std::placeholders::_3
));
llama.queue_tasks.start_loop(); llama.queue_tasks.start_loop();
t.join(); t.join();