diff --git a/abm/lib/benchmark.py b/abm/lib/benchmark.py index b9962a2..f9c5655 100644 --- a/abm/lib/benchmark.py +++ b/abm/lib/benchmark.py @@ -456,6 +456,7 @@ def wait_for_jobs(context, gi: GalaxyInstance, invocations: dict): jobs = gi.jobs.get_jobs(history_id=hid) for job in jobs: data = gi.jobs.show_job(job['id'], full_details=True) + data['job_metrics'] = gi.jobs.get_job_metrics(job['id']) metrics = { 'run': run, 'cloud': cloud, diff --git a/abm/lib/common.py b/abm/lib/common.py index f75fe3a..a6d113d 100644 --- a/abm/lib/common.py +++ b/abm/lib/common.py @@ -287,7 +287,8 @@ def find_executable(name): "galaxy_slots", # "memory.failcnt", "memory.limit_in_bytes", - "memory.max_usage_in_bytes", + "memory.peak", + #"memory.max_usage_in_bytes", # "memory.memsw.limit_in_bytes", # "memory.memsw.max_usage_in_bytes", # "memory.oom_control.oom_kill_disable", diff --git a/abm/lib/experiment.py b/abm/lib/experiment.py index 54a1707..ae0addc 100644 --- a/abm/lib/experiment.py +++ b/abm/lib/experiment.py @@ -233,7 +233,8 @@ def summarize(context: Context, args: list): 'runtime_seconds', 'cpuacct.usage', 'memory.limit_in_bytes', - 'memory.max_usage_in_bytes', + 'memory.peak' + #'memory.max_usage_in_bytes', ] # ,'memory.soft_limit_in_bytes']