Adapt to the new structure of TimingInfo of gemma.cpp

ufownl · Aug 8, 2024 · a2bada4 · a2bada4
1 parent 525f6b5
commit a2bada4
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -224,10 +224,13 @@ Example of statistics:
 
 ```lua
 {
-  prefill_tokens_per_second = 34.950446398036,
-  generate_tokens_per_second = 9.0089134969039,
-  time_to_first_token = 0.8253711364232,
-  tokens_generated = 85
+  prefill_duration = 1.6746909224894,
+  prefill_tokens = 26,
+  prefill_tokens_per_second = 15.525252839701,
+  time_to_first_token = 1.9843131969683,
+  generate_duration = 38.562645539409,
+  tokens_generated = 212,
+  generate_tokens_per_second = 5.4975481332926
 }
 ```
 

diff --git a/src/session.cpp b/src/session.cpp
@@ -316,14 +316,20 @@ int load(lua_State* L) {
 int stats(lua_State* L) {
   auto ud = cgemma::session::check(L, 1);
   lua_newtable(L);
-  lua_pushnumber(L, ud->timing_info().prefill_tok_sec);
-  lua_setfield(L, -2, "prefill_tokens_per_second");
-  lua_pushnumber(L, ud->timing_info().gen_tok_sec);
-  lua_setfield(L, -2, "generate_tokens_per_second");
+  lua_pushnumber(L, ud->timing_info().prefill_duration);
+  lua_setfield(L, -2, "prefill_duration");
+  lua_pushinteger(L, ud->timing_info().prefill_tokens);
+  lua_setfield(L, -2, "prefill_tokens");
   lua_pushnumber(L, ud->timing_info().time_to_first_token);
   lua_setfield(L, -2, "time_to_first_token");
+  lua_pushnumber(L, ud->timing_info().generate_duration);
+  lua_setfield(L, -2, "generate_duration");
   lua_pushinteger(L, ud->timing_info().tokens_generated);
   lua_setfield(L, -2, "tokens_generated");
+  lua_pushnumber(L, ud->timing_info().prefill_tokens / ud->timing_info().prefill_duration);
+  lua_setfield(L, -2, "prefill_tokens_per_second");
+  lua_pushnumber(L, ud->timing_info().tokens_generated / ud->timing_info().generate_duration);
+  lua_setfield(L, -2, "generate_tokens_per_second");
   return 1;
 }