mirror of
https://gitlab.com/niansa/libjustlm.git
synced 2025-03-06 20:49:17 +01:00
Another abort fix
This commit is contained in:
parent
30a0a77cb2
commit
9a3952597a
4 changed files with 5 additions and 5 deletions
|
@ -168,7 +168,7 @@ public:
|
|||
// Loop until done
|
||||
bool abort = false;
|
||||
unsigned eos_count = 0;
|
||||
while (!abort && fres.size() >= end.size() && fres.find(end) != fres.npos) {
|
||||
while (!abort && (end.empty() || fres.find(end) == fres.npos)) {
|
||||
// Sample top p and top k
|
||||
const auto n_repeat_last = std::min<size_t>(state->tokens.size(), params.n_repeat_last);
|
||||
auto id = gpt_sample_top_k_top_p(state->model.hparams.n_vocab, state->tokens.data()+state->tokens.size()-n_repeat_last, n_repeat_last, state->logits, params.top_k, params.top_p, params.temp, params.repeat_penalty, state->rng);
|
||||
|
|
|
@ -181,7 +181,7 @@ public:
|
|||
// Loop until done
|
||||
bool abort = false;
|
||||
unsigned eos_count = 0;
|
||||
while (!abort && fres.size() >= end.size() && fres.find(end) != fres.npos) {
|
||||
while (!abort && (end.empty() || fres.find(end) == fres.npos)) {
|
||||
// Sample top p and top k
|
||||
auto id = llama_sample_top_p_top_k();
|
||||
|
||||
|
@ -220,7 +220,7 @@ public:
|
|||
}
|
||||
|
||||
// Create final string TODO: Could be optimized
|
||||
if (!abort) {
|
||||
if (!abort && fres.size() > end.size()) {
|
||||
fres = std::string(fres.data(), fres.size()-end.size());
|
||||
}
|
||||
|
||||
|
|
|
@ -158,7 +158,7 @@ public:
|
|||
// Loop until done
|
||||
bool abort = false;
|
||||
unsigned eos_count = 0;
|
||||
while (!abort && fres.size() >= end.size() && fres.find(end) != fres.npos) {
|
||||
while (!abort && (end.empty() || fres.find(end) == fres.npos)) {
|
||||
// Sample top p and top k
|
||||
const auto n_repeat_last = std::min<size_t>(state->tokens.size(), params.n_repeat_last);
|
||||
auto id = llama_sample_top_p_top_k(state->ctx, params.n_repeat_last?(state->tokens.data()+state->tokens.size()-n_repeat_last):nullptr, n_repeat_last, params.top_k, params.top_p, params.temp, params.repeat_penalty);
|
||||
|
|
|
@ -177,7 +177,7 @@ public:
|
|||
// Loop until done
|
||||
bool abort = false;
|
||||
unsigned eos_count = 0;
|
||||
while (!abort && fres.size() >= end.size() && fres.find(end) != fres.npos) {
|
||||
while (!abort && (end.empty() || fres.find(end) == fres.npos)) {
|
||||
// Sample top p and top k
|
||||
const auto n_repeat_last = std::min<size_t>(state->tokens.size(), params.n_repeat_last);
|
||||
auto id = gpt_sample_top_k_top_p(state->model.hparams.n_vocab, state->tokens.data()+state->tokens.size()-n_repeat_last, n_repeat_last, state->logits, params.top_k, params.top_p, params.temp, params.repeat_penalty, state->rng);
|
||||
|
|
Loading…
Add table
Reference in a new issue