Skip to content

Always sort logits before nucleus sampling #812

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 7, 2023
Merged

Always sort logits before nucleus sampling #812

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f0c7cd
Always sort logits before nucleus sampling
ivanstepanovftw Apr 6, 2023
2ceeccf
remove second normalization
ivanstepanovftw Apr 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 3 additions & 14 deletions llama.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1236,19 +1236,13 @@ static llama_vocab::id llama_sample_top_p_top_k(
}
}

if (top_k > 0 && top_k < n_logits) {
sample_top_k(logits_id, top_k);
}

float maxl = -std::numeric_limits<float>::infinity();
for (const auto & kv : logits_id) {
maxl = Max(maxl, kv.first);
}
sample_top_k(logits_id, top_k > 0 ? Min(top_k, n_logits) : n_logits);

// compute probs for the top k tokens
std::vector<float> probs;
probs.reserve(logits_id.size());

float maxl = logits_id[0].first;
double sum = 0.0;
for (const auto & kv : logits_id) {
const float p = expf(kv.first - maxl);
Expand All @@ -1271,16 +1265,11 @@ static llama_vocab::id llama_sample_top_p_top_k(
break;
}
}

cumsum = 1.0/cumsum;
for (int i = 0; i < (int) probs.size(); i++) {
probs[i] *= cumsum;
}
}

//printf("\n");
//for (int i = 0; i < (int) 10; i++) {
// printf("%d: '%s' %f\n", i, vocab.id_to_token.at(logits_id[i].second).c_str(), probs[i]);
// printf("%d: '%s' %f\n", i, lctx.vocab.id_to_token.at(logits_id[i].second).tok.c_str(), probs[i]);
//}
//printf("\n\n");
//exit(0);
Expand Down