From 3e969943a31ad9b969e92e56b993263ff7328d50 Mon Sep 17 00:00:00 2001
From: Richard Darst <rkd@zgib.net>
Date: Mon, 19 Aug 2024 12:57:05 +0300
Subject: [PATCH] slurm2sql: eff view: add cpu_s_used and gpu_s_used columns

---
 slurm2sql.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/slurm2sql.py b/slurm2sql.py
index 5e0aea6..5c3c500 100644
--- a/slurm2sql.py
+++ b/slurm2sql.py
@@ -877,12 +877,14 @@ def infer_type(cd):
                'max(NCPUS) AS NCPUS, '
                'max(totalcpu)/max(cputime) AS CPUeff, '  # highest TotalCPU is for the whole allocation
                'max(cputime) AS cpu_s_reserved, '
+               'max(totalcpu) AS cpu_s_used, '
                'max(ReqMemNode) AS MemReq, '
                'max(ReqMemNode*Elapsed) AS mem_s_reserved, ' # highest of any job
                'max(MaxRSS) AS MaxRSS, '
                'max(MaxRSS) / max(ReqMemNode) AS MemEff, '
                'max(NGpus) AS NGpus, '
                'max(NGpus)*max(Elapsed) AS gpu_s_reserved, '
+               'max(NGpus)*max(Elapsed)*max(GPUutil) AS gpu_s_used, '
                'max(GPUutil) AS GPUeff, '               # Individual job with highest use (check this)
                'max(GPUMem) AS GPUMem, '
                'MaxDiskRead, '