diff --git a/expetator/monitors/mojitos.py b/expetator/monitors/mojitos.py index a47b6ca09a7456702cd3e6bf7c32faf7d5064d9d..f5f8a36628ec9d3e6e2582497b890e1537def6c8 100644 --- a/expetator/monitors/mojitos.py +++ b/expetator/monitors/mojitos.py @@ -28,16 +28,18 @@ perf_names = {'cpu_cycles', 'instructions', 'cache_references', 'cache_misses', 'cpu_clock', 'task_clock', 'page_faults', 'context_switches', 'cpu_migrations', 'page_faults_min', 'page_faults_maj', 'alignment_faults', 'emulation_faults', 'dummy', 'bpf_output'} +gpu_names = {'gpu'} def get_names(): - return network_names | rapl_names | load_names | perf_names | infiniband_names + return network_names | rapl_names | load_names | perf_names | infiniband_names | gpu_names def get_structured_names(): return {'network':network_names, 'rapl':rapl_names, 'load':load_names, 'perfct':perf_names, - 'infiniband': infiniband_names} + 'infiniband': infiniband_names, + 'gpu': gpu_names} class Mojitos: 'Monitoring using MojitO/S' @@ -48,7 +50,8 @@ class Mojitos: self.rapl = len(sensor_set & rapl_names) != 0 self.load = len(sensor_set & load_names) != 0 self.infiniband = len(sensor_set & infiniband_names) != 0 - + self.gpu = len(sensor_set & gpu_names) != 0 + self.executor = None self.names = sensor_set @@ -94,6 +97,8 @@ class Mojitos: self.cmdline += ' -r' if self.load: self.cmdline += ' -u' + if self.gpu: + self.cmdline += ' -n' self.monitoring_file = '%s/monitoring_moj' % executor.tmp_dir self.cmdline += ' -o %s &' % self.monitoring_file diff --git a/setup.py b/setup.py index 67653d4c8f6fe9d641b41b2bfe9103c2f9c74a1c..912eb0001bdd31d0d842f5889c0f1a9003d1eec6 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ with open("README.md", "r") as fh: setuptools.setup( name="expetator", - version="0.3.24", + version="0.3.25", author="Georges Da Costa", author_email="georges.da-costa@irit.fr", description="A framework for monitoring HPC applications using DVFS",