@@ -1948,6 +1948,9 @@ struct llama_context {
19481948 std::vector<uint8_t> buf_compute_meta;
19491949 ggml_backend_sched_t sched = nullptr;
19501950
1951+ ggml_abort_callback abort_callback = nullptr;
1952+ void * abort_callback_data = nullptr;
1953+
19511954 // input tensors
19521955 ggml_backend_buffer_t buf_input = nullptr;
19531956 ggml_context * ctx_input = nullptr;
@@ -7847,6 +7850,7 @@ static void llama_graph_compute(
78477850
78487851 if (lctx.backend_cpu != nullptr) {
78497852 ggml_backend_cpu_set_n_threads(lctx.backend_cpu, n_threads);
7853+ ggml_backend_cpu_set_abort_callback(lctx.backend_cpu, lctx.abort_callback, lctx.abort_callback_data);
78507854 }
78517855
78527856 ggml_backend_sched_graph_compute(lctx.sched, gf);
@@ -11644,6 +11648,8 @@ struct llama_context_params llama_context_default_params() {
1164411648 /*.embedding =*/ false,
1164511649 /*.offload_kqv =*/ true,
1164611650 /*.do_pooling =*/ true,
11651+ /*.abort_callback =*/ nullptr,
11652+ /*.abort_callback_data =*/ nullptr,
1164711653 };
1164811654
1164911655 return result;
@@ -11835,8 +11841,11 @@ struct llama_context * llama_new_context_with_model(
1183511841 LLAMA_LOG_INFO("%s: freq_base = %.1f\n", __func__, cparams.rope_freq_base);
1183611842 LLAMA_LOG_INFO("%s: freq_scale = %g\n", __func__, cparams.rope_freq_scale);
1183711843
11838- ctx->rng = std::mt19937(params.seed);
11839- ctx->logits_all = params.logits_all;
11844+ ctx->abort_callback = params.abort_callback;
11845+ ctx->abort_callback_data = params.abort_callback_data;
11846+
11847+ ctx->rng = std::mt19937(params.seed);
11848+ ctx->logits_all = params.logits_all;
1184011849
1184111850 const ggml_type type_k = params.type_k;
1184211851 const ggml_type type_v = params.type_v;
@@ -12809,6 +12818,11 @@ void llama_set_n_threads(struct llama_context * ctx, uint32_t n_threads, uint32_
1280912818 ctx->cparams.n_threads_batch = n_threads_batch;
1281012819}
1281112820
12821+ void llama_set_abort_callback(struct llama_context * ctx, bool (*abort_callback)(void * data), void * abort_callback_data) {
12822+ ctx->abort_callback = abort_callback;
12823+ ctx->abort_callback_data = abort_callback_data;
12824+ }
12825+
1281212826struct llama_batch llama_batch_get_one(
1281312827 llama_token * tokens,
1281412828 int32_t n_tokens,
0 commit comments