From d72d1febebb246563101f32499a26b42646543e3 Mon Sep 17 00:00:00 2001 From: Rafael Sarmiento Date: Fri, 24 May 2019 10:05:18 +0200 Subject: [PATCH 1/2] make osu_tests check generic --- cscs-checks/microbenchmarks/osu/osu_tests.py | 34 +++++++++++++++++--- 1 file changed, 29 insertions(+), 5 deletions(-) diff --git a/cscs-checks/microbenchmarks/osu/osu_tests.py b/cscs-checks/microbenchmarks/osu/osu_tests.py index 6e3edda4bc..33ecc89222 100644 --- a/cscs-checks/microbenchmarks/osu/osu_tests.py +++ b/cscs-checks/microbenchmarks/osu/osu_tests.py @@ -32,14 +32,18 @@ def __init__(self, variant): 'daint:gpu': { 'latency': (20.73, None, 2.0, 'us') }, + '*': { + 'latency': (0, None, None, 'us') + }, } self.num_tasks_per_node = 1 self.num_gpus_per_node = 1 if self.current_system.name == 'dom': self.num_tasks = 6 - - if self.current_system.name == 'daint': + elif self.current_system.name == 'daint': self.num_tasks = 16 + else: + self.num_tasks = 2 self.extra_resources = { 'switches': { @@ -67,7 +71,11 @@ def __init__(self): self.executable = './osu_alltoall' self.maintainers = ['RS', 'VK'] self.num_tasks_per_node = 1 - self.num_tasks = 0 + if self.current_system.name in {'dom', 'daint', 'kesch'}: + self.num_tasks = 0 + else: + self.num_tasks = 2 + self.sanity_patterns = sn.assert_found(r'^1048576', self.stdout) self.tags = {'diagnostic', 'ops'} @@ -108,6 +116,9 @@ def __init__(self, variant): }, 'daint:mc': { 'latency': (8.79, None, 0.25, 'us') + }, + '*': { + 'latency': (0, None, None, 'us') } } else: @@ -118,11 +129,12 @@ def __init__(self, variant): }, 'daint:mc': { 'latency': (10.85, None, 0.20, 'us') + }, + '*': { + 'latency': (0, None, None, 'us') } } - # Allow test to run on new systems without errors - self.reference['*:latency'] = (0, None, None, 'us') self.num_tasks_per_node = 1 self.num_gpus_per_node = 1 self.extra_resources = { @@ -213,6 +225,9 @@ def __init__(self): }, 'kesch:cn': { 'bw': (6311.48, -0.15, None, 'MB/s') + }, + '*': { + 'bw': (0, None, None, 'MB/s') } } self.perf_patterns = { @@ -250,6 +265,9 @@ def __init__(self): }, 'kesch:cn': { 'latency': (1.17, None, 0.1, 'us') + }, + '*': { + 'latency': (0, None, None, 'us') } } self.perf_patterns = { @@ -280,6 +298,9 @@ def __init__(self): 'kesch:cn': { 'bw': (6288.98, -0.1, None, 'MB/s') }, + '*': { + 'bw': (0, None, None, 'MB/s') + } } self.perf_patterns = { 'bw': sn.extractsingle(r'^4194304\s+(?P\S+)', @@ -317,6 +338,9 @@ def __init__(self): 'kesch:cn': { 'latency': (23.09, None, 0.1, 'us') }, + '*': { + 'latency': (0, None, None, 'us') + } } self.perf_patterns = { 'latency': sn.extractsingle(r'^8\s+(?P\S+)', From 1c79d014797bbbff9a7b5a4205b9dc2b7f352df2 Mon Sep 17 00:00:00 2001 From: Rafael Sarmiento Date: Fri, 24 May 2019 17:41:51 +0200 Subject: [PATCH 2/2] fix comments --- cscs-checks/microbenchmarks/osu/osu_tests.py | 25 ++++++++------------ 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/cscs-checks/microbenchmarks/osu/osu_tests.py b/cscs-checks/microbenchmarks/osu/osu_tests.py index 33ecc89222..04b414283f 100644 --- a/cscs-checks/microbenchmarks/osu/osu_tests.py +++ b/cscs-checks/microbenchmarks/osu/osu_tests.py @@ -13,8 +13,9 @@ def __init__(self, variant): self.build_system = 'Make' self.build_system.makefile = 'Makefile_alltoall' self.executable = './osu_alltoall' - # The -x option controls the number of warm-up iterations - # The -i option controls the number of iterations + # The -m option sets the maximum message size + # The -x option sets the number of warm-up iterations + # The -i option sets the number of iterations self.executable_opts = ['-m', '8', '-x', '1000', '-i', '20000'] self.valid_prog_environs = ['PrgEnv-cray', 'PrgEnv-gnu', 'PrgEnv-intel'] @@ -24,7 +25,7 @@ def __init__(self, variant): 'latency': sn.extractsingle(r'^8\s+(?P\S+)', self.stdout, 'latency', float) } - self.tags = {variant} + self.tags = {variant, 'benchmark'} self.reference = { 'dom:gpu': { 'latency': (8.23, None, 0.1, 'us') @@ -38,12 +39,10 @@ def __init__(self, variant): } self.num_tasks_per_node = 1 self.num_gpus_per_node = 1 - if self.current_system.name == 'dom': - self.num_tasks = 6 - elif self.current_system.name == 'daint': + if self.current_system.name == 'daint': self.num_tasks = 16 else: - self.num_tasks = 2 + self.num_tasks = 6 self.extra_resources = { 'switches': { @@ -71,13 +70,9 @@ def __init__(self): self.executable = './osu_alltoall' self.maintainers = ['RS', 'VK'] self.num_tasks_per_node = 1 - if self.current_system.name in {'dom', 'daint', 'kesch'}: - self.num_tasks = 0 - else: - self.num_tasks = 2 - + self.num_tasks = 0 self.sanity_patterns = sn.assert_found(r'^1048576', self.stdout) - self.tags = {'diagnostic', 'ops'} + self.tags = {'diagnostic', 'ops', 'benchmark'} @rfm.required_version('>=2.16') @@ -104,7 +99,7 @@ def __init__(self, variant): 'latency': sn.extractsingle(r'^8\s+(?P\S+)', self.stdout, 'latency', float) } - self.tags = {'production'} + self.tags = {'production', 'benchmark'} if variant == 'small': self.num_tasks = 6 self.reference = { @@ -187,7 +182,7 @@ def __init__(self): self.valid_prog_environs = ['PrgEnv-cray', 'PrgEnv-gnu', 'PrgEnv-intel'] self.maintainers = ['RS', 'VK'] - self.tags = {'production'} + self.tags = {'production', 'benchmark'} self.sanity_patterns = sn.assert_found(r'^4194304', self.stdout) self.extra_resources = {