From 5383ab83917ba024dd7d9b57e526fb6c47bb5f63 Mon Sep 17 00:00:00 2001 From: Derek Feichtinger Date: Sun, 24 May 2026 22:24:20 +0200 Subject: [PATCH] for regex aggregation, only aggregate for same user --- slurm-eff-tool.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/slurm-eff-tool.py b/slurm-eff-tool.py index d7be2e3..c360a68 100755 --- a/slurm-eff-tool.py +++ b/slurm-eff-tool.py @@ -441,14 +441,15 @@ def aggregate_records(records: list[JobRecord], args: argparse.Namespace) -> lis matched = False for pat, rx in compiled: if rx.search(rec.jobname): - key = (pat, rec.cpus, rec.nodes, rec.reqmem_gb, rec.reqwall_hours) + key = (pat, rec.cpus, rec.nodes, rec.reqmem_gb, rec.reqwall_hours, + rec.username) buckets[key].append(rec) matched = True break if not matched: unmatched.append(rec) - out = [make_aggregate_row(v, username="*", jobname=k[0]) for k, v in buckets.items()] + out = [make_aggregate_row(v, username=k[5], jobname=k[0]) for k, v in buckets.items()] out.extend(make_single_row(r) for r in unmatched) return out