diff --git a/config/cscs-ci.py b/config/cscs-ci.py index f611aa28c7..651ff91926 100644 --- a/config/cscs-ci.py +++ b/config/cscs-ci.py @@ -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', diff --git a/config/cscs.py b/config/cscs.py index 8f5f828a79..b4d03c613c 100644 --- a/config/cscs.py +++ b/config/cscs.py @@ -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', @@ -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': [ diff --git a/cscs-checks/apps/gromacs/gromacs_check.py b/cscs-checks/apps/gromacs/gromacs_check.py index c06df875f6..a96692113f 100644 --- a/cscs-checks/apps/gromacs/gromacs_check.py +++ b/cscs-checks/apps/gromacs/gromacs_check.py @@ -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'] diff --git a/cscs-checks/compile/haswell_fma_check.py b/cscs-checks/compile/haswell_fma_check.py index 864fc16c5c..a6ba50f8ed 100644 --- a/cscs-checks/compile/haswell_fma_check.py +++ b/cscs-checks/compile/haswell_fma_check.py @@ -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' @@ -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'] diff --git a/cscs-checks/compile/libsci_acc_symlink.py b/cscs-checks/compile/libsci_acc_symlink.py index 4c04c40607..3a666540b3 100644 --- a/cscs-checks/compile/libsci_acc_symlink.py +++ b/cscs-checks/compile/libsci_acc_symlink.py @@ -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[A-Za-z]+)_((?P[A-Za-z0-9]+)_)' r'?(?P\S+)') diff --git a/cscs-checks/compile/libsci_resolve.py b/cscs-checks/compile/libsci_resolve.py index fd28fc7bcd..e87b9fc1e5 100644 --- a/cscs-checks/compile/libsci_resolve.py +++ b/cscs-checks/compile/libsci_resolve.py @@ -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'} diff --git a/cscs-checks/libraries/io/hdf5_compile_run.py b/cscs-checks/libraries/io/hdf5_compile_run.py index 6f5bcd7d54..ae433bb5f6 100644 --- a/cscs-checks/libraries/io/hdf5_compile_run.py +++ b/cscs-checks/libraries/io/hdf5_compile_run.py @@ -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'] diff --git a/cscs-checks/libraries/io/netcdf_compile_run.py b/cscs-checks/libraries/io/netcdf_compile_run.py index 445838fec3..d1bf447619 100644 --- a/cscs-checks/libraries/io/netcdf_compile_run.py +++ b/cscs-checks/libraries/io/netcdf_compile_run.py @@ -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'] @@ -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', diff --git a/cscs-checks/libraries/math/scalapack_compile_run.py b/cscs-checks/libraries/math/scalapack_compile_run.py index c277c3c479..33d4a4c76c 100644 --- a/cscs-checks/libraries/math/scalapack_compile_run.py +++ b/cscs-checks/libraries/math/scalapack_compile_run.py @@ -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'] diff --git a/cscs-checks/libraries/math/trilinos_compile_run.py b/cscs-checks/libraries/math/trilinos_compile_run.py index d4eca4d5a8..159fb9d238 100644 --- a/cscs-checks/libraries/math/trilinos_compile_run.py +++ b/cscs-checks/libraries/math/trilinos_compile_run.py @@ -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 diff --git a/cscs-checks/libraries/petsc/petsc_helloworld.py b/cscs-checks/libraries/petsc/petsc_helloworld.py index 8cdee41f47..f6b76ff129 100644 --- a/cscs-checks/libraries/petsc/petsc_helloworld.py +++ b/cscs-checks/libraries/petsc/petsc_helloworld.py @@ -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' diff --git a/cscs-checks/mch/automatic_arrays_acc.py b/cscs-checks/mch/automatic_arrays_acc.py index 661a386548..12bbacc2f3 100644 --- a/cscs-checks/mch/automatic_arrays_acc.py +++ b/cscs-checks/mch/automatic_arrays_acc.py @@ -11,20 +11,10 @@ @rfm.simple_test class AutomaticArraysCheck(rfm.RegressionTest): def __init__(self): - self.valid_systems = ['daint:gpu', 'dom:gpu', 'kesch:cn', 'tiger:gpu', - 'arolla:cn', 'tsa:cn'] + self.valid_systems = ['daint:gpu', 'dom:gpu', 'arolla:cn', 'tsa:cn'] self.valid_prog_environs = ['PrgEnv-cray', 'PrgEnv-cce', 'PrgEnv-pgi'] - if self.current_system.name in ['daint', 'dom', 'tiger']: + if self.current_system.name in ['daint', 'dom']: self.modules = ['craype-accel-nvidia60'] - elif self.current_system.name == 'kesch': - self.exclusive_access = True - self.modules = ['cudatoolkit/8.0.61'] - # FIXME: workaround -- the variable should not be needed since - # there is no GPUdirect in this check - self.variables = { - 'CRAY_ACCEL_TARGET': 'nvidia35', - 'MV2_USE_CUDA': '1' - } elif self.current_system.name in ['arolla', 'tsa']: self.exclusive_access = True @@ -44,12 +34,10 @@ def __init__(self): 'PrgEnv-cray': { 'daint:gpu': {'time': (5.7E-05, None, 0.15, 's')}, 'dom:gpu': {'time': (5.7E-05, None, 0.15, 's')}, - 'kesch:cn': {'time': (2.9E-04, None, 0.15, 's')}, }, 'PrgEnv-pgi': { 'daint:gpu': {'time': (7.5E-05, None, 0.15, 's')}, 'dom:gpu': {'time': (7.5e-05, None, 0.15, 's')}, - 'kesch:cn': {'time': (1.4E-04, None, 0.15, 's')}, } } @@ -67,11 +55,9 @@ def setflags(self): elif self.current_environ.name.startswith('PrgEnv-pgi'): envname = 'PrgEnv-pgi' self.build_system.fflags += ['-acc'] - if self.current_system.name == 'kesch': - self.build_system.fflags += ['-ta=tesla,cc35'] - elif self.current_system.name in ['arolla', 'tsa']: + if self.current_system.name in ['arolla', 'tsa']: self.build_system.fflags += ['-ta=tesla,cc70'] - elif self.current_system.name in ['daint', 'dom', 'tiger']: + elif self.current_system.name in ['daint', 'dom']: self.build_system.fflags += ['-ta=tesla,cc60', '-Mnorpath'] else: envname = self.current_environ.name diff --git a/cscs-checks/mch/check_ruby.py b/cscs-checks/mch/check_ruby.py deleted file mode 100644 index d7c6811db1..0000000000 --- a/cscs-checks/mch/check_ruby.py +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 2016-2020 Swiss National Supercomputing Centre (CSCS/ETH Zurich) -# ReFrame Project Developers. See the top-level LICENSE file for details. -# -# SPDX-License-Identifier: BSD-3-Clause - -import reframe as rfm -import reframe.utility.sanity as sn - - -@rfm.simple_test -class RubyNArray(rfm.RunOnlyRegressionTest): - def __init__(self): - self.descr = ('Check NArray for Ruby version 2.2.2') - self.valid_systems = ['kesch:cn'] - self.valid_prog_environs = ['PrgEnv-gnu-nompi'] - self.exclusive_access = True - self.modules = ['ruby/2.2.2-gmvolf-17.02'] - self.executable = 'ruby' - self.executable_opts = ['NArray.rb'] - self.sanity_patterns = sn.assert_found(r'NArray\.float\(4\):\s*' - r'\[ 1.0, 2.0, 3.0, 4.0 \]', - self.stdout) - self.maintainers = ['MKr', 'LM'] - self.tags = {'production', 'mch'} diff --git a/cscs-checks/mch/collectives_halo.py b/cscs-checks/mch/collectives_halo.py index 034238f26d..a914076850 100644 --- a/cscs-checks/mch/collectives_halo.py +++ b/cscs-checks/mch/collectives_halo.py @@ -9,8 +9,7 @@ class CollectivesBaseTest(rfm.RegressionTest): def __init__(self, variant, bench_reference): - self.valid_systems = ['dom:gpu', 'daint:gpu', 'kesch:cn', 'tiger:gpu', - 'arolla:cn', 'tsa:cn'] + self.valid_systems = ['dom:gpu', 'daint:gpu', 'arolla:cn', 'tsa:cn'] self.valid_prog_environs = ['PrgEnv-gnu'] self.variables = {'G2G': '1'} self.executable = 'build/src/comm_overlap_benchmark' @@ -22,20 +21,7 @@ def __init__(self, variant, bench_reference): self.build_system.config_opts = ['-DCMAKE_BUILD_TYPE=Release', '-DENABLE_MPI_TIMER=ON'] - if self.current_system.name == 'kesch': - self.exclusive_access = True - self.num_tasks = 144 - self.num_gpus_per_node = 16 - self.num_tasks_per_node = 16 - self.num_tasks_per_socket = 8 - self.modules = ['cmake'] - self.variables['MV2_USE_CUDA'] = '1' - self.build_system.config_opts += [ - '-DMPI_VENDOR=mvapich2', - '-DCUDA_COMPUTE_CAPABILITY="sm_37"' - ] - self.build_system.max_concurrency = 1 - elif self.current_system.name in ['arolla', 'tsa']: + if self.current_system.name in ['arolla', 'tsa']: self.exclusive_access = True self.num_tasks = 32 self.num_gpus_per_node = 8 @@ -47,15 +33,11 @@ def __init__(self, variant, bench_reference): '-DCUDA_COMPUTE_CAPABILITY="sm_70"' ] self.build_system.max_concurrency = 1 - elif self.current_system.name in {'daint', 'dom', 'tiger'}: + elif self.current_system.name in {'daint', 'dom'}: self.num_tasks = 4 self.num_gpus_per_node = 1 self.num_tasks_per_node = 1 - if self.current_system.name in {'tiger'}: - self.modules = ['craype-accel-nvidia60'] - else: - self.modules = ['craype-accel-nvidia60', 'CMake'] - + self.modules = ['craype-accel-nvidia60', 'CMake'] self.variables['MPICH_RDMA_ENABLED_CUDA'] = '1' self.build_system.config_opts += [ '-DCUDA_COMPUTE_CAPABILITY="sm_60"' @@ -73,11 +55,6 @@ def __init__(self, variant, bench_reference): self.stdout, 1, float, -1) } ref_values = { - 'kesch': { - 'nocomm': 5.7878, - 'nocomp': 5.62155, - 'default': 5.53777 - }, 'daint': { 'nocomm': 0.0171947, 'nocomp': 0.0137893, @@ -96,9 +73,6 @@ def __init__(self, variant, bench_reference): ref = 0.0 self.reference = { - 'kesch:cn': { - 'elapsed_time': (ref, None, 0.15, 's') - }, 'daint': { 'elapsed_time': (ref, None, 0.15, 's') }, @@ -115,7 +89,7 @@ def __init__(self, variant, bench_reference): @rfm.run_before('run') def set_launcher_options(self): - if self.current_system.name in ['arolla', 'kesch', 'tsa']: + if self.current_system.name in ['arolla', 'tsa']: self.job.launcher.options = ['--distribution=block:block', '--cpu_bind=q'] @@ -125,11 +99,6 @@ class AlltoallvTest(CollectivesBaseTest): def __init__(self, variant): super().__init__(variant, { - 'kesch': { - 'nocomm': 6.89819, - 'nocomp': 6.98276, - 'default': 6.85289 - }, 'daint': { 'nocomm': 0.0171947, 'nocomp': 0.0137893, @@ -146,11 +115,6 @@ class HaloExchangeTest(CollectivesBaseTest): def __init__(self, variant): super().__init__(variant, { - 'kesch': { - 'nocomm': 5.7878, - 'nocomp': 54.2012, - 'default': 55.142 - }, 'daint': { 'nocomm': 0.978306, 'nocomp': 1.36716, diff --git a/cscs-checks/mch/cuda_stress_test.py b/cscs-checks/mch/cuda_stress_test.py index 7341c9fbaa..37f0a148bd 100644 --- a/cscs-checks/mch/cuda_stress_test.py +++ b/cscs-checks/mch/cuda_stress_test.py @@ -11,13 +11,8 @@ class CudaStressTest(rfm.RegressionTest): def __init__(self): self.descr = 'MCH CUDA stress test' - self.valid_systems = ['daint:gpu', 'dom:gpu', 'kesch:cn', 'tiger:gpu', - 'arolla:cn', 'tsa:cn'] - if self.current_system.name == 'kesch': - self.exclusive_access = True - self.valid_prog_environs = ['PrgEnv-gnu-nompi'] - self.modules = ['cudatoolkit/8.0.61'] - elif self.current_system.name in ['arolla', 'tsa']: + self.valid_systems = ['daint:gpu', 'dom:gpu', 'arolla:cn', 'tsa:cn'] + if self.current_system.name in ['arolla', 'tsa']: self.exclusive_access = True self.valid_prog_environs = ['PrgEnv-gnu', 'PrgEnv-gnu-nompi', 'PrgEnv-pgi', 'PrgEnv-pgi-nompi'] @@ -42,9 +37,6 @@ def __init__(self): 'dom:gpu': { 'time': (1.39758, None, 0.05, 's') }, - 'kesch:cn': { - 'time': (2.25, None, 0.05, 's') - } } self.tags = {'production', 'mch', 'craype'} self.maintainers = ['MKr', 'AJ'] diff --git a/cscs-checks/mch/fieldextra_check.py b/cscs-checks/mch/fieldextra_check.py deleted file mode 100644 index c15c8ff8d0..0000000000 --- a/cscs-checks/mch/fieldextra_check.py +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 2016-2020 Swiss National Supercomputing Centre (CSCS/ETH Zurich) -# ReFrame Project Developers. See the top-level LICENSE file for details. -# -# SPDX-License-Identifier: BSD-3-Clause - -import os - -import reframe as rfm -import reframe.utility.sanity as sn - - -class FieldextraTestBase(rfm.RunOnlyRegressionTest): - def __init__(self): - self.maintainers = ['MKr'] - self.tags = {'mch', 'external-resources'} - - self.valid_systems = ['kesch:cn'] - self.valid_prog_environs = ['PrgEnv-gnu-nompi'] - self.executable = 'cookbook/run.bash' - - self.num_tasks = 1 - self.num_tasks_per_node = 1 - self.num_cpus_per_task = 24 - self.num_task_per_core = 1 - self.use_multithreading = True - self.strict_check = False - - -@rfm.parameterized_test(['opt'], ['opt_omp']) -class FieldextraAccuracyTest(FieldextraTestBase): - def __init__(self, variant): - super().__init__() - self.descr = 'Fieldextra validation test (accuracy - "cookbook")' - self.sourcesdir = os.path.join(self.current_system.resourcesdir, - 'Fieldextra', 'cookbook_tests') - self.readonly_files = [ - 'cookbook/support/input', - 'reference_cookbook' - ] - self.prerun_cmds = [ - 'ln -s ${EBROOTFIELDEXTRA}/bin bin', - 'ln -s ${EBROOTFIELDEXTRA}/tools tools', - 'ln -s ${EBROOTFIELDEXTRA}/resources resources', - ] - - if variant == 'opt': - self.modules = ['fieldextra/12.7.5-gmvolf-17.02'] - self.executable_opts = ['-c gnu -m opt'] - else: - self.modules = ['fieldextra/12.7.5-gmvolf-17.02-openmp'] - self.executable_opts = ['-c', 'gnu', '-m', 'opt_omp'] - self.variables = { - 'OMP_STACKSIZE': '500M', - 'OMP_NUM_THREADS': '$SLURM_CPUS_PER_TASK', - } - - self.sanity_patterns = sn.assert_found(r'All tests successful', - self.stdout) - - -@rfm.simple_test -class FieldextraPerformanceTest(FieldextraTestBase): - def __init__(self): - super().__init__() - self.descr = 'Fieldextra validation test (performance)' - self.sourcesdir = os.path.join(self.current_system.resourcesdir, - 'Fieldextra', 'performance') - self.modules = ['fieldextra/12.7.5-gmvolf-17.02-openmp'] - self.executable = 'fieldextra_gnu_opt_omp' - self.executable_opts = ['nl.TC'] - self.readonly_files = ['18112900_204'] - self.prerun_cmds = ['source create_nl_6h.template'] - self.variables = { - 'OMP_STACKSIZE': '500M', - 'OMP_NUM_THREADS': '$SLURM_CPUS_PER_TASK', - } - - self.sanity_patterns = sn.assert_found( - r'%INFO fieldextra: Program successfully completed', self.stdout - ) - self.perf_patterns = { - 'time': sn.extractsingle(r'WALL CLOCK\s*SPEEDUP\D*(?P