Merge branch 'main' into implement-base-ui-app

markurtz · web-flow · commit aece79dff2ac · 2025-05-29T06:54:21.000-04:00
diff --git a/src/guidellm/benchmark/aggregator.py b/src/guidellm/benchmark/aggregator.py
@@ -403,7 +403,7 @@ def add_result(
         in_warmup_duration = (
             self.args.warmup_duration
             and result.request_info.worker_start
-            <= (global_start_time - self.args.warmup_duration)
+            <= (global_start_time + self.args.warmup_duration)
         )
 
         if in_warmup_number or in_warmup_duration:
diff --git a/src/guidellm/benchmark/benchmark.py b/src/guidellm/benchmark/benchmark.py
@@ -816,7 +816,7 @@ def from_stats(
                         for req in total_with_output_first
                     ],
                     iter_counts=[
-                        req.prompt_tokens + req.output_tokens
+                        req.output_tokens
                         for req in total_with_output_first
                     ],
                     first_iter_counts=[

Original file line number	Diff line number	Diff line change
`@@ -403,7 +403,7 @@ def add_result(`
`403`	`403`	`in_warmup_duration = (`
`404`	`404`	`self.args.warmup_duration`
`405`	`405`	`and result.request_info.worker_start`
`406`		`- <= (global_start_time - self.args.warmup_duration)`
	`406`	`+ <= (global_start_time + self.args.warmup_duration)`
`407`	`407`	`)`
`408`	`408`
`409`	`409`	`if in_warmup_number or in_warmup_duration:`