Skip to content

Commit 4524be7

Browse files
author
Theofilos Manitaras
committed
Fix assignment of num_tasks
* Fix assignment of `self.num_tasks` by moving it to base class. * Move common assignment of fields to base class.
1 parent 7345432 commit 4524be7

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

cscs-checks/apps/namd/namd_check.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,16 @@ def __init__(self, variant, **kwargs):
1919
'NAMD')
2020
self.executable = 'namd2'
2121

22+
self.use_multithreading = True
23+
self.num_tasks_per_core = 2
24+
25+
if self.current_system.name == 'dom':
26+
self.num_tasks = 6
27+
self.num_tasks_per_node = 1
28+
else:
29+
self.num_tasks = 16
30+
self.num_tasks_per_node = 1
31+
2232
energy = sn.avg(sn.extractall(r'ENERGY:(\s+\S+){10}\s+(?P<energy>\S+)',
2333
self.stdout, 'energy', float))
2434
energy_reference = -2451359.5
@@ -52,9 +62,7 @@ def __init__(self, version, **kwargs):
5262
super().__init__('gpu_%s' % version, **kwargs)
5363
self.valid_systems = ['daint:gpu', 'dom:gpu']
5464
self.executable_opts = '+idlepoll +ppn 23 stmv.namd'.split()
55-
self.use_multithreading = True
5665
self.num_cpus_per_task = 24
57-
self.num_tasks_per_core = 2
5866
self.num_gpus_per_node = 1
5967

6068

@@ -91,15 +99,7 @@ def __init__(self, version, **kwargs):
9199
super().__init__('cpu_%s' % version, **kwargs)
92100
self.valid_systems = ['daint:mc', 'dom:mc']
93101
self.executable_opts = '+idlepoll +ppn 71 stmv.namd'.split()
94-
self.use_multithreading = True
95102
self.num_cpus_per_task = 72
96-
self.num_tasks_per_core = 2
97-
if self.current_system.name == 'dom':
98-
self.num_tasks = 6
99-
self.num_tasks_per_node = 1
100-
else:
101-
self.num_tasks = 16
102-
self.num_tasks_per_node = 1
103103

104104

105105
class NamdCPUProdCheck(NamdCPUCheck):

0 commit comments

Comments
 (0)