From 1ede4ecc75244b2f5d8790d7373a277a04d8b955 Mon Sep 17 00:00:00 2001 From: Matthias Kraushaar Date: Thu, 18 Jun 2020 07:39:10 +0200 Subject: [PATCH 01/18] Adapt configuration to new software stack setup --- config/cscs.py | 66 +++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 63 insertions(+), 3 deletions(-) diff --git a/config/cscs.py b/config/cscs.py index 2730934dfb..9a1ae5337b 100644 --- a/config/cscs.py +++ b/config/cscs.py @@ -606,8 +606,12 @@ 'environs': [ 'PrgEnv-pgi', 'PrgEnv-pgi-nompi', + 'PrgEnv-pgi-nocuda', + 'PrgEnv-pgi-nompi-nocuda', 'PrgEnv-gnu', - 'PrgEnv-gnu-nompi' + 'PrgEnv-gnu-nompi', + 'PrgEnv-gnu-nocuda', + 'PrgEnv-gnu-nompi-nocuda' ], 'descr': 'Tsa login nodes', 'launcher': 'local' @@ -621,8 +625,12 @@ 'environs': [ 'PrgEnv-pgi', 'PrgEnv-pgi-nompi', + 'PrgEnv-pgi-nocuda', + 'PrgEnv-pgi-nompi-nocuda', 'PrgEnv-gnu', - 'PrgEnv-gnu-nompi' + 'PrgEnv-gnu-nompi', + 'PrgEnv-gnu-nocuda', + 'PrgEnv-gnu-nompi-nocuda' ], 'descr': 'Tsa post-processing nodes', 'launcher': 'srun' @@ -636,8 +644,12 @@ 'environs': [ 'PrgEnv-gnu', 'PrgEnv-gnu-nompi', + 'PrgEnv-gnu-nocuda', + 'PrgEnv-gnu-nompi-nocuda', 'PrgEnv-pgi', - 'PrgEnv-pgi-nompi' + 'PrgEnv-pgi-nompi', + 'PrgEnv-pgi-nocuda', + 'PrgEnv-pgi-nompi-nocuda' ], 'descr': 'Tsa compute nodes', 'resources': [ @@ -853,6 +865,30 @@ 'cxx': 'mpicxx', 'ftn': 'mpifort' }, + { + 'name': 'PrgEnv-pgi-nocuda', + 'target_systems': [ + 'tsa' + ], + 'modules': [ + 'PrgEnv-pgi/19.9-nocuda' + ], + 'cc': 'mpicc', + 'cxx': 'mpicxx', + 'ftn': 'mpifort' + }, + { + 'name': 'PrgEnv-pgi-nompi-nocuda', + 'target_systems': [ + 'tsa' + ], + 'modules': [ + 'PrgEnv-pgi/19.9-nocuda' + ], + 'cc': 'pgcc', + 'cxx': 'pgc++', + 'ftn': 'pgf90' + }, { 'name': 'PrgEnv-gnu', 'target_systems': [ @@ -865,6 +901,18 @@ 'cxx': 'mpicxx', 'ftn': 'mpifort' }, + { + 'name': 'PrgEnv-gnu-nocuda', + 'target_systems': [ + 'tsa' + ], + 'modules': [ + 'PrgEnv-gnu/19.2-nocuda' + ], + 'cc': 'mpicc', + 'cxx': 'mpicxx', + 'ftn': 'mpifort' + }, { 'name': 'PrgEnv-gnu-nompi', 'target_systems': [ @@ -877,6 +925,18 @@ 'cxx': 'g++', 'ftn': 'gfortran' }, + { + 'name': 'PrgEnv-gnu-nompi-nocuda', + 'target_systems': [ + 'tsa' + ], + 'modules': [ + 'PrgEnv-gnu/19.2-nocuda' + ], + 'cc': 'gcc', + 'cxx': 'g++', + 'ftn': 'gfortran' + }, { 'name': 'PrgEnv-cray', 'modules': [ From c65c05bab46c3f0f8ac408f6d019972df3c7c410 Mon Sep 17 00:00:00 2001 From: Matthias Kraushaar Date: Thu, 18 Jun 2020 07:40:04 +0200 Subject: [PATCH 02/18] Add support for -nompi(-nocuda) PEs of MCH --- cscs-checks/prgenv/helloworld.py | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/cscs-checks/prgenv/helloworld.py b/cscs-checks/prgenv/helloworld.py index 51a97b32a1..5eeae4fb06 100644 --- a/cscs-checks/prgenv/helloworld.py +++ b/cscs-checks/prgenv/helloworld.py @@ -27,7 +27,10 @@ def __init__(self, variant, lang, linkage): 'arolla:pn', 'tsa:cn', 'tsa:pn'] self.valid_prog_environs = ['PrgEnv-cray', 'PrgEnv-cray_classic', - 'PrgEnv-gnu', 'PrgEnv-intel', 'PrgEnv-pgi'] + 'PrgEnv-intel', + 'PrgEnv-gnu-nocuda', 'PrgEnv-pgi-nocuda', + 'PrgEnv-gnu', 'PrgEnv-gnu-nompi-nocuda', + 'PrgEnv-pgi', 'PrgEnv-pgi-nompi-nocuda'] if self.current_system.name in ['kesch', 'arolla', 'tsa']: self.exclusive_access = True @@ -89,7 +92,12 @@ def num_ranks(match): @rfm.run_before('compile') def setflags(self): - envname = self.current_environ.name.replace('-nompi', '') + if '-nompi-nocuda' in self.current_environ.name: + envname = self.current_environ.name.replace('-nompi-nocuda', '') + elif '-nocuda' in self.current_environ.name: + envname = self.current_environ.name.replace('-nocuda', '') + else: + envname = self.current_environ.name.replace('-nompi', '') prgenv_flags = self.prgenv_flags[envname] self.build_system.cflags = prgenv_flags self.build_system.cxxflags = prgenv_flags @@ -140,7 +148,9 @@ def __init__(self, lang, linkage): elif (self.current_system.name in ['arolla', 'tsa'] and linkage == 'dynamic'): self.valid_prog_environs += ['PrgEnv-pgi-nompi', - 'PrgEnv-gnu-nompi'] + 'PrgEnv-pgi-nompi-nocuda', + 'PrgEnv-gnu-nompi', + 'PrgEnv-gnu-nompi-nocuda'] @rfm.required_version('>=2.14') @@ -173,7 +183,9 @@ def __init__(self, lang, linkage): elif (self.current_system.name in ['arolla', 'tsa'] and linkage == 'dynamic'): self.valid_prog_environs += ['PrgEnv-pgi-nompi', - 'PrgEnv-gnu-nompi'] + 'PrgEnv-pgi-nompi-nocuda', + 'PrgEnv-gnu-nompi', + 'PrgEnv-gnu-nompi-nocuda'] # On SLURM there is no need to set OMP_NUM_THREADS if one defines # num_cpus_per_task, but adding for completeness and portability From e74aead1b2073546b790ee3d892ec88082f5074e Mon Sep 17 00:00:00 2001 From: Matthias Kraushaar Date: Thu, 18 Jun 2020 07:41:58 +0200 Subject: [PATCH 03/18] Add support for -nompi PEs --- cscs-checks/cuda/cuda_checks.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cscs-checks/cuda/cuda_checks.py b/cscs-checks/cuda/cuda_checks.py index fa41d4f0e9..f0a3fa86f4 100644 --- a/cscs-checks/cuda/cuda_checks.py +++ b/cscs-checks/cuda/cuda_checks.py @@ -17,7 +17,9 @@ def __init__(self): self.valid_prog_environs += ['PrgEnv-cray-nompi', 'PrgEnv-gnu-nompi'] elif self.current_system.name in ['arolla', 'tsa']: - self.valid_prog_environs += ['PrgEnv-gnu-nompi'] + self.valid_prog_environs += ['PrgEnv-pgi', + 'PrgEnv-gnu-nompi', + 'PrgEnv-pgi-nompi'] self.sourcesdir = os.path.join(self.current_system.resourcesdir, 'CUDA', 'essentials') From 8f62bc4fd8196ee2d25d069efc276c86824b8086 Mon Sep 17 00:00:00 2001 From: Matthias Kraushaar Date: Thu, 18 Jun 2020 08:01:01 +0200 Subject: [PATCH 04/18] Modified mch tests --- cscs-checks/mch/automatic_arrays_acc.py | 2 ++ cscs-checks/mch/cuda_stress_test.py | 3 ++- cscs-checks/mch/gpu_direct_cuda.py | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/cscs-checks/mch/automatic_arrays_acc.py b/cscs-checks/mch/automatic_arrays_acc.py index 00aa2e5685..cb2f3d55cd 100644 --- a/cscs-checks/mch/automatic_arrays_acc.py +++ b/cscs-checks/mch/automatic_arrays_acc.py @@ -25,6 +25,8 @@ def __init__(self): 'MV2_USE_CUDA': '1' } elif self.current_system.name in ['arolla', 'tsa']: + self.valid_prog_environs += ['PrgEnv-gnu', 'PrgEnv-gnu-nompi', + 'PrgEnv-pgi-nompi'] self.exclusive_access = True # This tets requires an MPI compiler, although it uses a single task diff --git a/cscs-checks/mch/cuda_stress_test.py b/cscs-checks/mch/cuda_stress_test.py index f2e28e2960..7341c9fbaa 100644 --- a/cscs-checks/mch/cuda_stress_test.py +++ b/cscs-checks/mch/cuda_stress_test.py @@ -19,7 +19,8 @@ def __init__(self): self.modules = ['cudatoolkit/8.0.61'] elif self.current_system.name in ['arolla', 'tsa']: self.exclusive_access = True - self.valid_prog_environs = ['PrgEnv-gnu-nompi'] + self.valid_prog_environs = ['PrgEnv-gnu', 'PrgEnv-gnu-nompi', + 'PrgEnv-pgi', 'PrgEnv-pgi-nompi'] self.modules = ['cuda/10.1.243'] else: self.valid_prog_environs = ['PrgEnv-gnu'] diff --git a/cscs-checks/mch/gpu_direct_cuda.py b/cscs-checks/mch/gpu_direct_cuda.py index e3d4c9c9d1..7c245dca05 100644 --- a/cscs-checks/mch/gpu_direct_cuda.py +++ b/cscs-checks/mch/gpu_direct_cuda.py @@ -33,7 +33,7 @@ def __init__(self): self.build_system.cxxflags = ['-ccbin', 'mpicxx', '-arch=sm_37'] elif self.current_system.name in ['arolla', 'tsa']: self.exclusive_access = True - self.valid_prog_environs = ['PrgEnv-gnu'] + self.valid_prog_environs = ['PrgEnv-gnu', 'PrgEnv-pgi'] self.variables = { 'G2G': '1', } From 102ca8ee48a2493605c2ef2388f5df215956775b Mon Sep 17 00:00:00 2001 From: Matthias Kraushaar Date: Thu, 18 Jun 2020 08:12:01 +0200 Subject: [PATCH 05/18] Modify IO tests --- cscs-checks/tools/io/cdo.py | 2 +- cscs-checks/tools/io/nco.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/cscs-checks/tools/io/cdo.py b/cscs-checks/tools/io/cdo.py index 83b7852a60..9e82f66cf5 100644 --- a/cscs-checks/tools/io/cdo.py +++ b/cscs-checks/tools/io/cdo.py @@ -41,7 +41,7 @@ def __init__(self): self.modules = ['cdo'] elif self.current_system.name in ['arolla', 'tsa']: self.exclusive_access = True - self.valid_prog_environs = ['PrgEnv-gnu-nompi'] + self.valid_prog_environs = ['PrgEnv-gnu', 'PrgEnv-gnu-nompi'] self.modules = ['cdo', 'netcdf-fortran'] else: self.modules = ['CDO'] diff --git a/cscs-checks/tools/io/nco.py b/cscs-checks/tools/io/nco.py index abe9b64261..afac3a0fee 100644 --- a/cscs-checks/tools/io/nco.py +++ b/cscs-checks/tools/io/nco.py @@ -30,7 +30,8 @@ def __init__(self): 'kesch:pn', 'arolla:pn', 'tsa:pn'] if self.current_system.name in ['arolla', 'kesch', 'tsa']: self.exclusive_access = True - self.valid_prog_environs = ['PrgEnv-gnu-nompi'] + self.valid_prog_environs = ['PrgEnv-gnu-nompi', + 'PrgEnv-gnu-nompi-nocuda'] self.modules = ['nco'] else: self.modules = ['NCO'] From 54dbf46fbb24fde5d09040cd51b6d9c4157766f8 Mon Sep 17 00:00:00 2001 From: Matthias Kraushaar Date: Thu, 18 Jun 2020 12:52:18 +0200 Subject: [PATCH 06/18] Update helloworld checks --- cscs-checks/prgenv/helloworld.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/cscs-checks/prgenv/helloworld.py b/cscs-checks/prgenv/helloworld.py index 5eeae4fb06..eaaf20ac20 100644 --- a/cscs-checks/prgenv/helloworld.py +++ b/cscs-checks/prgenv/helloworld.py @@ -27,10 +27,8 @@ def __init__(self, variant, lang, linkage): 'arolla:pn', 'tsa:cn', 'tsa:pn'] self.valid_prog_environs = ['PrgEnv-cray', 'PrgEnv-cray_classic', - 'PrgEnv-intel', - 'PrgEnv-gnu-nocuda', 'PrgEnv-pgi-nocuda', - 'PrgEnv-gnu', 'PrgEnv-gnu-nompi-nocuda', - 'PrgEnv-pgi', 'PrgEnv-pgi-nompi-nocuda'] + 'PrgEnv-intel', 'PrgEnv-gnu', 'PrgEnv-pgi', + 'PrgEnv-gnu-nocuda', 'PrgEnv-pgi-nocuda'] if self.current_system.name in ['kesch', 'arolla', 'tsa']: self.exclusive_access = True @@ -129,6 +127,9 @@ class HelloWorldTestSerial(HelloWorldBaseTest): def __init__(self, lang, linkage): super().__init__('serial', lang, linkage) self.valid_systems += ['kesch:pn', 'arolla:pn', 'tsa:pn'] + self.valid_prog_environs += ['PrgEnv-gnu-nompi', 'PrgEnv-pgi-nompi', + 'PrgEnv-gnu-nompi-nocuda', + 'PrgEnf-pgi-nompi-nocuda'] self.sourcepath += '_serial.' + lang self.descr += ' Serial ' + linkage.capitalize() self.prgenv_flags = { From 1917b4cfb5d6408e18311c4558413cff8c14bfae Mon Sep 17 00:00:00 2001 From: Matthias Kraushaar Date: Thu, 18 Jun 2020 12:56:39 +0200 Subject: [PATCH 07/18] Update slurm tests --- cscs-checks/system/slurm/slurm.py | 1 + 1 file changed, 1 insertion(+) diff --git a/cscs-checks/system/slurm/slurm.py b/cscs-checks/system/slurm/slurm.py index 39321e7b3b..b223a9e91c 100644 --- a/cscs-checks/system/slurm/slurm.py +++ b/cscs-checks/system/slurm/slurm.py @@ -21,6 +21,7 @@ def __init__(self): 'production', 'single-node'} self.num_tasks_per_node = 1 if self.current_system.name in ['arolla', 'kesch', 'tsa']: + self.valid_prog_environs = [ 'PrgEnv-gnu', 'PrgEnv-pgi'] self.exclusive_access = True self.maintainers = ['RS', 'VH'] From be379e9ce2bbe209fc2653c197a91c18b8caff86 Mon Sep 17 00:00:00 2001 From: Matthias Kraushaar Date: Thu, 18 Jun 2020 13:07:02 +0200 Subject: [PATCH 08/18] Add arolla configuration for MCH-PE20.06 --- config/cscs.py | 60 +++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 57 insertions(+), 3 deletions(-) diff --git a/config/cscs.py b/config/cscs.py index 9a1ae5337b..a7245da02b 100644 --- a/config/cscs.py +++ b/config/cscs.py @@ -545,8 +545,10 @@ 'environs': [ 'PrgEnv-pgi', 'PrgEnv-pgi-nompi', + 'PrgEnv-pgi-nompi-nocuda', 'PrgEnv-gnu', - 'PrgEnv-gnu-nompi' + 'PrgEnv-gnu-nompi', + 'PrgEnv-gnu-nompi-nocuda' ], 'descr': 'Arolla login nodes', 'launcher': 'local' @@ -560,8 +562,10 @@ 'environs': [ 'PrgEnv-pgi', 'PrgEnv-pgi-nompi', + 'PrgEnv-pgi-nompi-nocuda', 'PrgEnv-gnu', - 'PrgEnv-gnu-nompi' + 'PrgEnv-gnu-nompi', + 'PrgEnv-gnu-nompi-nocuda' ], 'descr': 'Arolla post-processing nodes', 'launcher': 'srun' @@ -575,8 +579,10 @@ 'environs': [ 'PrgEnv-gnu', 'PrgEnv-gnu-nompi', + 'PrgEnv-gnu-nompi-nocuda', 'PrgEnv-pgi', - 'PrgEnv-pgi-nompi' + 'PrgEnv-pgi-nompi', + 'PrgEnv-pgi-nompi-nocuda' ], 'descr': 'Arolla compute nodes', 'resources': [ @@ -793,6 +799,18 @@ 'cxx': 'g++', 'ftn': 'gfortran' }, + { + 'name': 'PrgEnv-pgi-nompi-nocuda', + 'target_systems': [ + 'arolla' + ], + 'modules': [ + 'PrgEnv-pgi/19.9-nocuda' + ], + 'cc': 'pgcc', + 'cxx': 'pgc++', + 'ftn': 'pgf90' + }, { 'name': 'PrgEnv-pgi-nompi', 'target_systems': [ @@ -817,6 +835,18 @@ 'cxx': 'mpicxx', 'ftn': 'mpifort' }, + { + 'name': 'PrgEnv-pgi-nocuda', + 'target_systems': [ + 'arolla' + ], + 'modules': [ + 'PrgEnv-pgi/19.9-nocuda' + ], + 'cc': 'mpicc', + 'cxx': 'mpicxx', + 'ftn': 'mpifort' + }, { 'name': 'PrgEnv-gnu', 'target_systems': [ @@ -829,6 +859,18 @@ 'cxx': 'mpicxx', 'ftn': 'mpifort' }, + { + 'name': 'PrgEnv-gnu-nocuda', + 'target_systems': [ + 'arolla' + ], + 'modules': [ + 'PrgEnv-gnu/19.2-nocuda' + ], + 'cc': 'mpicc', + 'cxx': 'mpicxx', + 'ftn': 'mpifort' + }, { 'name': 'PrgEnv-gnu-nompi', 'target_systems': [ @@ -841,6 +883,18 @@ 'cxx': 'g++', 'ftn': 'gfortran' }, + { + 'name': 'PrgEnv-gnu-nompi-nocuda', + 'target_systems': [ + 'arolla' + ], + 'modules': [ + 'PrgEnv-gnu/19.2-nocuda' + ], + 'cc': 'gcc', + 'cxx': 'g++', + 'ftn': 'gfortran' + }, { 'name': 'PrgEnv-pgi-nompi', 'target_systems': [ From b4d288470f454f159301a138d7762b4ac1093a13 Mon Sep 17 00:00:00 2001 From: Matthias Kraushaar Date: Thu, 18 Jun 2020 21:32:03 +0200 Subject: [PATCH 09/18] Increase max jobs to 4 (login) and 25 (cn/pn) for Tsa/Arolla --- config/cscs.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/config/cscs.py b/config/cscs.py index a7245da02b..cb69bee751 100644 --- a/config/cscs.py +++ b/config/cscs.py @@ -551,6 +551,7 @@ 'PrgEnv-gnu-nompi-nocuda' ], 'descr': 'Arolla login nodes', + 'max_jobs': 4, 'launcher': 'local' }, { @@ -568,6 +569,7 @@ 'PrgEnv-gnu-nompi-nocuda' ], 'descr': 'Arolla post-processing nodes', + 'max_jobs': 25, 'launcher': 'srun' }, { @@ -593,6 +595,7 @@ ] } ], + 'max_jobs': 25, 'launcher': 'srun' } ] @@ -620,6 +623,7 @@ 'PrgEnv-gnu-nompi-nocuda' ], 'descr': 'Tsa login nodes', + 'max_jobs': 4, 'launcher': 'local' }, { @@ -639,6 +643,7 @@ 'PrgEnv-gnu-nompi-nocuda' ], 'descr': 'Tsa post-processing nodes', + 'max_jobs': 25, 'launcher': 'srun' }, { @@ -658,6 +663,7 @@ 'PrgEnv-pgi-nompi-nocuda' ], 'descr': 'Tsa compute nodes', + 'max_jobs': 25, 'resources': [ { 'name': '_rfm_gpu', From 68589a2f8075cf8424be956b2fe2d731b22e1463 Mon Sep 17 00:00:00 2001 From: Matthias Kraushaar Date: Thu, 18 Jun 2020 21:33:14 +0200 Subject: [PATCH 10/18] Remove PrgEnv-gnu* from test --- cscs-checks/mch/automatic_arrays_acc.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cscs-checks/mch/automatic_arrays_acc.py b/cscs-checks/mch/automatic_arrays_acc.py index cb2f3d55cd..1779eec216 100644 --- a/cscs-checks/mch/automatic_arrays_acc.py +++ b/cscs-checks/mch/automatic_arrays_acc.py @@ -25,8 +25,7 @@ def __init__(self): 'MV2_USE_CUDA': '1' } elif self.current_system.name in ['arolla', 'tsa']: - self.valid_prog_environs += ['PrgEnv-gnu', 'PrgEnv-gnu-nompi', - 'PrgEnv-pgi-nompi'] + self.valid_prog_environs += ['PrgEnv-pgi-nompi'] self.exclusive_access = True # This tets requires an MPI compiler, although it uses a single task From 29f9e412ac3eebc5fb0e6ba1d5526d73d2c7cbde Mon Sep 17 00:00:00 2001 From: Matthias Kraushaar Date: Thu, 18 Jun 2020 21:55:09 +0200 Subject: [PATCH 11/18] Remove PrgEnv-pgi-nompi from test --- cscs-checks/mch/automatic_arrays_acc.py | 1 - 1 file changed, 1 deletion(-) diff --git a/cscs-checks/mch/automatic_arrays_acc.py b/cscs-checks/mch/automatic_arrays_acc.py index 1779eec216..00aa2e5685 100644 --- a/cscs-checks/mch/automatic_arrays_acc.py +++ b/cscs-checks/mch/automatic_arrays_acc.py @@ -25,7 +25,6 @@ def __init__(self): 'MV2_USE_CUDA': '1' } elif self.current_system.name in ['arolla', 'tsa']: - self.valid_prog_environs += ['PrgEnv-pgi-nompi'] self.exclusive_access = True # This tets requires an MPI compiler, although it uses a single task From e24fdbef32887d094358c32b1d275c0daf9b49a1 Mon Sep 17 00:00:00 2001 From: Matthias Kraushaar Date: Thu, 18 Jun 2020 22:24:08 +0200 Subject: [PATCH 12/18] Increase max jobs for Tsa to 50 --- config/cscs.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/cscs.py b/config/cscs.py index cb69bee751..87f563f0d7 100644 --- a/config/cscs.py +++ b/config/cscs.py @@ -643,7 +643,7 @@ 'PrgEnv-gnu-nompi-nocuda' ], 'descr': 'Tsa post-processing nodes', - 'max_jobs': 25, + 'max_jobs': 50, 'launcher': 'srun' }, { @@ -663,7 +663,7 @@ 'PrgEnv-pgi-nompi-nocuda' ], 'descr': 'Tsa compute nodes', - 'max_jobs': 25, + 'max_jobs': 50, 'resources': [ { 'name': '_rfm_gpu', From 6c455116235c687d6ac201e27af1c5db7def9206 Mon Sep 17 00:00:00 2001 From: kraushm Date: Mon, 22 Jun 2020 10:21:45 +0200 Subject: [PATCH 13/18] Update cscs.py Reduce max_jobs to 20 for Tsa. --- config/cscs.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/cscs.py b/config/cscs.py index 87f563f0d7..2a3cf8d579 100644 --- a/config/cscs.py +++ b/config/cscs.py @@ -643,7 +643,7 @@ 'PrgEnv-gnu-nompi-nocuda' ], 'descr': 'Tsa post-processing nodes', - 'max_jobs': 50, + 'max_jobs': 20, 'launcher': 'srun' }, { @@ -663,7 +663,7 @@ 'PrgEnv-pgi-nompi-nocuda' ], 'descr': 'Tsa compute nodes', - 'max_jobs': 50, + 'max_jobs': 20, 'resources': [ { 'name': '_rfm_gpu', From b294140bcbbe7e5696ee1f8acef2ee04c1cae588 Mon Sep 17 00:00:00 2001 From: kraushm Date: Mon, 22 Jun 2020 14:54:14 +0200 Subject: [PATCH 14/18] Update cscs.py Increasing Arolla max_jobs to 50 --- config/cscs.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/cscs.py b/config/cscs.py index 2a3cf8d579..9adc1197fd 100644 --- a/config/cscs.py +++ b/config/cscs.py @@ -569,7 +569,7 @@ 'PrgEnv-gnu-nompi-nocuda' ], 'descr': 'Arolla post-processing nodes', - 'max_jobs': 25, + 'max_jobs': 50, 'launcher': 'srun' }, { @@ -595,7 +595,7 @@ ] } ], - 'max_jobs': 25, + 'max_jobs': 50, 'launcher': 'srun' } ] From dae7d41ae6f30713a81ad4f98970d450a03d701e Mon Sep 17 00:00:00 2001 From: kraushm Date: Mon, 22 Jun 2020 15:05:19 +0200 Subject: [PATCH 15/18] Update slurm.py Correct for pep8speaks message --- cscs-checks/system/slurm/slurm.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cscs-checks/system/slurm/slurm.py b/cscs-checks/system/slurm/slurm.py index b223a9e91c..b4597aa425 100644 --- a/cscs-checks/system/slurm/slurm.py +++ b/cscs-checks/system/slurm/slurm.py @@ -21,7 +21,7 @@ def __init__(self): 'production', 'single-node'} self.num_tasks_per_node = 1 if self.current_system.name in ['arolla', 'kesch', 'tsa']: - self.valid_prog_environs = [ 'PrgEnv-gnu', 'PrgEnv-pgi'] + self.valid_prog_environs = ['PrgEnv-gnu', 'PrgEnv-pgi'] self.exclusive_access = True self.maintainers = ['RS', 'VH'] From 373ee6c7cd0ca4d32edf365d5a0c3d72ef161a6f Mon Sep 17 00:00:00 2001 From: Matthias Kraushaar Date: Tue, 23 Jun 2020 10:14:45 +0200 Subject: [PATCH 16/18] Align CI config file max_jobs for Tsa --- config/cscs-ci.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/cscs-ci.py b/config/cscs-ci.py index 8e060eed6e..31e28f90a9 100644 --- a/config/cscs-ci.py +++ b/config/cscs-ci.py @@ -162,7 +162,7 @@ 'builtin' ], 'descr': 'Tsa compute nodes', - 'max_jobs': 10, + 'max_jobs': 20, 'resources': [ { 'name': '_rfm_gpu', From d29909cfde7cb220edf0ffdccdfb370f09a72de7 Mon Sep 17 00:00:00 2001 From: Matthias Kraushaar Date: Thu, 25 Jun 2020 12:55:56 +0200 Subject: [PATCH 17/18] Refactor Helloworld PE distinction --- cscs-checks/prgenv/helloworld.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/cscs-checks/prgenv/helloworld.py b/cscs-checks/prgenv/helloworld.py index eaaf20ac20..b881a527fe 100644 --- a/cscs-checks/prgenv/helloworld.py +++ b/cscs-checks/prgenv/helloworld.py @@ -5,6 +5,7 @@ from datetime import datetime +import re import reframe as rfm import reframe.utility.sanity as sn @@ -90,12 +91,8 @@ def num_ranks(match): @rfm.run_before('compile') def setflags(self): - if '-nompi-nocuda' in self.current_environ.name: - envname = self.current_environ.name.replace('-nompi-nocuda', '') - elif '-nocuda' in self.current_environ.name: - envname = self.current_environ.name.replace('-nocuda', '') - else: - envname = self.current_environ.name.replace('-nompi', '') + envname = re.sub(r'(PrgEnv-\w+).*', lambda m: m.group(1), + self.current_environ.name) prgenv_flags = self.prgenv_flags[envname] self.build_system.cflags = prgenv_flags self.build_system.cxxflags = prgenv_flags From 9f84b812dcd04ebeaab7b17644f72c9df5ac0e24 Mon Sep 17 00:00:00 2001 From: Matthias Kraushaar Date: Thu, 25 Jun 2020 14:34:46 +0200 Subject: [PATCH 18/18] Merge Tsa and Arolla environments --- config/cscs.py | 112 ++++--------------------------------------------- 1 file changed, 8 insertions(+), 104 deletions(-) diff --git a/config/cscs.py b/config/cscs.py index 6755b94005..7e82d6f5e2 100644 --- a/config/cscs.py +++ b/config/cscs.py @@ -808,7 +808,7 @@ { 'name': 'PrgEnv-pgi-nompi-nocuda', 'target_systems': [ - 'arolla' + 'arolla', 'tsa' ], 'modules': [ 'PrgEnv-pgi/19.9-nocuda' @@ -820,7 +820,7 @@ { 'name': 'PrgEnv-pgi-nompi', 'target_systems': [ - 'arolla' + 'arolla', 'tsa' ], 'modules': [ 'PrgEnv-pgi/19.9' @@ -832,7 +832,7 @@ { 'name': 'PrgEnv-pgi', 'target_systems': [ - 'arolla' + 'arolla', 'tsa' ], 'modules': [ 'PrgEnv-pgi/19.9' @@ -844,7 +844,7 @@ { 'name': 'PrgEnv-pgi-nocuda', 'target_systems': [ - 'arolla' + 'arolla', 'tsa' ], 'modules': [ 'PrgEnv-pgi/19.9-nocuda' @@ -856,7 +856,7 @@ { 'name': 'PrgEnv-gnu', 'target_systems': [ - 'arolla' + 'arolla', 'tsa' ], 'modules': [ 'PrgEnv-gnu/19.2' @@ -868,7 +868,7 @@ { 'name': 'PrgEnv-gnu-nocuda', 'target_systems': [ - 'arolla' + 'arolla', 'tsa' ], 'modules': [ 'PrgEnv-gnu/19.2-nocuda' @@ -880,7 +880,7 @@ { 'name': 'PrgEnv-gnu-nompi', 'target_systems': [ - 'arolla' + 'arolla', 'tsa' ], 'modules': [ 'PrgEnv-gnu/19.2' @@ -892,103 +892,7 @@ { 'name': 'PrgEnv-gnu-nompi-nocuda', 'target_systems': [ - 'arolla' - ], - 'modules': [ - 'PrgEnv-gnu/19.2-nocuda' - ], - 'cc': 'gcc', - 'cxx': 'g++', - 'ftn': 'gfortran' - }, - { - 'name': 'PrgEnv-pgi-nompi', - 'target_systems': [ - 'tsa' - ], - 'modules': [ - 'PrgEnv-pgi/19.9' - ], - 'cc': 'pgcc', - 'cxx': 'pgc++', - 'ftn': 'pgf90' - }, - { - 'name': 'PrgEnv-pgi', - 'target_systems': [ - 'tsa' - ], - 'modules': [ - 'PrgEnv-pgi/19.9' - ], - 'cc': 'mpicc', - 'cxx': 'mpicxx', - 'ftn': 'mpifort' - }, - { - 'name': 'PrgEnv-pgi-nocuda', - 'target_systems': [ - 'tsa' - ], - 'modules': [ - 'PrgEnv-pgi/19.9-nocuda' - ], - 'cc': 'mpicc', - 'cxx': 'mpicxx', - 'ftn': 'mpifort' - }, - { - 'name': 'PrgEnv-pgi-nompi-nocuda', - 'target_systems': [ - 'tsa' - ], - 'modules': [ - 'PrgEnv-pgi/19.9-nocuda' - ], - 'cc': 'pgcc', - 'cxx': 'pgc++', - 'ftn': 'pgf90' - }, - { - 'name': 'PrgEnv-gnu', - 'target_systems': [ - 'tsa' - ], - 'modules': [ - 'PrgEnv-gnu/19.2' - ], - 'cc': 'mpicc', - 'cxx': 'mpicxx', - 'ftn': 'mpifort' - }, - { - 'name': 'PrgEnv-gnu-nocuda', - 'target_systems': [ - 'tsa' - ], - 'modules': [ - 'PrgEnv-gnu/19.2-nocuda' - ], - 'cc': 'mpicc', - 'cxx': 'mpicxx', - 'ftn': 'mpifort' - }, - { - 'name': 'PrgEnv-gnu-nompi', - 'target_systems': [ - 'tsa' - ], - 'modules': [ - 'PrgEnv-gnu/19.2' - ], - 'cc': 'gcc', - 'cxx': 'g++', - 'ftn': 'gfortran' - }, - { - 'name': 'PrgEnv-gnu-nompi-nocuda', - 'target_systems': [ - 'tsa' + 'arolla', 'tsa' ], 'modules': [ 'PrgEnv-gnu/19.2-nocuda'