From ae970baa6e2123bcd682f3533d58f665e22991f8 Mon Sep 17 00:00:00 2001
From: dcarron <daniel.carron@idiap.ch>
Date: Wed, 28 Jun 2023 09:42:57 +0200
Subject: [PATCH] Added units to resources monitoring
---
src/ptbench/utils/resources.py | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/ptbench/utils/resources.py b/src/ptbench/utils/resources.py
index fa0ac3dd..ebad7794 100644
--- a/src/ptbench/utils/resources.py
+++ b/src/ptbench/utils/resources.py
@@ -100,7 +100,7 @@ def gpu_constants():
"""
return run_nvidia_smi(
("gpu_name", "driver_version", "memory.total"),
- ("gpu_name", "gpu_driver_version", "gpu_memory_total"),
+ ("gpu_name", "gpu_driver_version", "gpu_memory_total_GB"),
)
@@ -135,10 +135,10 @@ def gpu_log():
"utilization.gpu",
),
(
- "gpu_memory_total",
- "gpu_memory_used",
- "gpu_memory_free",
- "gpu_percent",
+ "gpu_memory_total_GB",
+ "gpu_memory_used_GB",
+ "gpu_memory_free_percent",
+ "gpu_usage_percent",
),
)
@@ -165,7 +165,7 @@ def cpu_constants():
1. ``cpu_count`` (:py:class:`int`): number of logical CPUs available
"""
return (
- ("cpu_memory_total", psutil.virtual_memory().total / GB),
+ ("cpu_memory_total_GB", psutil.virtual_memory().total / GB),
("cpu_count", psutil.cpu_count(logical=True)),
)
@@ -245,9 +245,9 @@ class CPULogger:
# at this point, but ensures to update counts later on
gone.add(k)
return (
- ("cpu_memory_used", psutil.virtual_memory().used / GB),
- ("cpu_rss", sum([k.rss for k in memory_info]) / GB),
- ("cpu_vms", sum([k.vms for k in memory_info]) / GB),
+ ("cpu_memory_used_GB", psutil.virtual_memory().used / GB),
+ ("cpu_rss_GB", sum([k.rss for k in memory_info]) / GB),
+ ("cpu_vms_GB", sum([k.vms for k in memory_info]) / GB),
("cpu_percent", sum(cpu_percent)),
("cpu_processes", len(self.cluster) - len(gone)),
("cpu_open_files", sum(open_files)),
--
GitLab