From 7c35d07913516fb1f48efef4fedcf99195253aef Mon Sep 17 00:00:00 2001 From: Luca Date: Mon, 25 Feb 2019 16:30:03 +0100 Subject: [PATCH 1/4] Adding DGEMM with OpenBlas on Kesch --- cscs-checks/microbenchmarks/dgemm/dgemm.py | 23 +++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/cscs-checks/microbenchmarks/dgemm/dgemm.py b/cscs-checks/microbenchmarks/dgemm/dgemm.py index f5dd461cba..00cd5785cc 100644 --- a/cscs-checks/microbenchmarks/dgemm/dgemm.py +++ b/cscs-checks/microbenchmarks/dgemm/dgemm.py @@ -14,8 +14,17 @@ def __init__(self): # the perf patterns are automaticaly generated inside sanity self.perf_patterns = {} - self.valid_systems = ['daint:gpu', 'daint:mc', 'dom:gpu', 'dom:mc'] - self.valid_prog_environs = ['PrgEnv-gnu', 'PrgEnv-intel'] + self.valid_systems = [ + 'daint:gpu', 'daint:mc', + 'dom:gpu', 'dom:mc', + 'kesch:cn', 'kesch:pn' + ] + + if self.current_system.name == ['daint', 'dom']: + self.valid_prog_environs = ['PrgEnv-gnu', 'PrgEnv-intel'] + if self.current_system.name == 'kesch': + self.valid_prog_environs = ['PrgEnv-gnu-nompi'] + self.num_tasks = 0 self.num_tasks_per_node = 1 self.num_tasks_per_core = 1 @@ -28,8 +37,8 @@ def __init__(self): 'daint:mc': (860.0, -0.15, None, 'Gflop/s'), 'dom:gpu': (300.0, -0.15, None, 'Gflop/s'), 'dom:mc': (860.0, -0.15, None, 'Gflop/s'), - # FIXME update the values for monch - 'monch:compute': (350, -0.1, None, 'Gflop/s'), + 'kesch:cn': (300.0, -0.15, None, 'Gflop/s'), + 'kesch:pn': (300.0, -0.15, None, 'Gflop/s'), } self.maintainers = ['AJ', 'VH', 'VK'] @@ -55,9 +64,9 @@ def setup(self, partition, environ, **job_opts): elif partition.fullname in ['daint:mc', 'dom:mc']: self.num_cpus_per_task = 36 self.executable_opts = ['6144', '12288', '3072'] - elif partition.fullname in ['monch:compute']: - self.num_cpus_per_task = 20 - self.executable_opts = ['5000', '5000', '5000'] + elif partition.fullname in ['kesch:cn', 'kesch:pn']: + self.num_cpus_per_task = 12 + self.executable_opts = ['6144', '12288', '3072'] self.build_system.cflags += ['-I$EBROOTOPENBLAS/include'] self.build_system.ldflags = ['-L$EBROOTOPENBLAS/lib', '-lopenblas', '-lpthread', '-lgfortran'] From 9840df24c77ca30bd1f218066545477e69f9d6bd Mon Sep 17 00:00:00 2001 From: Luca Date: Mon, 25 Feb 2019 16:48:55 +0100 Subject: [PATCH 2/4] Minor changes to comply with coding style --- cscs-checks/microbenchmarks/dgemm/dgemm.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cscs-checks/microbenchmarks/dgemm/dgemm.py b/cscs-checks/microbenchmarks/dgemm/dgemm.py index 00cd5785cc..488d10ed30 100644 --- a/cscs-checks/microbenchmarks/dgemm/dgemm.py +++ b/cscs-checks/microbenchmarks/dgemm/dgemm.py @@ -15,11 +15,11 @@ def __init__(self): self.perf_patterns = {} self.valid_systems = [ - 'daint:gpu', 'daint:mc', + 'daint:gpu', 'daint:mc', 'dom:gpu', 'dom:mc', 'kesch:cn', 'kesch:pn' ] - + if self.current_system.name == ['daint', 'dom']: self.valid_prog_environs = ['PrgEnv-gnu', 'PrgEnv-intel'] if self.current_system.name == 'kesch': From c1ad9114146568575955049679478f8f2cc048c0 Mon Sep 17 00:00:00 2001 From: Luca Date: Mon, 25 Feb 2019 17:55:19 +0100 Subject: [PATCH 3/4] Minor changes to comply with coding style --- cscs-checks/microbenchmarks/dgemm/dgemm.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cscs-checks/microbenchmarks/dgemm/dgemm.py b/cscs-checks/microbenchmarks/dgemm/dgemm.py index 488d10ed30..ef28274176 100644 --- a/cscs-checks/microbenchmarks/dgemm/dgemm.py +++ b/cscs-checks/microbenchmarks/dgemm/dgemm.py @@ -24,7 +24,7 @@ def __init__(self): self.valid_prog_environs = ['PrgEnv-gnu', 'PrgEnv-intel'] if self.current_system.name == 'kesch': self.valid_prog_environs = ['PrgEnv-gnu-nompi'] - + self.num_tasks = 0 self.num_tasks_per_node = 1 self.num_tasks_per_core = 1 From 116a0ff45c65b8982487fe01d226c9f18a88cf16 Mon Sep 17 00:00:00 2001 From: Vasileios Karakasis Date: Thu, 28 Feb 2019 09:10:09 +0100 Subject: [PATCH 4/4] Update cscs-checks/microbenchmarks/dgemm/dgemm.py Change if test as suggested Co-Authored-By: lucamar --- cscs-checks/microbenchmarks/dgemm/dgemm.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cscs-checks/microbenchmarks/dgemm/dgemm.py b/cscs-checks/microbenchmarks/dgemm/dgemm.py index ef28274176..78faadb6e2 100644 --- a/cscs-checks/microbenchmarks/dgemm/dgemm.py +++ b/cscs-checks/microbenchmarks/dgemm/dgemm.py @@ -20,7 +20,7 @@ def __init__(self): 'kesch:cn', 'kesch:pn' ] - if self.current_system.name == ['daint', 'dom']: + if self.current_system.name in ['daint', 'dom']: self.valid_prog_environs = ['PrgEnv-gnu', 'PrgEnv-intel'] if self.current_system.name == 'kesch': self.valid_prog_environs = ['PrgEnv-gnu-nompi']