Skip to content

[test] Remove retired systems Kesch and Tiger #1588

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 10 commits into from
Nov 19, 2020
Merged

[test] Remove retired systems Kesch and Tiger #1588

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
52167f0
Remove retired system KESCH
kraushm Nov 9, 2020
bbde3c0
Merge branch 'master' into fix/remove_kesch
kraushm Nov 13, 2020
83c2919
Remove tiger system from tests
kraushm Nov 16, 2020
028d3d6
Fix comment of pep8speaks
kraushm Nov 16, 2020
c8db986
Merge branch 'master' into fix/remove_kesch
kraushm Nov 16, 2020
100dd4c
Fix missing system name
kraushm Nov 18, 2020
41f8423
Add CRAY_CUDA_MPS to Daint check
kraushm Nov 18, 2020
46ca10b
Add PGI workaround for Daint/Dom tests
kraushm Nov 18, 2020
c7e46f5
Fix pep8speaks comments
kraushm Nov 18, 2020
0d22e14
Merge branch 'master' into fix/remove_kesch
kraushm Nov 19, 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
31 changes: 0 additions & 31 deletions config/cscs-ci.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,37 +119,6 @@
}
]
},
{
'name': 'kesch',
'descr': 'Kesch MCH',
'hostnames': [
r'keschln-\d+'
],
'modules_system': 'tmod',
'resourcesdir': '/apps/common/UES/reframe/resources',
'partitions': [
{
'name': 'cn',
'scheduler': 'slurm',
'access': [
'--partition=cn-regression'
],
'environs': [
'builtin'
],
'descr': 'Kesch compute nodes',
'resources': [
{
'name': '_rfm_gpu',
'options': [
'--gres=gpu:{num_gpus_per_node}'
]
}
],
'launcher': 'srun'
}
]
},
{
'name': 'tsa',
'descr': 'Tsa MCH',
Expand Down
146 changes: 0 additions & 146 deletions config/cscs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -481,73 +481,6 @@
}
]
},
{
'name': 'kesch',
'descr': 'Kesch MCH',
'hostnames': [
r'keschln-\d+'
],
'modules_system': 'tmod',
'resourcesdir': '/apps/common/UES/reframe/resources',
'partitions': [
{
'name': 'login',
'scheduler': 'local',
'environs': [
'PrgEnv-cray',
'PrgEnv-cray-nompi',
'PrgEnv-pgi',
'PrgEnv-pgi-nompi',
'PrgEnv-gnu',
'PrgEnv-gnu-nompi'
],
'descr': 'Kesch login nodes',
'launcher': 'local'
},
{
'name': 'pn',
'scheduler': 'slurm',
'access': [
'--partition=pn-regression'
],
'environs': [
'PrgEnv-cray',
'PrgEnv-cray-nompi',
'PrgEnv-pgi',
'PrgEnv-pgi-nompi',
'PrgEnv-gnu',
'PrgEnv-gnu-nompi'
],
'descr': 'Kesch post-processing nodes',
'launcher': 'srun'
},
{
'name': 'cn',
'scheduler': 'slurm',
'access': [
'--partition=cn-regression'
],
'environs': [
'PrgEnv-cray',
'PrgEnv-cray-nompi',
'PrgEnv-pgi',
'PrgEnv-pgi-nompi',
'PrgEnv-gnu',
'PrgEnv-gnu-nompi'
],
'descr': 'Kesch compute nodes',
'resources': [
{
'name': '_rfm_gpu',
'options': [
'--gres=gpu:{num_gpus_per_node}'
]
}
],
'launcher': 'srun'
}
]
},
{
'name': 'arolla',
'descr': 'Arolla MCH',
Expand Down Expand Up @@ -744,85 +677,6 @@
'cxx': 'g++',
'ftn': 'gfortran'
},
{
'name': 'PrgEnv-pgi-nompi',
'target_systems': [
'kesch'
],
'modules': [
'PE/17.06',
'PrgEnv-pgi/18.5'
],
'cc': 'pgcc',
'cxx': 'pgc++',
'ftn': 'pgf90'
},
{
'name': 'PrgEnv-pgi',
'target_systems': [
'kesch'
],
'modules': [
'PE/17.06',
'pgi/18.5-gcc-5.4.0-2.26',
'openmpi/4.0.1-pgi-18.5-gcc-5.4.0-2.26-cuda-8.0'
],
'cc': 'mpicc',
'cxx': 'mpicxx',
'ftn': 'mpifort'
},
{
'name': 'PrgEnv-cray',
'target_systems': [
'kesch'
],
'modules': [
'PE/17.06',
'PrgEnv-CrayCCE/17.06'
]
},
{
'name': 'PrgEnv-cray-nompi',
'target_systems': [
'kesch'
],
'modules': [
'PE/17.06',
'PrgEnv-cray'
]
},
{
'name': 'PrgEnv-gnu',
'target_systems': [
'kesch'
],
'modules': [
'PE/17.06',
'gmvapich2/17.02_cuda_8.0_gdr'
],
'variables': [
[
'LD_PRELOAD',
'$(pkg-config --variable=libdir mvapich2-gdr)/libmpi.so'
]
],
'cc': 'mpicc',
'cxx': 'mpicxx',
'ftn': 'mpif90'
},
{
'name': 'PrgEnv-gnu-nompi',
'target_systems': [
'kesch'
],
'modules': [
'PE/17.06',
'PrgEnv-gnu'
],
'cc': 'gcc',
'cxx': 'g++',
'ftn': 'gfortran'
},
{
'name': 'PrgEnv-pgi-nompi-nocuda',
'target_systems': [
Expand Down
2 changes: 1 addition & 1 deletion cscs-checks/apps/gromacs/gromacs_check.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ def __init__(self, output_file):
class GromacsGPUCheck(GromacsBaseCheck):
def __init__(self, scale, variant):
super().__init__('md.log')
self.valid_systems = ['daint:gpu', 'tiger:gpu']
self.valid_systems = ['daint:gpu']
self.descr = 'GROMACS GPU check'
self.executable_opts = ['mdrun', '-dlb yes', '-ntomp 1', '-npme 0',
'-s herflat.tpr']
Expand Down
32 changes: 7 additions & 25 deletions cscs-checks/compile/haswell_fma_check.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,10 @@
class HaswellFmaCheck(rfm.CompileOnlyRegressionTest):
def __init__(self):
self.descr = 'check for avx2 instructions'
self.valid_systems = ['dom:login', 'daint:login', 'kesch:login']
if self.current_system.name == 'kesch':
self.valid_prog_environs = [
'PrgEnv-cray', 'PrgEnv-gnu', 'PrgEnv-cray-nompi',
'PrgEnv-gnu-nompi'
]
else:
self.valid_prog_environs = [
'PrgEnv-cray', 'PrgEnv-gnu',
'PrgEnv-intel', 'PrgEnv-pgi'
]
self.modules = ['craype-haswell']
self.valid_systems = ['dom:login', 'daint:login']
self.valid_prog_environs = ['PrgEnv-cray', 'PrgEnv-gnu',
'PrgEnv-intel', 'PrgEnv-pgi']
self.modules = ['craype-haswell']

self.sourcesdir = 'src/haswell_fma'
self.build_system = 'Make'
Expand All @@ -42,16 +34,6 @@ def __init__(self):

@rfm.run_before('compile')
def setflags(self):
if self.current_system.name == 'kesch':
if self.current_environ.name.startswith('PrgEnv-cray'):
# Ignore CPATH warning
self.build_system.cflags += ['-h nomessage=1254']
self.build_system.cxxflags += ['-h nomessage=1254']
else:
self.build_system.cflags += ['-march=native']
self.build_system.cxxflags += ['-march=native']
self.build_system.fflags += ['-march=native']
else:
if self.current_environ.name == 'PrgEnv-cray':
self.build_system.cflags = ['-Ofast', '-S']
self.build_system.cxxflags = ['-Ofast', '-S']
if self.current_environ.name == 'PrgEnv-cray':
self.build_system.cflags = ['-Ofast', '-S']
self.build_system.cxxflags = ['-Ofast', '-S']
2 changes: 0 additions & 2 deletions cscs-checks/compile/libsci_acc_symlink.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,9 @@
class LibSciAccSymLinkTest(rfm.RunOnlyRegressionTest):
def __init__(self, lib_name):
self.descr = 'LibSciAcc symlink check of %s' % lib_name

self.valid_systems = [
'daint:login', 'daint:gpu',
'dom:login', 'dom:gpu',
'tiger:login', 'tiger:gpu'
]
regex = (r'libsci_acc_(?P<prgenv>[A-Za-z]+)_((?P<cver>[A-Za-z0-9]+)_)'
r'?(?P<version>\S+)')
Expand Down
3 changes: 1 addition & 2 deletions cscs-checks/compile/libsci_resolve.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@ def __init__(self):
self.sourcesdir = 'src/libsci_resolve'
self.sourcepath = 'libsci_resolve.f90'
self.valid_systems = ['daint:login', 'daint:gpu',
'dom:login', 'dom:gpu',
'tiger:login', 'tiger:gpu']
'dom:login', 'dom:gpu']
self.modules = ['craype-haswell']
self.maintainers = ['AJ', 'LM']
self.tags = {'production', 'craype'}
Expand Down
3 changes: 1 addition & 2 deletions cscs-checks/libraries/io/hdf5_compile_run.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@ def __init__(self, lang, linkage):
self.linkage = linkage
self.descr = lang_names[lang] + ' HDF5 ' + linkage.capitalize()
self.sourcepath = f'h5ex_d_chunk.{lang}'
self.valid_systems = ['daint:gpu', 'daint:mc', 'dom:gpu', 'dom:mc',
'tiger:gpu']
self.valid_systems = ['daint:gpu', 'daint:mc', 'dom:gpu', 'dom:mc']
self.valid_prog_environs = ['PrgEnv-cray', 'PrgEnv-gnu',
'PrgEnv-intel', 'PrgEnv-pgi']
self.modules = ['cray-hdf5']
Expand Down
52 changes: 3 additions & 49 deletions cscs-checks/libraries/io/netcdf_compile_run.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,20 +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', 'kesch:cn', 'tiger:gpu',
self.valid_systems = ['daint:gpu', 'daint:mc', 'dom:gpu', 'dom:mc',
'arolla:cn', 'tsa:cn']
if self.current_system.name in ['daint', 'dom', 'tiger']:
if self.current_system.name in ['daint', 'dom']:
self.valid_prog_environs = ['PrgEnv-cray', 'PrgEnv-gnu',
'PrgEnv-intel', 'PrgEnv-pgi']
self.modules = ['cray-netcdf']
elif self.current_system.name == 'kesch':
self.exclusive_access = True
if linkage == 'dynamic':
self.valid_prog_environs = ['PrgEnv-pgi-nompi']

if lang != 'f90':
self.valid_prog_environs += ['PrgEnv-cray-nompi']
elif self.current_system.name in ['arolla', 'tsa']:
self.exclusive_access = True
self.valid_prog_environs = ['PrgEnv-gnu-nompi', 'PrgEnv-pgi-nompi']
Expand All @@ -52,45 +44,7 @@ def __init__(self, lang, linkage):

@rfm.run_before('compile')
def setflags(self):
if self.current_system.name == 'kesch':
if self.current_environ.name == 'PrgEnv-cray-nompi':
self.modules = ['netcdf/4.4.1.1-gmvolf-17.02',
'netcdf-c++/4.3.0-gmvolf-17.02',
'netcdf-fortran/4.4.4-gmvolf-17.02']
self.build_system.cppflags = [
'-I$EBROOTNETCDF/include',
'-I$EBROOTNETCDFMINCPLUSPLUS/include',
'-I$EBROOTNETCDFMINFORTRAN/include'
]
self.build_system.ldflags = [
'-L$EBROOTNETCDF/lib',
'-L$EBROOTNETCDFMINCPLUSPLUS/lib',
'-L$EBROOTNETCDFMINFORTRAN/lib',
'-L$EBROOTNETCDF/lib64',
'-L$EBROOTNETCDFMINCPLUSPLUS/lib64',
'-L$EBROOTNETCDFMINFORTRAN/lib64',
'-lnetcdf', '-lnetcdf_c++4', '-lnetcdff'
]
elif self.current_environ.name == 'PrgEnv-pgi-nompi':
self.modules = ['netcdf/4.6.1-pgi-18.5-gcc-5.4.0-2.26',
'netcdf-c++/4.3.0-pgi-18.5-gcc-5.4.0-2.26',
'netcdf-fortran/4.4.4-pgi-18.5-gcc-5.4.0-2.26']
self.build_system.ldflags = [
'-B' + self.linkage,
'-L$EBROOTNETCDF/lib',
'-L$EBROOTNETCDFMINCPLUSPLUS/lib',
'-L$EBROOTNETCDFMINFORTRAN/lib',
'-L$EBROOTNETCDF/lib64',
'-L$EBROOTNETCDFMINCPLUSPLUS/lib64',
'-L$EBROOTNETCDFMINFORTRAN/lib64',
'-lnetcdf', '-lnetcdf_c++4', '-lnetcdff'
]
self.build_system.fflags = [
'-I$EBROOTNETCDF/include',
'-I$EBROOTNETCDFMINCPLUSPLUS/include',
'-I$EBROOTNETCDFMINFORTRAN/include'
]
elif self.current_system.name in ['arolla', 'tsa']:
if self.current_system.name in ['arolla', 'tsa']:
self.modules = ['netcdf', 'netcdf-c++', 'netcdf-fortran']
self.build_system.cppflags = [
'-I$EBROOTNETCDF/include',
Expand Down
10 changes: 1 addition & 9 deletions cscs-checks/libraries/math/scalapack_compile_run.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,12 @@ def __init__(self, linkage):
self.linkage = linkage
self.sourcesdir = os.path.join(self.current_system.resourcesdir,
'scalapack')
self.valid_systems = ['daint:gpu', 'daint:mc', 'dom:mc',
'dom:gpu', 'kesch:cn']
self.valid_systems = ['daint:gpu', 'daint:mc', 'dom:mc', 'dom:gpu']
self.valid_prog_environs = ['PrgEnv-cray', 'PrgEnv-gnu',
'PrgEnv-intel']
self.num_tasks = 16
self.num_tasks_per_node = 8
self.variables = {'CRAYPE_LINK_TYPE': linkage}
if self.current_system.name == 'kesch':
self.exclusive_access = True
self.valid_prog_environs = ['PrgEnv-cray']
if linkage == 'static':
# Static linkage not supported on Kesch
self.valid_prog_environs = []

self.build_system = 'SingleSource'
self.build_system.fflags = ['-O3']
self.maintainers = ['CB', 'LM']
Expand Down
3 changes: 1 addition & 2 deletions cscs-checks/libraries/math/trilinos_compile_run.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@
@rfm.parameterized_test(['static'], ['dynamic'])
class TrilinosTest(rfm.RegressionTest):
def __init__(self, linkage):
self.valid_systems = ['daint:gpu', 'daint:mc', 'dom:gpu', 'dom:mc',
'tiger:gpu']
self.valid_systems = ['daint:gpu', 'daint:mc', 'dom:gpu', 'dom:mc']
# NOTE: PrgEnv-cray in dynamic does not work because of CrayBug/809265
self.valid_prog_environs = ['PrgEnv-gnu', 'PrgEnv-intel']
# NOTE: PrgEnv-cray_classic does not support trilinos
Expand Down
3 changes: 1 addition & 2 deletions cscs-checks/libraries/petsc/petsc_helloworld.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ class PetscPoisson2DCheck(rfm.RegressionTest):
def __init__(self, linkage):
self.descr = ('Compile/run PETSc 2D Poisson example with cray-petsc '
'(%s linking)') % linkage
self.valid_systems = ['daint:gpu', 'daint:mc',
'dom:gpu', 'dom:mc', 'tiger:gpu']
self.valid_systems = ['daint:gpu', 'daint:mc', 'dom:gpu', 'dom:mc']
self.valid_prog_environs = ['PrgEnv-cray', 'PrgEnv-gnu',
'PrgEnv-intel']
self.sourcepath = 'poisson2d.c'
Expand Down
Loading