change variable names

slurm-eff-tool.py

@@ -54,8 +54,7 @@ SACCT_FIELDS = [
     "TRESUsageInTot",
 ]
 
-# Default columns to print in output, and their order
-DEFAULT_COLUMNS = [
+ALL_COLUMNS = [
     "username",
     "JobID",
     "Count",
@@ -67,10 +66,10 @@ DEFAULT_COLUMNS = [
     "ReqMem",
     "AllocMem",
     "UsedMem",
-    "Mem_Eff",
-    "waste_Mem",
     "MaxRSS_max",
     "MemPerCPU",
+    "Mem_Eff",
+    "waste_Mem",
     "ReqWalltime",
     "Walltime",
     "Walltime_max",
@@ -696,7 +695,7 @@ def make_aggregate_row(records: list[JobRecord], username: str, jobname: str) ->
 def resolve_column_name(name: str) -> str:
     """Returns canonicalized full column name, accepts one letter column codes"""
     n = name.strip()
-    reverse = {v.lower(): v for v in DEFAULT_COLUMNS}
+    reverse = {v.lower(): v for v in ALL_COLUMNS}
     reverse.update({v.lower(): v for v in NUMERIC_COLUMNS})
     if n in ALIASES:
         return ALIASES[n]
@@ -802,7 +801,9 @@ def parse_args(argv: list[str]) -> argparse.Namespace:
     p = argparse.ArgumentParser(
         formatter_class=argparse.RawDescriptionHelpFormatter,
         description="Display seff-style CPU, memory and walltime efficiency values from sacct data.",
-        epilog="""Examples:
+        epilog="""-S/-E/--state are ignored when reading data from a cached file.
+
+  Examples:
   # first get an overview (-U/--aggr-user) and write a cachefile 
   slurm-eff-tool -O sacct.cache -U
   # now you can read the cachefile for later runs and e.g. sort based on waste_Mem
@@ -851,8 +852,8 @@ def parse_args(argv: list[str]) -> argparse.Namespace:
 
     args = p.parse_args(argv)
 
-    if args.from_cache and any([args.start, args.end, args.state]):
-        print("warning: -S/-E/--state are ignored when using -F/--from-cache", file=sys.stderr)
+    # if args.from_cache and any([args.start, args.end, args.state]):
+    #     print("warning: -S/-E/--state are ignored when using -F/--from-cache", file=sys.stderr)
     if args.aggr_user and args.aggr_regexp:
         die("choose only one aggregation mode: --aggr-user or --aggr-regexp")
     return args
@@ -865,10 +866,10 @@ def main(argv: list[str] | None = None) -> int:
 
     args = parse_args(argv or sys.argv[1:])
 
-    output_columns = DEFAULT_COLUMNS
+    output_columns = ALL_COLUMNS
     if args.format:
         output_columns = columns_from_fmtstr(args.format)
-    
+
     if args.aggr_user or args.aggr_regexp:
         output_columns = [c for c in output_columns if c != "JobID"]
     else: