From 3599374f9b2fe928b4bbf7317ec2b4855378bd21 Mon Sep 17 00:00:00 2001 From: Victor Holanda Date: Fri, 27 Sep 2019 08:46:51 +0200 Subject: [PATCH 1/2] Update gromacs ref value --- cscs-checks/apps/gromacs/gromacs_check.py | 26 +---------------------- 1 file changed, 1 insertion(+), 25 deletions(-) diff --git a/cscs-checks/apps/gromacs/gromacs_check.py b/cscs-checks/apps/gromacs/gromacs_check.py index b7291ab011..22ae06ec06 100644 --- a/cscs-checks/apps/gromacs/gromacs_check.py +++ b/cscs-checks/apps/gromacs/gromacs_check.py @@ -123,7 +123,7 @@ def __init__(self, scale, variant): }, 'prod': { 'small': { - 'dom:mc': {'perf': (42.7, -0.05, None, 'ns/day')}, + 'dom:mc': {'perf': (41.0, -0.05, None, 'ns/day')}, 'daint:mc': {'perf': (38.8, -0.10, None, 'ns/day')} }, 'large': { @@ -134,27 +134,3 @@ def __init__(self, scale, variant): self.reference = references[variant][scale] self.tags |= {'maintenance' if variant == 'maint' else 'production'} - -# FIXME: This test is obsolete; it is kept only for reference. -@rfm.parameterized_test([1], [2], [4], [6], [8]) -class GromacsCPUMonchAcceptance(GromacsBaseCheck): - def __init__(self, num_nodes): - super().__init__('md.log') - - self.valid_systems = ['monch:compute'] - self.descr = 'GROMACS %d-node CPU check on monch' % num_nodes - self.name = 'gromacs_cpu_monch_%d_node_check' % num_nodes - self.executable_opts = ('mdrun -dlb yes -ntomp 1 -npme -1 ' - '-nsteps 5000 -nb cpu -s herflat.tpr ').split() - - self.tags = {'monch_acceptance'} - self.num_tasks_per_node = 20 - self.num_tasks = num_nodes * self.num_tasks_per_node - - reference_by_nodes = {1: 2.6, 2: 5.1, 4: 11.1, 6: 15.8, 8: 20.6} - - self.reference = { - 'monch:compute': { - 'perf': (reference_by_nodes[num_nodes], -0.15, None) - } - } From 3c90b5c1209590eb4c467b4414eced01a23fcb78 Mon Sep 17 00:00:00 2001 From: Vasileios Karakasis Date: Fri, 27 Sep 2019 15:22:09 +0200 Subject: [PATCH 2/2] Remove call to super().__init__() in Gromacs check - And update ReFrame's required version --- cscs-checks/apps/gromacs/gromacs_check.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/cscs-checks/apps/gromacs/gromacs_check.py b/cscs-checks/apps/gromacs/gromacs_check.py index 22ae06ec06..05f776383c 100644 --- a/cscs-checks/apps/gromacs/gromacs_check.py +++ b/cscs-checks/apps/gromacs/gromacs_check.py @@ -7,7 +7,6 @@ class GromacsBaseCheck(rfm.RunOnlyRegressionTest): def __init__(self, output_file): - super().__init__() self.valid_prog_environs = ['PrgEnv-gnu'] self.executable = 'gmx_mpi' @@ -45,7 +44,7 @@ def __init__(self, output_file): self.tags = {'scs'} -@rfm.required_version('>=2.16') +@rfm.required_version('>=2.19') @rfm.parameterized_test(*([s, v] for s in ['small', 'large'] for v in ['prod', 'maint'])) @@ -90,7 +89,7 @@ def __init__(self, scale, variant): self.tags |= {'maintenance' if variant == 'maint' else 'production'} -@rfm.required_version('>=2.16') +@rfm.required_version('>=2.19') @rfm.parameterized_test(*([s, v] for s in ['small', 'large'] for v in ['prod'])) @@ -133,4 +132,3 @@ def __init__(self, scale, variant): } self.reference = references[variant][scale] self.tags |= {'maintenance' if variant == 'maint' else 'production'} -