Skip to content

[test] Fix metric name in references for CPMD and VASP checks #2496

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 14, 2022
Merged

[test] Fix metric name in references for CPMD and VASP checks #2496

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ce137c
Fix metric name in references for CPMD and VASP checks
Apr 14, 2022
93b8f80
Address PR comments
Apr 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions cscs-checks/apps/cpmd/cpmd_check.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,23 +23,23 @@ class CPMDCheck(rfm.RunOnlyRegressionTest):
maintainers = ['AJ', 'LM']

num_nodes = parameter([6, 16], loggable=True)
references = {
allref = {
6: {
'sm_60': {
'dom:gpu': {'time': (120, None, 0.15, 's')},
'daint:gpu': {'time': (120, None, 0.15, 's')},
'dom:gpu': {'elapsed_time': (120.0, None, 0.15, 's')},
'daint:gpu': {'elapsed_time': (120.0, None, 0.15, 's')},
},
'broadwell': {
'dom:mc': {'time': (150.0, None, 0.15, 's')},
'daint:mc': {'time': (150.0, None, 0.15, 's')},
'dom:mc': {'elapsed_time': (150.0, None, 0.15, 's')},
'daint:mc': {'elapsed_time': (150.0, None, 0.15, 's')},
},
},
16: {
'sm_60': {
'daint:gpu': {'time': (120, None, 0.15, 's')}
'daint:gpu': {'elapsed_time': (120.0, None, 0.15, 's')}
},
'broadwell': {
'daint:mc': {'time': (150.0, None, 0.15, 's')},
'daint:mc': {'elapsed_time': (150.0, None, 0.15, 's')},
},
}
}
Expand Down Expand Up @@ -93,16 +93,17 @@ def setup_run(self):
# common setup for every architecture
self.job.launcher.options = ['--cpu-bind=cores']
self.job.options = ['--distribution=block:block']

# FIXME: the current test case does not scale beyond 72 MPI tasks
# and needs to be updated (see the warning about XC_DRIVER IN &DFT)
self.num_tasks_per_node = 72 // self.num_nodes
self.num_tasks = self.num_nodes * self.num_tasks_per_node

try:
found = self.references[self.num_nodes][arch]
found = self.allref[self.num_nodes][arch]
except KeyError:
self.skip(f'Configuration with {self.num_nodes} node(s) '
f'is not supported on {arch!r}')

# setup performance references
self.reference = self.references[self.num_nodes][arch]
self.reference = self.allref[self.num_nodes][arch]
27 changes: 13 additions & 14 deletions cscs-checks/apps/vasp/vasp_check.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,31 +23,31 @@ class VASPCheck(rfm.RunOnlyRegressionTest):
maintainers = ['LM']

num_nodes = parameter([6, 16], loggable=True)
references = {
allref = {
6: {
'sm_60': {
'dom:gpu': {'time': (56.0, None, 0.10, 's')},
'daint:gpu': {'time': (65.0, None, 0.15, 's')},
'dom:gpu': {'elapsed_time': (56.0, None, 0.10, 's')},
'daint:gpu': {'elapsed_time': (65.0, None, 0.15, 's')},
},
'broadwell': {
'dom:mc': {'time': (58.0, None, 0.10, 's')},
'daint:mc': {'time': (65.0, None, 0.15, 's')},
'dom:mc': {'elapsed_time': (58.0, None, 0.10, 's')},
'daint:mc': {'elapsed_time': (65.0, None, 0.15, 's')},
},
'zen2': {
'eiger:mc': {'time': (100.0, None, 0.10, 's')},
'pilatus:mc': {'time': (100.0, None, 0.10, 's')},
'eiger:mc': {'elapsed_time': (100.0, None, 0.10, 's')},
'pilatus:mc': {'elapsed_time': (100.0, None, 0.10, 's')},
},
},
16: {
'sm_60': {
'daint:gpu': {'time': (55.0, None, 0.15, 's')},
'daint:gpu': {'elapsed_time': (55.0, None, 0.15, 's')},
},
'broadwell': {
'daint:mc': {'time': (55.0, None, 0.15, 's')},
'daint:mc': {'elapsed_time': (55.0, None, 0.15, 's')},
},
'zen2': {
'eiger:mc': {'time': (100.0, None, 0.10, 's')},
'pilatus:mc': {'time': (100.0, None, 0.10, 's')}
'eiger:mc': {'elapsed_time': (100.0, None, 0.10, 's')},
'pilatus:mc': {'elapsed_time': (100.0, None, 0.10, 's')}
}
}
}
Expand Down Expand Up @@ -85,7 +85,6 @@ def setup_system_filtering(self):
else:
self.valid_prog_environs = ['builtin']


@run_before('run')
def setup_run(self):
# set auto-detected architecture
Expand All @@ -98,7 +97,7 @@ def setup_run(self):
arch = 'sm_60'

try:
found = self.references[self.num_nodes][arch]
found = self.allref[self.num_nodes][arch]
except KeyError:
self.skip(f'Configuration with {self.num_nodes} node(s) '
f'is not supported on {arch!r}')
Expand All @@ -122,4 +121,4 @@ def setup_run(self):
})

# setup performance references
self.reference = self.references[self.num_nodes][arch]
self.reference = self.allref[self.num_nodes][arch]