Skip to content

Use n_gen from context, fix tps mismatch in gemma3 #3954

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

Open
hebangwen wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use n_gen from context, fix tps mismatch in gemma3 #3954

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 15 additions & 1 deletion transformers/llm/engine/tools/llm_bench.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,7 @@ struct TestInstance {
bool useMmap;
int nPrompt;
int nGenerate;
std::vector<int64_t> nGenerates;
std::vector<int64_t> prefillUs;
std::vector<int64_t> decodeUs;
std::vector<int64_t> samplesUs;
Expand Down Expand Up @@ -184,6 +185,14 @@ struct TestInstance {
return ts;
}

std::vector<double> getTokensPerSecond(std::vector<int64_t> n_tokens, std::vector<int64_t> cost_us) const {
std::vector<double> ts(n_tokens.size());
for (int i = 0; i < n_tokens.size(); ++i) {
ts[i] = 1e6 * n_tokens[i] / cost_us[i];
}
return ts;
}

double getAvgUs(std::vector<double> v) const { return ::avg(v); }
double getStdevUs(std::vector<double> v) const { return ::stdev(v); }
enum fieldType { STRING, BOOL, INT, FLOAT };
Expand Down Expand Up @@ -354,7 +363,7 @@ struct markdownPrinter : public Printer {
snprintf(buf, sizeof(buf), "%.2f ± %.2f", t.getAvgUs(spd), t.getStdevUs(spd));
value = buf;
} else if (field == "speed(tok/s)") {
auto decode_speed = t.getTokensPerSecond(t.nGenerate, t.decodeUs);
auto decode_speed = t.getTokensPerSecond(t.nGenerates, t.decodeUs);
auto prefill_speed = t.getTokensPerSecond(t.nPrompt, t.prefillUs);
snprintf(buf, sizeof(buf), "%.2f ± %.2f<br>%.2f ± %.2f", t.getAvgUs(prefill_speed), t.getStdevUs(prefill_speed), t.getAvgUs(decode_speed), t.getStdevUs(decode_speed));
value = buf;
Expand Down Expand Up @@ -899,6 +908,11 @@ int main(int argc, char ** argv) {
if (i > 0) { // Exclude the first performance value.
t.prefillUs.push_back(prefillTime);
t.decodeUs.push_back(decodeTime);
if (llm->stoped()) {
t.nGenerates.push_back(context->gen_seq_len - 1);
} else {
t.nGenerates.push_back(context->gen_seq_len);
}
}
}
if (printHeader) {
Expand Down