Skip to content

Commit 8b6a23f

Browse files
author
Vasileios Karakasis
authored
Merge pull request #1588 from kraushm/fix/remove_kesch
[test] Remove retired systems Kesch and Tiger
2 parents b1f3183 + 0d22e14 commit 8b6a23f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+116
-850
lines changed

‎config/cscs-ci.py‎

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -119,37 +119,6 @@
119119
}
120120
]
121121
},
122-
{
123-
'name': 'kesch',
124-
'descr': 'Kesch MCH',
125-
'hostnames': [
126-
r'keschln-\d+'
127-
],
128-
'modules_system': 'tmod',
129-
'resourcesdir': '/apps/common/UES/reframe/resources',
130-
'partitions': [
131-
{
132-
'name': 'cn',
133-
'scheduler': 'slurm',
134-
'access': [
135-
'--partition=cn-regression'
136-
],
137-
'environs': [
138-
'builtin'
139-
],
140-
'descr': 'Kesch compute nodes',
141-
'resources': [
142-
{
143-
'name': '_rfm_gpu',
144-
'options': [
145-
'--gres=gpu:{num_gpus_per_node}'
146-
]
147-
}
148-
],
149-
'launcher': 'srun'
150-
}
151-
]
152-
},
153122
{
154123
'name': 'tsa',
155124
'descr': 'Tsa MCH',

‎config/cscs.py‎

Lines changed: 0 additions & 146 deletions
Original file line numberDiff line numberDiff line change
@@ -481,73 +481,6 @@
481481
}
482482
]
483483
},
484-
{
485-
'name': 'kesch',
486-
'descr': 'Kesch MCH',
487-
'hostnames': [
488-
r'keschln-\d+'
489-
],
490-
'modules_system': 'tmod',
491-
'resourcesdir': '/apps/common/UES/reframe/resources',
492-
'partitions': [
493-
{
494-
'name': 'login',
495-
'scheduler': 'local',
496-
'environs': [
497-
'PrgEnv-cray',
498-
'PrgEnv-cray-nompi',
499-
'PrgEnv-pgi',
500-
'PrgEnv-pgi-nompi',
501-
'PrgEnv-gnu',
502-
'PrgEnv-gnu-nompi'
503-
],
504-
'descr': 'Kesch login nodes',
505-
'launcher': 'local'
506-
},
507-
{
508-
'name': 'pn',
509-
'scheduler': 'slurm',
510-
'access': [
511-
'--partition=pn-regression'
512-
],
513-
'environs': [
514-
'PrgEnv-cray',
515-
'PrgEnv-cray-nompi',
516-
'PrgEnv-pgi',
517-
'PrgEnv-pgi-nompi',
518-
'PrgEnv-gnu',
519-
'PrgEnv-gnu-nompi'
520-
],
521-
'descr': 'Kesch post-processing nodes',
522-
'launcher': 'srun'
523-
},
524-
{
525-
'name': 'cn',
526-
'scheduler': 'slurm',
527-
'access': [
528-
'--partition=cn-regression'
529-
],
530-
'environs': [
531-
'PrgEnv-cray',
532-
'PrgEnv-cray-nompi',
533-
'PrgEnv-pgi',
534-
'PrgEnv-pgi-nompi',
535-
'PrgEnv-gnu',
536-
'PrgEnv-gnu-nompi'
537-
],
538-
'descr': 'Kesch compute nodes',
539-
'resources': [
540-
{
541-
'name': '_rfm_gpu',
542-
'options': [
543-
'--gres=gpu:{num_gpus_per_node}'
544-
]
545-
}
546-
],
547-
'launcher': 'srun'
548-
}
549-
]
550-
},
551484
{
552485
'name': 'arolla',
553486
'descr': 'Arolla MCH',
@@ -744,85 +677,6 @@
744677
'cxx': 'g++',
745678
'ftn': 'gfortran'
746679
},
747-
{
748-
'name': 'PrgEnv-pgi-nompi',
749-
'target_systems': [
750-
'kesch'
751-
],
752-
'modules': [
753-
'PE/17.06',
754-
'PrgEnv-pgi/18.5'
755-
],
756-
'cc': 'pgcc',
757-
'cxx': 'pgc++',
758-
'ftn': 'pgf90'
759-
},
760-
{
761-
'name': 'PrgEnv-pgi',
762-
'target_systems': [
763-
'kesch'
764-
],
765-
'modules': [
766-
'PE/17.06',
767-
'pgi/18.5-gcc-5.4.0-2.26',
768-
'openmpi/4.0.1-pgi-18.5-gcc-5.4.0-2.26-cuda-8.0'
769-
],
770-
'cc': 'mpicc',
771-
'cxx': 'mpicxx',
772-
'ftn': 'mpifort'
773-
},
774-
{
775-
'name': 'PrgEnv-cray',
776-
'target_systems': [
777-
'kesch'
778-
],
779-
'modules': [
780-
'PE/17.06',
781-
'PrgEnv-CrayCCE/17.06'
782-
]
783-
},
784-
{
785-
'name': 'PrgEnv-cray-nompi',
786-
'target_systems': [
787-
'kesch'
788-
],
789-
'modules': [
790-
'PE/17.06',
791-
'PrgEnv-cray'
792-
]
793-
},
794-
{
795-
'name': 'PrgEnv-gnu',
796-
'target_systems': [
797-
'kesch'
798-
],
799-
'modules': [
800-
'PE/17.06',
801-
'gmvapich2/17.02_cuda_8.0_gdr'
802-
],
803-
'variables': [
804-
[
805-
'LD_PRELOAD',
806-
'$(pkg-config --variable=libdir mvapich2-gdr)/libmpi.so'
807-
]
808-
],
809-
'cc': 'mpicc',
810-
'cxx': 'mpicxx',
811-
'ftn': 'mpif90'
812-
},
813-
{
814-
'name': 'PrgEnv-gnu-nompi',
815-
'target_systems': [
816-
'kesch'
817-
],
818-
'modules': [
819-
'PE/17.06',
820-
'PrgEnv-gnu'
821-
],
822-
'cc': 'gcc',
823-
'cxx': 'g++',
824-
'ftn': 'gfortran'
825-
},
826680
{
827681
'name': 'PrgEnv-pgi-nompi-nocuda',
828682
'target_systems': [

‎cscs-checks/apps/gromacs/gromacs_check.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ def __init__(self, output_file):
5757
class GromacsGPUCheck(GromacsBaseCheck):
5858
def __init__(self, scale, variant):
5959
super().__init__('md.log')
60-
self.valid_systems = ['daint:gpu', 'tiger:gpu']
60+
self.valid_systems = ['daint:gpu']
6161
self.descr = 'GROMACS GPU check'
6262
self.executable_opts = ['mdrun', '-dlb yes', '-ntomp 1', '-npme 0',
6363
'-s herflat.tpr']

‎cscs-checks/compile/haswell_fma_check.py‎

Lines changed: 7 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,10 @@
1212
class HaswellFmaCheck(rfm.CompileOnlyRegressionTest):
1313
def __init__(self):
1414
self.descr = 'check for avx2 instructions'
15-
self.valid_systems = ['dom:login', 'daint:login', 'kesch:login']
16-
if self.current_system.name == 'kesch':
17-
self.valid_prog_environs = [
18-
'PrgEnv-cray', 'PrgEnv-gnu', 'PrgEnv-cray-nompi',
19-
'PrgEnv-gnu-nompi'
20-
]
21-
else:
22-
self.valid_prog_environs = [
23-
'PrgEnv-cray', 'PrgEnv-gnu',
24-
'PrgEnv-intel', 'PrgEnv-pgi'
25-
]
26-
self.modules = ['craype-haswell']
15+
self.valid_systems = ['dom:login', 'daint:login']
16+
self.valid_prog_environs = ['PrgEnv-cray', 'PrgEnv-gnu',
17+
'PrgEnv-intel', 'PrgEnv-pgi']
18+
self.modules = ['craype-haswell']
2719

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

4335
@rfm.run_before('compile')
4436
def setflags(self):
45-
if self.current_system.name == 'kesch':
46-
if self.current_environ.name.startswith('PrgEnv-cray'):
47-
# Ignore CPATH warning
48-
self.build_system.cflags += ['-h nomessage=1254']
49-
self.build_system.cxxflags += ['-h nomessage=1254']
50-
else:
51-
self.build_system.cflags += ['-march=native']
52-
self.build_system.cxxflags += ['-march=native']
53-
self.build_system.fflags += ['-march=native']
54-
else:
55-
if self.current_environ.name == 'PrgEnv-cray':
56-
self.build_system.cflags = ['-Ofast', '-S']
57-
self.build_system.cxxflags = ['-Ofast', '-S']
37+
if self.current_environ.name == 'PrgEnv-cray':
38+
self.build_system.cflags = ['-Ofast', '-S']
39+
self.build_system.cxxflags = ['-Ofast', '-S']

‎cscs-checks/compile/libsci_acc_symlink.py‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,9 @@
2020
class LibSciAccSymLinkTest(rfm.RunOnlyRegressionTest):
2121
def __init__(self, lib_name):
2222
self.descr = 'LibSciAcc symlink check of %s' % lib_name
23-
2423
self.valid_systems = [
2524
'daint:login', 'daint:gpu',
2625
'dom:login', 'dom:gpu',
27-
'tiger:login', 'tiger:gpu'
2826
]
2927
regex = (r'libsci_acc_(?P<prgenv>[A-Za-z]+)_((?P<cver>[A-Za-z0-9]+)_)'
3028
r'?(?P<version>\S+)')

‎cscs-checks/compile/libsci_resolve.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@ def __init__(self):
1212
self.sourcesdir = 'src/libsci_resolve'
1313
self.sourcepath = 'libsci_resolve.f90'
1414
self.valid_systems = ['daint:login', 'daint:gpu',
15-
'dom:login', 'dom:gpu',
16-
'tiger:login', 'tiger:gpu']
15+
'dom:login', 'dom:gpu']
1716
self.modules = ['craype-haswell']
1817
self.maintainers = ['AJ', 'LM']
1918
self.tags = {'production', 'craype'}

‎cscs-checks/libraries/io/hdf5_compile_run.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ def __init__(self, lang, linkage):
1919
self.linkage = linkage
2020
self.descr = lang_names[lang] + ' HDF5 ' + linkage.capitalize()
2121
self.sourcepath = f'h5ex_d_chunk.{lang}'
22-
self.valid_systems = ['daint:gpu', 'daint:mc', 'dom:gpu', 'dom:mc',
23-
'tiger:gpu']
22+
self.valid_systems = ['daint:gpu', 'daint:mc', 'dom:gpu', 'dom:mc']
2423
self.valid_prog_environs = ['PrgEnv-cray', 'PrgEnv-gnu',
2524
'PrgEnv-intel', 'PrgEnv-pgi']
2625
self.modules = ['cray-hdf5']

‎cscs-checks/libraries/io/netcdf_compile_run.py‎

Lines changed: 3 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -22,20 +22,12 @@ def __init__(self, lang, linkage):
2222
self.lang = lang
2323
self.linkage = linkage
2424
self.descr = f'{lang_names[lang]} NetCDF {linkage.capitalize()}'
25-
self.valid_systems = ['daint:gpu', 'daint:mc',
26-
'dom:gpu', 'dom:mc', 'kesch:cn', 'tiger:gpu',
25+
self.valid_systems = ['daint:gpu', 'daint:mc', 'dom:gpu', 'dom:mc',
2726
'arolla:cn', 'tsa:cn']
28-
if self.current_system.name in ['daint', 'dom', 'tiger']:
27+
if self.current_system.name in ['daint', 'dom']:
2928
self.valid_prog_environs = ['PrgEnv-cray', 'PrgEnv-gnu',
3029
'PrgEnv-intel', 'PrgEnv-pgi']
3130
self.modules = ['cray-netcdf']
32-
elif self.current_system.name == 'kesch':
33-
self.exclusive_access = True
34-
if linkage == 'dynamic':
35-
self.valid_prog_environs = ['PrgEnv-pgi-nompi']
36-
37-
if lang != 'f90':
38-
self.valid_prog_environs += ['PrgEnv-cray-nompi']
3931
elif self.current_system.name in ['arolla', 'tsa']:
4032
self.exclusive_access = True
4133
self.valid_prog_environs = ['PrgEnv-gnu-nompi', 'PrgEnv-pgi-nompi']
@@ -52,45 +44,7 @@ def __init__(self, lang, linkage):
5244

5345
@rfm.run_before('compile')
5446
def setflags(self):
55-
if self.current_system.name == 'kesch':
56-
if self.current_environ.name == 'PrgEnv-cray-nompi':
57-
self.modules = ['netcdf/4.4.1.1-gmvolf-17.02',
58-
'netcdf-c++/4.3.0-gmvolf-17.02',
59-
'netcdf-fortran/4.4.4-gmvolf-17.02']
60-
self.build_system.cppflags = [
61-
'-I$EBROOTNETCDF/include',
62-
'-I$EBROOTNETCDFMINCPLUSPLUS/include',
63-
'-I$EBROOTNETCDFMINFORTRAN/include'
64-
]
65-
self.build_system.ldflags = [
66-
'-L$EBROOTNETCDF/lib',
67-
'-L$EBROOTNETCDFMINCPLUSPLUS/lib',
68-
'-L$EBROOTNETCDFMINFORTRAN/lib',
69-
'-L$EBROOTNETCDF/lib64',
70-
'-L$EBROOTNETCDFMINCPLUSPLUS/lib64',
71-
'-L$EBROOTNETCDFMINFORTRAN/lib64',
72-
'-lnetcdf', '-lnetcdf_c++4', '-lnetcdff'
73-
]
74-
elif self.current_environ.name == 'PrgEnv-pgi-nompi':
75-
self.modules = ['netcdf/4.6.1-pgi-18.5-gcc-5.4.0-2.26',
76-
'netcdf-c++/4.3.0-pgi-18.5-gcc-5.4.0-2.26',
77-
'netcdf-fortran/4.4.4-pgi-18.5-gcc-5.4.0-2.26']
78-
self.build_system.ldflags = [
79-
'-B' + self.linkage,
80-
'-L$EBROOTNETCDF/lib',
81-
'-L$EBROOTNETCDFMINCPLUSPLUS/lib',
82-
'-L$EBROOTNETCDFMINFORTRAN/lib',
83-
'-L$EBROOTNETCDF/lib64',
84-
'-L$EBROOTNETCDFMINCPLUSPLUS/lib64',
85-
'-L$EBROOTNETCDFMINFORTRAN/lib64',
86-
'-lnetcdf', '-lnetcdf_c++4', '-lnetcdff'
87-
]
88-
self.build_system.fflags = [
89-
'-I$EBROOTNETCDF/include',
90-
'-I$EBROOTNETCDFMINCPLUSPLUS/include',
91-
'-I$EBROOTNETCDFMINFORTRAN/include'
92-
]
93-
elif self.current_system.name in ['arolla', 'tsa']:
47+
if self.current_system.name in ['arolla', 'tsa']:
9448
self.modules = ['netcdf', 'netcdf-c++', 'netcdf-fortran']
9549
self.build_system.cppflags = [
9650
'-I$EBROOTNETCDF/include',

‎cscs-checks/libraries/math/scalapack_compile_run.py‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,12 @@ def __init__(self, linkage):
1414
self.linkage = linkage
1515
self.sourcesdir = os.path.join(self.current_system.resourcesdir,
1616
'scalapack')
17-
self.valid_systems = ['daint:gpu', 'daint:mc', 'dom:mc',
18-
'dom:gpu', 'kesch:cn']
17+
self.valid_systems = ['daint:gpu', 'daint:mc', 'dom:mc', 'dom:gpu']
1918
self.valid_prog_environs = ['PrgEnv-cray', 'PrgEnv-gnu',
2019
'PrgEnv-intel']
2120
self.num_tasks = 16
2221
self.num_tasks_per_node = 8
2322
self.variables = {'CRAYPE_LINK_TYPE': linkage}
24-
if self.current_system.name == 'kesch':
25-
self.exclusive_access = True
26-
self.valid_prog_environs = ['PrgEnv-cray']
27-
if linkage == 'static':
28-
# Static linkage not supported on Kesch
29-
self.valid_prog_environs = []
30-
3123
self.build_system = 'SingleSource'
3224
self.build_system.fflags = ['-O3']
3325
self.maintainers = ['CB', 'LM']

‎cscs-checks/libraries/math/trilinos_compile_run.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@
1414
@rfm.parameterized_test(['static'], ['dynamic'])
1515
class TrilinosTest(rfm.RegressionTest):
1616
def __init__(self, linkage):
17-
self.valid_systems = ['daint:gpu', 'daint:mc', 'dom:gpu', 'dom:mc',
18-
'tiger:gpu']
17+
self.valid_systems = ['daint:gpu', 'daint:mc', 'dom:gpu', 'dom:mc']
1918
# NOTE: PrgEnv-cray in dynamic does not work because of CrayBug/809265
2019
self.valid_prog_environs = ['PrgEnv-gnu', 'PrgEnv-intel']
2120
# NOTE: PrgEnv-cray_classic does not support trilinos

0 commit comments

Comments
 (0)