Always sort logits before nucleus sampling#812
Merged
ggerganov merged 2 commits intoggml-org:masterfrom Apr 7, 2023
Merged
Conversation
Contributor
|
The normalization may not be needed, |
Contributor
Author
|
I can confirm that normalization is not needed. Tested with following program, output is the same for {10, 10, 10, 100} and {100, 100, 100, 1000} |
- fix windows build - remove normalization since std::discrete_distribution does not require it
Contributor
|
On a related note, I tried an optimization (which is getting out of scope for this PR): during the initial pass over logits and the application of temperature scaling, there's a way to bypass tokens that have probabilities much lower than the highest probability using a heuristic: const float maxl = *std::max_element(plogits, plogits + n_logits);
const float minp_ratio = 1e-6; // Ratio lowest admissible prob : highest prob
const float minl = maxl / repeat_penalty + log(minp_ratio) * temp; // Assumes the best token is penalized
// Then, when plogits[i] < minl, don't push_back the pair(logit, i) into logits_idSampling is clearly not the most compute heavy task, so it might not be a good idea to introduce a heuristic that could potentially fail. I was experimenting with a more complex repetition search, that could justify it. |
ggerganov
approved these changes
Apr 7, 2023
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Logits are not sorted before nucleus sampling if TopK is 0 or out of bounds. Reported and solved by @Piezoid #779 (comment).
Other changes:
Since logits are sorted, first index has maximum probability.
Also remove normalization, because std::discrete_distribution already divides by the sum.