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

ggml : simplify do_yield logic

Browse source 
ggml-ci
This commit is contained in:
Georgi Gerganov 2024-01-04 12:56:26 +02:00
parent f77882461f
commit 4a0e7222c9
No known key found for this signature in database
GPG key ID: BF970631944C16B7
1 changed files with 3 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

14
ggml.c
View file

@ -16468,8 +16468,6 @@ static thread_ret_t ggml_graph_compute_thread(void * data) {
int node_n = -1; int node_n = -1;
bool do_yield = false;
while (true) { while (true) {
if (cplan->abort_callback && cplan->abort_callback(cplan->abort_callback_data)) { if (cplan->abort_callback && cplan->abort_callback(cplan->abort_callback_data)) {
state->shared->node_n += 1; state->shared->node_n += 1;
@ -16541,6 +16539,9 @@ static thread_ret_t ggml_graph_compute_thread(void * data) {
} else { } else {
// wait for other threads to finish // wait for other threads to finish
const int last = node_n; const int last = node_n;
const bool do_yield = last < 0 || cgraph->nodes[last]->op == GGML_OP_MUL_MAT;
while (true) { while (true) {
// TODO: this sched_yield can have significant impact on the performance - either positive or negative // TODO: this sched_yield can have significant impact on the performance - either positive or negative
// depending on the workload and the operating system. // depending on the workload and the operating system.
@ -16574,15 +16575,6 @@ static thread_ret_t ggml_graph_compute_thread(void * data) {
if (state->ith < n_tasks) { if (state->ith < n_tasks) {
ggml_compute_forward(&params, node); ggml_compute_forward(&params, node);
} }
do_yield = false;
// call sched_yield() for heavier ops
// TODO: might have to yield only when calling into BLAS - not sure yet
if (node->op == GGML_OP_MUL_MAT) {
//if (node->op == GGML_OP_MUL_MAT && ggml_compute_forward_mul_mat_use_blas(node)) {
do_yield = true;
}
} }
return GGML_EXIT_SUCCESS; return GGML_EXIT_SUCCESS;