Skip to content

server: handle probs output when temp=0; handle final response probs output #7

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
Jun 25, 2023
Merged

server: handle probs output when temp=0; handle final response probs output #7

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c9e6642
server: handle probs output when temp=0; handle final response probs …
WangHaoranRobin Jun 25, 2023
13f5d69
Merge branch 'master' into robin_fork_master
WangHaoranRobin Jun 25, 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
20 changes: 11 additions & 9 deletions examples/server/server.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,6 +362,9 @@ struct llama_server_context {
if (temp <= 0) {
// Greedy sampling
result.tok = llama_sample_token_greedy(ctx, &candidates_p);
if (n_probs > 0) {
llama_sample_softmax(ctx, &candidates_p);
}
} else {
if (mirostat == 1) {
static float mirostat_mu = 2.0f * mirostat_tau;
Expand All @@ -374,10 +377,11 @@ struct llama_server_context {
result.tok = llama_sample_token_mirostat_v2(ctx, &candidates_p, mirostat_tau, mirostat_eta, &mirostat_mu);
} else {
// Temperature sampling
llama_sample_top_k(ctx, &candidates_p, top_k, 1);
llama_sample_tail_free(ctx, &candidates_p, tfs_z, 1);
llama_sample_typical(ctx, &candidates_p, typical_p, 1);
llama_sample_top_p(ctx, &candidates_p, top_p, 1);
size_t min_keep = std::max(1, n_probs);
llama_sample_tail_free(ctx, &candidates_p, tfs_z, min_keep);
llama_sample_typical(ctx, &candidates_p, typical_p, min_keep);
llama_sample_top_p(ctx, &candidates_p, top_p, min_keep);
llama_sample_top_k(ctx, &candidates_p, top_k, min_keep);
llama_sample_temperature(ctx, &candidates_p, temp);
result.tok = llama_sample_token(ctx, &candidates_p);
}
Expand Down Expand Up @@ -752,8 +756,7 @@ static json format_final_response(llama_server_context & llama, const std::strin
};

if (llama.params.n_probs > 0) {
json completion_probabilities_json = probs_vector_to_json(llama.ctx, probs);
res["completion_probabilities"] = completion_probabilities_json;
res["completion_probabilities"] = probs_vector_to_json(llama.ctx, probs);
}

return res;
Expand All @@ -766,8 +769,7 @@ static json format_partial_response(llama_server_context & llama, const std::str
};

if (llama.params.n_probs > 0) {
json completion_probabilities_json = probs_vector_to_json(llama.ctx, probs);
res["completion_probabilities"] = completion_probabilities_json;
res["completion_probabilities"] = probs_vector_to_json(llama.ctx, probs);
}

return res;
Expand Down Expand Up @@ -969,7 +971,7 @@ int main(int argc, char ** argv) {
const json data = llama.has_next_token
? format_partial_response(llama, to_send, probs_output)
// Generation is done, send extra information.
: format_final_response(llama, to_send, probs_output);
: format_final_response(llama, to_send, llama.generated_token_probs);

const std::string str =
"data: " +
Expand Down