Skip to content

[test] Update configuration and tests for MCH system #1384

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 23 commits into from
Jun 30, 2020
Merged

[test] Update configuration and tests for MCH system #1384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
1ede4ec
Adapt configuration to new software stack setup
kraushm Jun 18, 2020
c65c05b
Add support for -nompi(-nocuda) PEs of MCH
kraushm Jun 18, 2020
e74aead
Add support for -nompi PEs
kraushm Jun 18, 2020
8f62bc4
Modified mch tests
kraushm Jun 18, 2020
102ca8e
Modify IO tests
kraushm Jun 18, 2020
54dbf46
Update helloworld checks
kraushm Jun 18, 2020
1917b4c
Update slurm tests
kraushm Jun 18, 2020
be379e9
Add arolla configuration for MCH-PE20.06
kraushm Jun 18, 2020
b4d2884
Increase max jobs to 4 (login) and 25 (cn/pn) for Tsa/Arolla
kraushm Jun 18, 2020
68589a2
Remove PrgEnv-gnu* from test
kraushm Jun 18, 2020
29f9e41
Remove PrgEnv-pgi-nompi from test
kraushm Jun 18, 2020
e24fdbe
Increase max jobs for Tsa to 50
kraushm Jun 18, 2020
6c45511
Update cscs.py
kraushm Jun 22, 2020
b294140
Update cscs.py
kraushm Jun 22, 2020
dae7d41
Update slurm.py
kraushm Jun 22, 2020
30e983a
Merge branch 'master' into tsa/validation_MCH-PE20.06
kraushm Jun 22, 2020
373ee6c
Align CI config file max_jobs for Tsa
kraushm Jun 23, 2020
0d9f895
Merge branch 'master' into tsa/validation_MCH-PE20.06
kraushm Jun 24, 2020
26e6ab3
Merge branch 'master' of https://github.com/kraushm/reframe into tsa/…
kraushm Jun 25, 2020
7600ce8
Merge branch 'tsa/validation_MCH-PE20.06' of https://github.com/kraus…
kraushm Jun 25, 2020
d29909c
Refactor Helloworld PE distinction
kraushm Jun 25, 2020
9f84b81
Merge Tsa and Arolla environments
kraushm Jun 25, 2020
6b25669
Merge branch 'master' into tsa/validation_MCH-PE20.06
Jun 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion config/cscs-ci.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@
'builtin'
],
'descr': 'Tsa compute nodes',
'max_jobs': 10,
'max_jobs': 20,
'resources': [
{
'name': '_rfm_gpu',
Expand Down
102 changes: 63 additions & 39 deletions config/cscs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -545,10 +545,13 @@
'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',
'max_jobs': 4,
'launcher': 'local'
},
{
Expand All @@ -560,10 +563,13 @@
'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',
'max_jobs': 50,
'launcher': 'srun'
},
{
Expand All @@ -575,8 +581,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': [
Expand All @@ -587,6 +595,7 @@
]
}
],
'max_jobs': 50,
'launcher': 'srun'
}
]
Expand All @@ -606,10 +615,15 @@
'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',
'max_jobs': 4,
'launcher': 'local'
},
{
Expand All @@ -621,10 +635,15 @@
'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',
'max_jobs': 20,
'launcher': 'srun'
},
{
Expand All @@ -636,10 +655,15 @@
'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',
'max_jobs': 20,
'resources': [
{
'name': '_rfm_gpu',
Expand Down Expand Up @@ -781,10 +805,22 @@
'cxx': 'g++',
'ftn': 'gfortran'
},
{
'name': 'PrgEnv-pgi-nompi-nocuda',
'target_systems': [
'arolla', 'tsa'
],
'modules': [
'PrgEnv-pgi/19.9-nocuda'
],
'cc': 'pgcc',
'cxx': 'pgc++',
'ftn': 'pgf90'
},
{
'name': 'PrgEnv-pgi-nompi',
'target_systems': [
'arolla'
'arolla', 'tsa'
],
'modules': [
'PrgEnv-pgi/19.9'
Expand All @@ -796,7 +832,7 @@
{
'name': 'PrgEnv-pgi',
'target_systems': [
'arolla'
'arolla', 'tsa'
],
'modules': [
'PrgEnv-pgi/19.9'
Expand All @@ -806,72 +842,60 @@
'ftn': 'mpifort'
},
{
'name': 'PrgEnv-gnu',
'name': 'PrgEnv-pgi-nocuda',
'target_systems': [
'arolla'
'arolla', 'tsa'
],
'modules': [
'PrgEnv-gnu/19.2'
'PrgEnv-pgi/19.9-nocuda'
],
'cc': 'mpicc',
'cxx': 'mpicxx',
'ftn': 'mpifort'
},
{
'name': 'PrgEnv-gnu-nompi',
'name': 'PrgEnv-gnu',
'target_systems': [
'arolla'
'arolla', 'tsa'
],
'modules': [
'PrgEnv-gnu/19.2'
],
'cc': 'gcc',
'cxx': 'g++',
'ftn': 'gfortran'
},
{
'name': 'PrgEnv-pgi-nompi',
'target_systems': [
'tsa'
],
'modules': [
'PrgEnv-pgi/19.9'
],
'cc': 'pgcc',
'cxx': 'pgc++',
'ftn': 'pgf90'
'cc': 'mpicc',
'cxx': 'mpicxx',
'ftn': 'mpifort'
},
{
'name': 'PrgEnv-pgi',
'name': 'PrgEnv-gnu-nocuda',
'target_systems': [
'tsa'
'arolla', 'tsa'
],
'modules': [
'PrgEnv-pgi/19.9'
'PrgEnv-gnu/19.2-nocuda'
],
'cc': 'mpicc',
'cxx': 'mpicxx',
'ftn': 'mpifort'
},
{
'name': 'PrgEnv-gnu',
'name': 'PrgEnv-gnu-nompi',
'target_systems': [
'tsa'
'arolla', 'tsa'
],
'modules': [
'PrgEnv-gnu/19.2'
],
'cc': 'mpicc',
'cxx': 'mpicxx',
'ftn': 'mpifort'
'cc': 'gcc',
'cxx': 'g++',
'ftn': 'gfortran'
},
{
'name': 'PrgEnv-gnu-nompi',
'name': 'PrgEnv-gnu-nompi-nocuda',
'target_systems': [
'tsa'
'arolla', 'tsa'
],
'modules': [
'PrgEnv-gnu/19.2'
'PrgEnv-gnu/19.2-nocuda'
],
'cc': 'gcc',
'cxx': 'g++',
Expand Down
4 changes: 3 additions & 1 deletion cscs-checks/cuda/cuda_checks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
3 changes: 2 additions & 1 deletion cscs-checks/mch/cuda_stress_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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']
Expand Down
2 changes: 1 addition & 1 deletion cscs-checks/mch/gpu_direct_cuda.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
}
Expand Down
18 changes: 14 additions & 4 deletions cscs-checks/prgenv/helloworld.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

from datetime import datetime

import re
import reframe as rfm
import reframe.utility.sanity as sn

Expand All @@ -27,7 +28,8 @@ 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', 'PrgEnv-pgi',
'PrgEnv-gnu-nocuda', 'PrgEnv-pgi-nocuda']

if self.current_system.name in ['kesch', 'arolla', 'tsa']:
self.exclusive_access = True
Expand Down Expand Up @@ -89,7 +91,8 @@ def num_ranks(match):

@rfm.run_before('compile')
def setflags(self):
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
Expand Down Expand Up @@ -121,6 +124,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 = {
Expand All @@ -140,7 +146,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')
Expand Down Expand Up @@ -173,7 +181,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
Expand Down
1 change: 1 addition & 0 deletions cscs-checks/system/slurm/slurm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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']
Expand Down
2 changes: 1 addition & 1 deletion cscs-checks/tools/io/cdo.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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']
Expand Down
3 changes: 2 additions & 1 deletion cscs-checks/tools/io/nco.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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']
Expand Down