Skip to content

Commit b73e1fb

Browse files
author
Vasileios Karakasis
authored
Merge branch 'master' into testlib/gromacs-loggable-props
2 parents d689c6a + fe12f68 commit b73e1fb

File tree

2 files changed

+8
-11
lines changed

2 files changed

+8
-11
lines changed

cscs-checks/apps/lammps/lammps_check.py

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,8 @@
1111

1212
class LAMMPSCheck(rfm.RunOnlyRegressionTest):
1313
scale = parameter(['small', 'large'])
14-
variant = parameter(['maint', 'prod'])
1514
modules = ['cray-python', 'LAMMPS']
16-
tags = {'scs', 'external-resources'}
15+
tags = {'external-resources', 'maintenance', 'production'}
1716
maintainers = ['LM']
1817
strict_check = False
1918
extra_resources = {
@@ -78,14 +77,13 @@ def setup_by_scale(self):
7877
self.num_tasks = 32
7978
self.num_tasks_per_node = 2
8079

81-
self.reference = self.references_by_variant[self.variant][self.scale]
82-
self.tags |= {'maintenance', 'production'}
80+
self.reference = self.refs_by_scale[self.scale]
8381

8482

8583
@rfm.simple_test
8684
class LAMMPSCPUCheck(LAMMPSCheck):
8785
valid_systems = ['daint:mc', 'eiger:mc', 'pilatus:mc']
88-
res_by_scale = {
86+
refs_by_scale = {
8987
'small': {
9088
'dom:mc': {'perf': (4394, -0.05, None, 'timesteps/s')},
9189
'daint:mc': {'perf': (3350, -0.30, None, 'timesteps/s')},
@@ -121,5 +119,4 @@ def setup_by_scale(self):
121119
self.num_tasks_per_node = 128
122120
self.num_tasks = 256 if self.scale == 'small' else 512
123121

124-
self.reference = self.references_by_variant[self.variant][self.scale]
125-
self.tags |= {'maintenance', 'production'}
122+
self.reference = self.refs_by_scale[self.scale]

cscs-checks/microbenchmarks/cpu/alloc_speed/alloc_speed.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,16 +47,16 @@ def set_reference(self):
4747
sys_reference = {
4848
'no': {
4949
'dom:gpu': {
50-
'time': (1.22, -0.20, 0.15, 's')
50+
'time': (1.32, -0.20, 0.15, 's')
5151
},
5252
'dom:mc': {
53-
'time': (1.41, -0.20, 0.10, 's')
53+
'time': (1.51, -0.20, 0.10, 's')
5454
},
5555
'daint:gpu': {
56-
'time': (1.22, -0.20, 0.05, 's')
56+
'time': (1.32, -0.20, 0.05, 's')
5757
},
5858
'daint:mc': {
59-
'time': (1.41, -0.20, 0.05, 's')
59+
'time': (1.51, -0.20, 0.05, 's')
6060
},
6161
'eiger:mc': {
6262
'time': (0.12, -0.20, 0.05, 's')

0 commit comments

Comments
 (0)