extern/whisper.cpp
1
0
Fork 1
mirror of https://github.com/ggerganov/whisper.cpp.git synced 2025-02-03 03:49:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

ggml : try to fix the abort mechanism

Browse Source
This commit is contained in:
Georgi Gerganov 2023-11-05 20:02:24 +02:00
parent 39cfad0dee
commit aaa3b5e5f6
No known key found for this signature in database
GPG Key ID: 449E073F9DC10735
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ggml.c
View File

@ -16391,9 +16391,6 @@ struct ggml_compute_state_shared {
// synchronization primitives // synchronization primitives
atomic_int n_active; // num active threads atomic_int n_active; // num active threads
atomic_int node_n; // active graph node atomic_int node_n; // active graph node
bool (*abort_callback)(void * data); // abort ggml_graph_compute when true
void * abort_callback_data;
}; };
struct ggml_compute_state { struct ggml_compute_state {
@ -16744,6 +16741,10 @@ static thread_ret_t ggml_graph_compute_thread(void * data) {
node_n = atomic_load(&state->shared->node_n); node_n = atomic_load(&state->shared->node_n);
if (node_n != last) break; if (node_n != last) break;
if (cplan->abort_callback && cplan->abort_callback(cplan->abort_callback_data)) {
break;
}
}; };
} }
@ -17037,8 +17038,6 @@ int ggml_graph_compute(struct ggml_cgraph * cgraph, struct ggml_cplan * cplan) {
/*.n_threads =*/ n_threads, /*.n_threads =*/ n_threads,
/*.n_active =*/ n_threads, /*.n_active =*/ n_threads,
/*.node_n =*/ -1, /*.node_n =*/ -1,
/*.abort_callback =*/ NULL,
/*.abort_callback_data =*/ NULL,
}; };
struct ggml_compute_state * workers = alloca(sizeof(struct ggml_compute_state)*n_threads); struct ggml_compute_state * workers = alloca(sizeof(struct ggml_compute_state)*n_threads);