vrr/koboldcpp
2
0
Fork 0
mirror of https://github.com/LostRuins/koboldcpp.git synced 2025-09-11 01:24:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'upstream' into concedo_experimental

Browse source 
# Conflicts:
#	examples/server/README.md
#	src/llama-model.cpp
This commit is contained in:
Concedo 2025-02-08 22:57:18 +08:00
commit 3fa4843850
7 changed files with 61 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ggml/src/ggml-cpu/ggml-cpu.c
View file

@ -13900,9 +13900,13 @@ static thread_ret_t ggml_graph_compute_thread(void * data) {
tp->ec = GGML_STATUS_ABORTED;
}
ggml_barrier(state->threadpool);
if (node_n + 1 < cgraph->n_nodes) {
ggml_barrier(state->threadpool);
}
}
ggml_barrier(state->threadpool);
return 0;
}