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

perf : abort on invalid sampler pointer

Browse source 
ggml-ci
This commit is contained in:
Georgi Gerganov 2024-09-12 15:08:48 +03:00
parent f35e9b87cd
commit 444b757bce
No known key found for this signature in database
GPG key ID: BF970631944C16B7
1 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/llama-sampling.cpp
View file

@ -1663,8 +1663,7 @@ struct llama_perf_sampler_data llama_perf_sampler(const struct llama_sampler * c
struct llama_perf_sampler_data data = {}; struct llama_perf_sampler_data data = {};
if (chain == nullptr || chain->iface != &llama_sampler_chain_i) { if (chain == nullptr || chain->iface != &llama_sampler_chain_i) {
// TODO: return empty data, or GGML_ABORT() ? GGML_ABORT("%s: invalid sampler passed - requires a sampler created with llama_sampler_chain_init()\n", __func__);
return data;
} }
const auto * ctx = (const struct llama_sampler_chain *) chain->ctx; const auto * ctx = (const struct llama_sampler_chain *) chain->ctx;
@ -1684,8 +1683,7 @@ void llama_perf_sampler_print(const struct llama_sampler * chain) {
void llama_perf_sampler_reset(struct llama_sampler * chain) { void llama_perf_sampler_reset(struct llama_sampler * chain) {
if (chain == nullptr || chain->iface != &llama_sampler_chain_i) { if (chain == nullptr || chain->iface != &llama_sampler_chain_i) {
// TODO: return empty data, or GGML_ABORT() ? GGML_ABORT("%s: invalid sampler passed - requires a sampler created with llama_sampler_chain_init()\n", __func__);
return;
} }
auto * ctx = (struct llama_sampler_chain *) chain->ctx; auto * ctx = (struct llama_sampler_chain *) chain->ctx;