From f96fd1ad77f61bb21cae8d2310077e9f7a05f7d3 Mon Sep 17 00:00:00 2001 From: PeterChrz Date: Thu, 1 Oct 2026 14:53:59 -0400 Subject: [PATCH] Exclude scenariobench from band total geo mean; label tok/s --- app/Console/Commands/SessionSummary.php | 10 ---------- resources/views/livewire/summary/index.blade.php | 4 ++-- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/app/Console/Commands/SessionSummary.php b/app/Console/Commands/SessionSummary.php index 2ccf819..b9626f4 100644 --- a/app/Console/Commands/SessionSummary.php +++ b/app/Console/Commands/SessionSummary.php @@ -105,8 +105,6 @@ public function handle(): int $sessions[$key]['passed'] += $agg['passed']; $sessions[$key]['failed'] += $agg['failed']; $sessions[$key]['tokens'] += $agg['total_tokens']; - $sessions[$key]['ln_sum'] += $agg['ln_sum']; - $sessions[$key]['ln_n'] += $agg['ln_n']; $sessions[$key]['runs'] = $band['runs']->merge([$agg]); } @@ -231,8 +229,6 @@ private function aggregateRun(object $run) ->selectRaw('count(*) filter (where not ok) as failed') ->selectRaw('sum(gen_tokens) as total_tokens') ->selectRaw('sum(gen_tokens) / nullif(sum(wall), 0) as gen_tps') - ->selectRaw('sum(ln(gen_tokens::float8 / nullif(wall, 0))) filter (where wall > 0 and gen_tokens > 0) as ln_sum') - ->selectRaw('count(*) filter (where wall > 0 and gen_tokens > 0) as ln_n') ->first(); return collect([[ @@ -246,8 +242,6 @@ private function aggregateRun(object $run) 'weighted_user_tps' => null, 'gen_tps' => $this->roundOrNull($agg->gen_tps), 'total_tokens' => (int) ($agg->total_tokens ?? 0), - 'ln_sum' => (float) ($agg->ln_sum ?? 0), - 'ln_n' => (int) ($agg->ln_n ?? 0), ]]); } @@ -295,8 +289,6 @@ private function aggregateScenarioBand(array $runs): array ->selectRaw('count(*) filter (where not ok) as failed') ->selectRaw('sum(gen_tokens) as total_tokens') ->selectRaw('sum(gen_tokens) / nullif(sum(wall), 0) as gen_tps') - ->selectRaw('sum(ln(gen_tokens::float8 / nullif(wall, 0))) filter (where wall > 0 and gen_tokens > 0) as ln_sum') - ->selectRaw('count(*) filter (where wall > 0 and gen_tokens > 0) as ln_n') ->first(); // Thinking level: keep it only when every scenario row in the band @@ -316,8 +308,6 @@ private function aggregateScenarioBand(array $runs): array 'weighted_user_tps' => null, 'gen_tps' => $this->roundOrNull($agg->gen_tps), 'total_tokens' => (int) ($agg->total_tokens ?? 0), - 'ln_sum' => (float) ($agg->ln_sum ?? 0), - 'ln_n' => (int) ($agg->ln_n ?? 0), ]; } diff --git a/resources/views/livewire/summary/index.blade.php b/resources/views/livewire/summary/index.blade.php index 1efd034..65a5fba 100644 --- a/resources/views/livewire/summary/index.blade.php +++ b/resources/views/livewire/summary/index.blade.php @@ -167,13 +167,13 @@ class="w-64" {{ $session->band->runner_name ?? 'anonymous' }} {{ optional($session->band->ran_at)->format('M j Y') }} - {{-- Band total: geometric-mean tok/s across all observations + total tokens --}} + {{-- Band total: geometric-mean tok/s across decode-suite observations + total tokens --}} @if ($session->band->total_tps !== null)
{{ __('Band total') }} {{ number_format($session->band->total_tps, 1) }} - {{ __('tok/s (geo)') }} + {{ __('tok/s') }} {{ number_format($session->band->total_tokens) }}