add GPU usage measurement, expetator update to v0.35

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

requirements.txt

 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