From 2ce137cedf9336a6d512a0e477238ced5022b47e Mon Sep 17 00:00:00 2001 From: Vasileios Karakasis Date: Thu, 14 Apr 2022 10:27:25 +0200 Subject: [PATCH 1/2] Fix metric name in references for CPMD and VASP checks --- cscs-checks/apps/cpmd/cpmd_check.py | 19 ++++++++++--------- cscs-checks/apps/vasp/vasp_check.py | 27 +++++++++++++-------------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/cscs-checks/apps/cpmd/cpmd_check.py b/cscs-checks/apps/cpmd/cpmd_check.py index 5da0145bad..617983257d 100644 --- a/cscs-checks/apps/cpmd/cpmd_check.py +++ b/cscs-checks/apps/cpmd/cpmd_check.py @@ -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, None, 0.15, 's')}, + 'daint:gpu': {'elapsed_time': (120, 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, None, 0.15, 's')} }, 'broadwell': { - 'daint:mc': {'time': (150.0, None, 0.15, 's')}, + 'daint:mc': {'elapsed_time': (150.0, None, 0.15, 's')}, }, } } @@ -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] diff --git a/cscs-checks/apps/vasp/vasp_check.py b/cscs-checks/apps/vasp/vasp_check.py index e8fd78996e..005f452f92 100644 --- a/cscs-checks/apps/vasp/vasp_check.py +++ b/cscs-checks/apps/vasp/vasp_check.py @@ -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')} } } } @@ -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 @@ -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}') @@ -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] From 93b8f802f092aa11b0d338a2412d4feae25ed8e7 Mon Sep 17 00:00:00 2001 From: Vasileios Karakasis Date: Thu, 14 Apr 2022 10:50:45 +0200 Subject: [PATCH 2/2] Address PR comments --- cscs-checks/apps/cpmd/cpmd_check.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cscs-checks/apps/cpmd/cpmd_check.py b/cscs-checks/apps/cpmd/cpmd_check.py index 617983257d..397c6c00f9 100644 --- a/cscs-checks/apps/cpmd/cpmd_check.py +++ b/cscs-checks/apps/cpmd/cpmd_check.py @@ -26,8 +26,8 @@ class CPMDCheck(rfm.RunOnlyRegressionTest): allref = { 6: { 'sm_60': { - 'dom:gpu': {'elapsed_time': (120, None, 0.15, 's')}, - 'daint:gpu': {'elapsed_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': {'elapsed_time': (150.0, None, 0.15, 's')}, @@ -36,7 +36,7 @@ class CPMDCheck(rfm.RunOnlyRegressionTest): }, 16: { 'sm_60': { - 'daint:gpu': {'elapsed_time': (120, None, 0.15, 's')} + 'daint:gpu': {'elapsed_time': (120.0, None, 0.15, 's')} }, 'broadwell': { 'daint:mc': {'elapsed_time': (150.0, None, 0.15, 's')},