From 75003f48b7e28f3e00ed77e26cfa6ee5d611812c Mon Sep 17 00:00:00 2001 From: Austin Macdonald Date: Fri, 21 Feb 2025 15:12:23 -0600 Subject: [PATCH] alphabetize ls fields there was no order previously, so might as well be alphabetized --- src/con_duct/suite/ls.py | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/src/con_duct/suite/ls.py b/src/con_duct/suite/ls.py index 7e0defe..cf857d6 100644 --- a/src/con_duct/suite/ls.py +++ b/src/con_duct/suite/ls.py @@ -17,39 +17,38 @@ lgr = logging.getLogger(__name__) VALUE_TRANSFORMATION_MAP: Dict[str, str] = { - "exit_code": "{value!E}", - "wall_clock_time": "{value:.3f} sec", - "peak_rss": "{value!S}", - "memory_total": "{value!S}", + "average_pcpu": "{value:.2f!N}%", + "average_pmem": "{value:.2f!N}%", "average_rss": "{value!S}", - "peak_vsz": "{value!S}", "average_vsz": "{value!S}", - "peak_pmem": "{value:.2f!N}%", - "average_pmem": "{value:.2f!N}%", + "end_time": "{value:.2f!N}", + "exit_code": "{value!E}", + "memory_total": "{value!S}", "peak_pcpu": "{value:.2f!N}%", - "average_pcpu": "{value:.2f!N}%", + "peak_pmem": "{value:.2f!N}%", + "peak_rss": "{value!S}", + "peak_vsz": "{value!S}", "start_time": "{value:.2f!N}", - "end_time": "{value:.2f!N}", + "wall_clock_time": "{value:.3f} sec", } NON_TRANSFORMED_FIELDS: List[str] = [ - "hostname", - "uid", - "user", - "gpu", - "duct_version", - "schema_version", "command", - "prefix", + "cpu_total", + "duct_version", + "gpu", + "hostname", + "info", + "logs_prefix", "num_samples", "num_reports", + "prefix", + "schema_version", "stderr", "stdout", - "cpu_total", - "logs_prefix", + "uid", "usage", - "info", - "prefix", + "user", ] LS_FIELD_CHOICES: List[str] = (