Merge branch 'master' into concedo_experimental

# Conflicts:
#	README.md
#	scripts/sync-ggml.sh
This commit is contained in:
Concedo 2024-02-11 15:18:46 +08:00
commit ea3fd87f68
14 changed files with 93 additions and 24 deletions

2
ggml.c
View file

@ -16649,7 +16649,7 @@ struct ggml_compute_state_shared {
atomic_int node_n; // active graph node
atomic_int node_task; // active graph node task phase
bool (*abort_callback)(void * data); // abort ggml_graph_compute when true
ggml_abort_callback abort_callback; // abort ggml_graph_compute when true
void * abort_callback_data;
};