Fix tps

Author: kirklandsign

examples/demo-apps/android/LlamaDemo/app/src/androidTest/java/com/example/executorchllamademo/PerfTest.java

@@ -69,7 +69,7 @@ public void onResult(String result) {
   public void onStats(String result) {
     try {
       JSONObject jsonObject = new JSONObject(result);
-      int numGeneratedTokens = jsonObject.getInt("num_generated_tokens");
+      int numGeneratedTokens = jsonObject.getInt("generated_tokens");
       int inferenceEndMs = jsonObject.getInt("inference_end_ms");
       int promptEvalEndMs = jsonObject.getInt("prompt_eval_end_ms");
       float tps = (float) numGeneratedTokens / (inferenceEndMs - promptEvalEndMs) * 1000;

examples/demo-apps/android/LlamaDemo/app/src/main/java/com/example/executorchllamademo/MainActivity.java

@@ -106,7 +106,7 @@ public void onStats(String stats) {
             float tps = 0;
             try {
               JSONObject jsonObject = new JSONObject(stats);
-              int numGeneratedTokens = jsonObject.getInt("num_generated_tokens");
+              int numGeneratedTokens = jsonObject.getInt("generated_tokens");
               int inferenceEndMs = jsonObject.getInt("inference_end_ms");
               int promptEvalEndMs = jsonObject.getInt("prompt_eval_end_ms");
               tps = (float) numGeneratedTokens / (inferenceEndMs - promptEvalEndMs) * 1000;

examples/demo-apps/android/LlamaDemo/app/src/main/java/com/example/executorchllamademo/ModelRunner.java

@@ -75,7 +75,7 @@ public void onStats(String stats) {
     float tps = 0;
     try {
       JSONObject jsonObject = new JSONObject(stats);
-      int numGeneratedTokens = jsonObject.getInt("num_generated_tokens");
+      int numGeneratedTokens = jsonObject.getInt("generated_tokens");
       int inferenceEndMs = jsonObject.getInt("inference_end_ms");
       int promptEvalEndMs = jsonObject.getInt("prompt_eval_end_ms");
       tps = (float) numGeneratedTokens / (inferenceEndMs - promptEvalEndMs) * 1000;

extension/benchmark/android/benchmark/app/src/main/java/org/pytorch/minibench/LlmBenchmarkActivity.java

@@ -85,11 +85,11 @@ public void onStats(String stats) {
     float tps = 0;
     try {
       JSONObject jsonObject = new JSONObject(stats);
-      int numGeneratedTokens = jsonObject.getInt("num_generated_tokens");
+      int numGeneratedTokens = jsonObject.getInt("generated_tokens");
       int inferenceEndMs = jsonObject.getInt("inference_end_ms");
       int promptEvalEndMs = jsonObject.getInt("prompt_eval_end_ms");
       tps = (float) numGeneratedTokens / (inferenceEndMs - promptEvalEndMs) * 1000;
-      mStatsInfo.tokens = String.valueOf(tps);
+      mStatsInfo.tps = tps;
     } catch (JSONException e) {
       Log.e("LLM", "Error parsing JSON: " + e.getMessage());
     }
@@ -121,7 +121,7 @@ public void onGenerationStopped() {
             0.0f));
     // Token per second
     results.add(
-        new BenchmarkMetric(benchmarkModel, "token_per_sec", extractTPS(mStatsInfo.tokens), 0.0f));
+        new BenchmarkMetric(benchmarkModel, "token_per_sec", mStatsInfo.tps, 0.0f));
 
     try (FileWriter writer = new FileWriter(getFilesDir() + "/benchmark_results.json")) {
       Gson gson = new Gson();
@@ -130,15 +130,6 @@ public void onGenerationStopped() {
       e.printStackTrace();
     }
   }
-
-  private double extractTPS(final String tokens) {
-    final Matcher m = Pattern.compile("\\d+\\.?\\d*").matcher(tokens);
-    if (m.find()) {
-      return Double.parseDouble(m.group());
-    } else {
-      return 0.0f;
-    }
-  }
 }
 
 class StatsInfo {
@@ -147,7 +138,7 @@ class StatsInfo {
   long loadEnd;
   long generateStart;
   long generateEnd;
-  String tokens;
+  float tps;
   String modelName;
 
   @Override
@@ -161,6 +152,6 @@ public String toString() {
         + "\ngenerateEnd: "
         + generateEnd
         + "\n"
-        + tokens;
+        + tps;
   }
 }