From 669702e82596e637f901d3cb263618ba8bd33c1c Mon Sep 17 00:00:00 2001
From: huongdm1896 <domaihuong1451997@gmail.com>
Date: Tue, 4 Mar 2025 18:39:38 +0100
Subject: [PATCH] add GPU usage measurement, expetator update to v0.35
---
Run/measure_instance.py | 10 ++++++++--
requirements.txt | 2 +-
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/Run/measure_instance.py b/Run/measure_instance.py
index 73b2a7f..bb9aa46 100644
--- a/Run/measure_instance.py
+++ b/Run/measure_instance.py
@@ -48,6 +48,8 @@ if "dvfs_cpu" in config:
baseline=dvfs_config.get("baseline", False),
frequencies=dvfs_config.get("frequencies", None)
)
+ MONITORS = [Mojitos(sensor_set={'user', 'rxp', 'dram0'}),
+ kwollect.Power(metric=kwollect.get_g5k_target_metric())]
LEVERAGES = [dvfs]
elif "dvfs_gpu" in config:
dvfs_config = config["dvfs_gpu"]
@@ -58,9 +60,14 @@ elif "dvfs_gpu" in config:
zoomfrom=dvfs_config.get("zoomfrom", 0),
zoomto=dvfs_config.get("zoomto", 0)
)
+ MONITORS = [Mojitos(sensor_set={'user', 'rxp', 'dram0', 'gpu'}),
+ kwollect.Power(metric=kwollect.get_g5k_target_metric())]
LEVERAGES = [dvfs]
else:
+ MONITORS = [Mojitos(sensor_set={'user', 'rxp', 'dram0'}),
+ kwollect.Power(metric=kwollect.get_g5k_target_metric())] # Default monitor is only Mojitos CPU and Power
LEVERAGES = []
+
# Log directory
# log_dir = config["output_dir"]
@@ -99,7 +106,6 @@ if __name__ == "__main__":
flower_log_dir,
[DemoBench()],
leverages= LEVERAGES,
- monitors=[Mojitos(sensor_set={'user', 'rxp', 'dram0'}),
- kwollect.Power(metric=kwollect.get_g5k_target_metric())],
+ monitors= MONITORS,
times=args.repeat
)
\ No newline at end of file
diff --git a/requirements.txt b/requirements.txt
index 1ecfd4d..b8e774c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,6 @@
flwr==1.13.0
flwr-datasets==0.4.0
-expetator
+expetator==0.3.25
tensorflow>=2.16.1,<2.17.0
tensorflow-datasets==4.4.0
tensorboard>=2.16.2,<2.17.0
--
GitLab