Skip to content
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

Jump to bottom

Samplers order parameters #4285

Merged
merged 13 commits into from
Dec 5, 2023
Merged

Samplers order parameters #4285

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
d4dc3d2
Samplers sequence order w parameter
MaggotHATE Dec 1, 2023
7601a49
Cleaned commented code
MaggotHATE Dec 1, 2023
d363df3
Fixed formatting
MaggotHATE Dec 1, 2023
bd08c8f
Rewrote with unordered_map
MaggotHATE Dec 2, 2023
8d2b460
Revert and rewrite, too many problems and safeguards would be needed
MaggotHATE Dec 2, 2023
e115b5a
Merge branch 'ggerganov:master' into master
MaggotHATE Dec 2, 2023
ff8adc1
Fixed code style
MaggotHATE Dec 2, 2023
e6dc166
Code style fixes according to review
MaggotHATE Dec 2, 2023
3fa6726
More readable samplers input string, fixed help
MaggotHATE Dec 3, 2023
ddda6dd
Style fix in sampler_queue
MaggotHATE Dec 3, 2023
c879b6d
Merge branch 'ggerganov:master' into master
MaggotHATE Dec 5, 2023
a6c3278
Formatting fixes
MaggotHATE Dec 5, 2023
0b87ef4
Fixing whitespaces
MaggotHATE Dec 5, 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
Prev Previous commit
Next Next commit
Fixed code style
  • Loading branch information
@MaggotHATE
MaggotHATE committed Dec 2, 2023
commit ff8adc1196cc38e78046ce946096f0a3a16aeecc
65 changes: 14 additions & 51 deletions common/sampling.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,31 +104,13 @@ std::string llama_sampling_order_print(const llama_sampling_params & params) {
if (params.mirostat == 0){
for (auto s : params.samplers_sequence){
switch (s){
case 'k':{
result += "-> top_k ";
break;
}
case 'f':{
result += "-> tfs_z ";
break;
}
case 'y':{
result += "-> typical_p ";
break;
}
case 'p':{
result += "-> top_p ";
break;
}
case 'm':{
result += "-> min_p ";
break;
}
case 't':{
result += "-> temp ";
break;
}
default: break;
case 'k': result += "-> top_k "; break;
case 'f': result += "-> tfs_z "; break;
case 'y': result += "-> typical_p "; break;
case 'p': result += "-> top_p "; break;
case 'm': result += "-> min_p "; break;
case 't': result += "-> temp "; break;
default : break;
}
}
} else result += "-> mirostat ";
Expand All @@ -154,34 +136,15 @@ void sampler_queue(

for (auto s : samplers_sequence){
switch (s){
case 'k':{
llama_sample_top_k (ctx_main, &cur_p, top_k, min_keep);
break;
}
case 'f':{
llama_sample_tail_free(ctx_main, &cur_p, tfs_z, min_keep);
break;
}
case 'y':{
llama_sample_typical (ctx_main, &cur_p, typical_p, min_keep);
break;
}
case 'p':{
llama_sample_top_p (ctx_main, &cur_p, top_p, min_keep);
break;
}
case 'm':{
llama_sample_min_p (ctx_main, &cur_p, min_p, min_keep);
break;
}
case 't':{
llama_sample_temp (ctx_main, &cur_p, temp);
break;
}
default: break;
case 'k': llama_sample_top_k (ctx_main, &cur_p, top_k, min_keep); break;
case 'f': llama_sample_tail_free(ctx_main, &cur_p, tfs_z, min_keep); break;
case 'y': llama_sample_typical (ctx_main, &cur_p, typical_p, min_keep); break;
case 'p': llama_sample_top_p (ctx_main, &cur_p, top_p, min_keep); break;
case 'm': llama_sample_min_p (ctx_main, &cur_p, min_p, min_keep); break;
case 't': llama_sample_temp (ctx_main, &cur_p, temp); break;
default : break;
}
}

}

llama_token llama_sampling_sample(
Expand Down