From ecbae56a5e1aa7e6028a942a7ef3bdfefc003c68 Mon Sep 17 00:00:00 2001 From: ajocksch Date: Mon, 15 Feb 2021 09:37:13 +0100 Subject: [PATCH 1/4] eiger: no static linking --- cscs-checks/libraries/io/netcdf_compile_run.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/cscs-checks/libraries/io/netcdf_compile_run.py b/cscs-checks/libraries/io/netcdf_compile_run.py index 772f40c1dd..c9c6d9ea3c 100644 --- a/cscs-checks/libraries/io/netcdf_compile_run.py +++ b/cscs-checks/libraries/io/netcdf_compile_run.py @@ -22,8 +22,12 @@ def __init__(self, lang, linkage): self.lang = lang self.linkage = linkage self.descr = f'{lang_names[lang]} NetCDF {linkage.capitalize()}' - self.valid_systems = ['daint:gpu', 'daint:mc', 'dom:gpu', 'dom:mc', - 'arolla:cn', 'tsa:cn'] + if linkage == 'dynamic': + self.valid_systems = ['daint:gpu', 'daint:mc', 'dom:gpu', 'dom:mc', + 'arolla:cn', 'tsa:cn', 'eiger:mc'] + else: + self.valid_systems = ['daint:gpu', 'daint:mc', 'dom:gpu', 'dom:mc', + 'arolla:cn', 'tsa:cn'] if self.current_system.name in ['daint', 'dom']: self.valid_prog_environs = ['PrgEnv-cray', 'PrgEnv-gnu', 'PrgEnv-intel', 'PrgEnv-pgi'] @@ -31,6 +35,9 @@ def __init__(self, lang, linkage): elif self.current_system.name in ['arolla', 'tsa']: self.exclusive_access = True self.valid_prog_environs = ['PrgEnv-gnu-nompi', 'PrgEnv-pgi-nompi'] + elif self.current_system.name in ['eiger']: + self.valid_prog_environs = ['builtin'] + self.modules = ['cray-hdf5', 'cray-netcdf'] self.sourcesdir = os.path.join(self.current_system.resourcesdir, 'netcdf') From 0fa16f90d3706647c43b6f30ab4434449020fcc0 Mon Sep 17 00:00:00 2001 From: ajocksch Date: Mon, 15 Feb 2021 09:47:08 +0100 Subject: [PATCH 2/4] code style --- cscs-checks/libraries/io/netcdf_compile_run.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cscs-checks/libraries/io/netcdf_compile_run.py b/cscs-checks/libraries/io/netcdf_compile_run.py index c9c6d9ea3c..60d1e71847 100644 --- a/cscs-checks/libraries/io/netcdf_compile_run.py +++ b/cscs-checks/libraries/io/netcdf_compile_run.py @@ -23,11 +23,11 @@ def __init__(self, lang, linkage): self.linkage = linkage self.descr = f'{lang_names[lang]} NetCDF {linkage.capitalize()}' if linkage == 'dynamic': - self.valid_systems = ['daint:gpu', 'daint:mc', 'dom:gpu', 'dom:mc', - 'arolla:cn', 'tsa:cn', 'eiger:mc'] + self.valid_systems = ['daint:gpu', 'daint:mc', 'dom:gpu', 'dom:mc', + 'arolla:cn', 'tsa:cn', 'eiger:mc'] else: - self.valid_systems = ['daint:gpu', 'daint:mc', 'dom:gpu', 'dom:mc', - 'arolla:cn', 'tsa:cn'] + self.valid_systems = ['daint:gpu', 'daint:mc', 'dom:gpu', 'dom:mc', + 'arolla:cn', 'tsa:cn'] if self.current_system.name in ['daint', 'dom']: self.valid_prog_environs = ['PrgEnv-cray', 'PrgEnv-gnu', 'PrgEnv-intel', 'PrgEnv-pgi'] From 597942c57049c748467e402a59a4240041bf4181 Mon Sep 17 00:00:00 2001 From: Vasileios Karakasis Date: Mon, 15 Feb 2021 18:16:09 +0100 Subject: [PATCH 3/4] Style fixes --- cscs-checks/libraries/io/netcdf_compile_run.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/cscs-checks/libraries/io/netcdf_compile_run.py b/cscs-checks/libraries/io/netcdf_compile_run.py index 60d1e71847..ed5f5d54a3 100644 --- a/cscs-checks/libraries/io/netcdf_compile_run.py +++ b/cscs-checks/libraries/io/netcdf_compile_run.py @@ -22,12 +22,13 @@ def __init__(self, lang, linkage): self.lang = lang self.linkage = linkage self.descr = f'{lang_names[lang]} NetCDF {linkage.capitalize()}' - if linkage == 'dynamic': - self.valid_systems = ['daint:gpu', 'daint:mc', 'dom:gpu', 'dom:mc', - 'arolla:cn', 'tsa:cn', 'eiger:mc'] - else: - self.valid_systems = ['daint:gpu', 'daint:mc', 'dom:gpu', 'dom:mc', - 'arolla:cn', 'tsa:cn'] + self.valid_systems = ['daint:gpu', 'daint:mc', + 'dom:gpu', 'dom:mc', + 'arolla:cn', 'tsa:cn', + 'eiger:mc'] + if linkage == 'static': + self.valid_systems.remove('eiger:mc') + if self.current_system.name in ['daint', 'dom']: self.valid_prog_environs = ['PrgEnv-cray', 'PrgEnv-gnu', 'PrgEnv-intel', 'PrgEnv-pgi'] From 2849ad753ac66b67e9c5c707201d661a8c6b59b6 Mon Sep 17 00:00:00 2001 From: ajocksch Date: Mon, 15 Feb 2021 18:29:28 +0100 Subject: [PATCH 4/4] PrgEnvs --- cscs-checks/libraries/io/netcdf_compile_run.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cscs-checks/libraries/io/netcdf_compile_run.py b/cscs-checks/libraries/io/netcdf_compile_run.py index 60d1e71847..025d33afcc 100644 --- a/cscs-checks/libraries/io/netcdf_compile_run.py +++ b/cscs-checks/libraries/io/netcdf_compile_run.py @@ -36,7 +36,7 @@ def __init__(self, lang, linkage): self.exclusive_access = True self.valid_prog_environs = ['PrgEnv-gnu-nompi', 'PrgEnv-pgi-nompi'] elif self.current_system.name in ['eiger']: - self.valid_prog_environs = ['builtin'] + self.valid_prog_environs = ['PrgEnv-cray', 'PrgEnv-gnu'] self.modules = ['cray-hdf5', 'cray-netcdf'] self.sourcesdir = os.path.join(self.current_system.resourcesdir,