[test] Update checks for Eiger with PE 21.04

config/cscs.py

@@ -677,9 +677,14 @@
                     'scheduler': 'local',
                     'environs': [
                         'builtin',
+                        'PrgEnv-aocc',
                         'PrgEnv-cray',
                         'PrgEnv-gnu',
-                        'PrgEnv-aocc'
+                        'PrgEnv-intel',
+                        'cpeAMD',
+                        'cpeCray',
+                        'cpeGNU',
+                        'cpeIntel'
                     ],
                     'descr': 'Login nodes',
                     'max_jobs': 4,
@@ -691,9 +696,14 @@
                     'scheduler': 'slurm',
                     'environs': [
                         'builtin',
+                        'PrgEnv-aocc',
                         'PrgEnv-cray',
                         'PrgEnv-gnu',
-                        'PrgEnv-aocc'
+                        'PrgEnv-intel',
+                        'cpeAMD',
+                        'cpeCray',
+                        'cpeGNU',
+                        'cpeIntel'
                     ],
                     'max_jobs': 100,
                     'resources': [

cscs-checks/apps/cp2k/cp2k_check.py

@@ -9,7 +9,7 @@
 
 class Cp2kCheck(rfm.RunOnlyRegressionTest):
     def __init__(self):
-        if self.current_system.name == 'pilatus':
+        if self.current_system.name in ['eiger', 'pilatus']:
             self.valid_prog_environs = ['cpeGNU']
         else:
             self.valid_prog_environs = ['builtin']

cscs-checks/apps/gromacs/gromacs_check.py

@@ -12,7 +12,7 @@
 
 class GromacsBaseCheck(rfm.RunOnlyRegressionTest):
     def __init__(self, output_file):
-        if self.current_system.name == 'pilatus':
+        if self.current_system.name in ['eiger', 'pilatus']:
             self.valid_prog_environs = ['cpeGNU']
         else:
             self.valid_prog_environs = ['builtin']

cscs-checks/apps/lammps/lammps_check.py

@@ -11,7 +11,7 @@
 
 class LAMMPSBaseCheck(rfm.RunOnlyRegressionTest):
     def __init__(self):
-        if self.current_system.name == 'pilatus':
+        if self.current_system.name in ['eiger', 'pilatus']:
             self.valid_prog_environs = ['cpeGNU']
         else:
             self.valid_prog_environs = ['builtin']

cscs-checks/apps/namd/namd_check.py

@@ -12,8 +12,8 @@
 class NamdBaseCheck(rfm.RunOnlyRegressionTest):
     def __init__(self, arch, scale, variant):
         self.descr = f'NAMD check ({arch}, {variant})'
-        if self.current_system.name == 'pilatus':
-            self.valid_prog_environs = ['cpeIntel']
+        if self.current_system.name in ['eiger', 'pilatus']:
+            self.valid_prog_environs = ['cpeGNU']
         else:
             self.valid_prog_environs = ['builtin']
 
@@ -114,13 +114,13 @@ def __init__(self, scale, variant):
                 'dom:mc': {'days_ns': (0.51, None, 0.05, 'days/ns')},
                 'daint:mc': {'days_ns': (0.51, None, 0.05, 'days/ns')},
                 'eiger:mc': {'days_ns': (0.12, None, 0.05, 'days/ns')},
-                'pilatus:mc': {'days_ns': (0.15, None, 0.05, 'days/ns')},
+                'pilatus:mc': {'days_ns': (0.12, None, 0.05, 'days/ns')},
             }
         else:
             self.reference = {
                 'daint:mc': {'days_ns': (0.28, None, 0.05, 'days/ns')},
                 'eiger:mc': {'days_ns': (0.05, None, 0.05, 'days/ns')},
-                'pilatus:mc': {'days_ns': (0.06, None, 0.05, 'days/ns')}
+                'pilatus:mc': {'days_ns': (0.05, None, 0.05, 'days/ns')}
             }
 
         self.tags |= {'maintenance' if variant == 'maint' else 'production'}

cscs-checks/apps/paraview/paraview_check.py

@@ -11,8 +11,13 @@
 class ParaViewCheck(rfm.RunOnlyRegressionTest):
     def __init__(self):
         self.valid_systems = ['daint:gpu', 'daint:mc', 'dom:gpu', 'dom:mc',
-                              'eiger:mc']
-        self.valid_prog_environs = ['builtin']
+                              'eiger:mc', 'pilatus:mc']
+
+        if self.current_system.name in ['eiger', 'pilatus']:
+            self.valid_prog_environs = ['cpeCray']
+        else:
+            self.valid_prog_environs = ['builtin']
+
         self.num_tasks = 12
         self.num_tasks_per_node = 12
         self.modules = ['ParaView']

cscs-checks/apps/quantumespresso/quantumespresso_check.py

@@ -12,8 +12,8 @@ class QuantumESPRESSOCheck(rfm.RunOnlyRegressionTest):
     variant = parameter(['maint', 'prod'])
 
     def __init__(self):
-        if self.current_system.name == 'pilatus':
-            self.valid_prog_environs = ['cpeGNU']
+        if self.current_system.name in ['eiger', 'pilatus']:
+            self.valid_prog_environs = ['cpeIntel']
         else:
             self.valid_prog_environs = ['builtin']
 
@@ -58,10 +58,9 @@ def __init__(self):
                 self.num_tasks_per_node = 16
                 self.num_cpus_per_task = 16
                 self.num_tasks_per_core = 1
-                self.use_multithreading = False
                 self.variables = {
                     'MPICH_OFI_STARTUP_CONNECT': '1',
-                    'OMP_NUM_THREADS': '8',
+                    'OMP_NUM_THREADS': str(self.num_cpus_per_task),
                     'OMP_PLACES': 'cores',
                     'OMP_PROC_BIND': 'close'
                 }
@@ -75,10 +74,9 @@ def __init__(self):
                 self.num_tasks_per_node = 16
                 self.num_cpus_per_task = 16
                 self.num_tasks_per_core = 1
-                self.use_multithreading = False
                 self.variables = {
                     'MPICH_OFI_STARTUP_CONNECT': '1',
-                    'OMP_NUM_THREADS': '8',
+                    'OMP_NUM_THREADS': str(self.num_cpus_per_task),
                     'OMP_PLACES': 'cores',
                     'OMP_PROC_BIND': 'close'
                 }

cscs-checks/apps/vasp/vasp_check.py

@@ -9,7 +9,7 @@
 
 class VASPCheck(rfm.RunOnlyRegressionTest):
     def __init__(self):
-        if self.current_system.name == 'pilatus':
+        if self.current_system.name in ['eiger', 'pilatus']:
             self.valid_prog_environs = ['cpeIntel']
         else:
             self.valid_prog_environs = ['builtin']

cscs-checks/libraries/boost/boost_python_check.py

@@ -12,8 +12,13 @@ class BoostPythonBindingsTest(rfm.RegressionTest):
     def __init__(self):
         self.descr = f'Test for Boost with Python bindings'
         self.valid_systems = ['daint:gpu', 'daint:mc', 'dom:gpu', 'dom:mc',
-                              'eiger:mc']
-        self.valid_prog_environs = ['builtin']
+                              'eiger:mc', 'pilatus:mc']
+
+        if self.current_system.name in ['eiger', 'pilatus']:
+            self.valid_prog_environs = ['cpeGNU']
+        else:
+            self.valid_prog_environs = ['builtin']
+
         self.modules = [f'Boost']
         self.executable = f'python3 hello.py'
         self.sanity_patterns = sn.assert_found('hello, world', self.stdout)

cscs-checks/libraries/io/hdf5_compile_run.py

@@ -19,10 +19,17 @@ def __init__(self, lang, 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']
-        self.valid_prog_environs = ['PrgEnv-cray', 'PrgEnv-gnu',
-                                    'PrgEnv-intel', 'PrgEnv-pgi']
         if linkage == 'dynamic':
-            self.valid_systems += ['eiger:mc']
+            self.valid_systems += ['eiger:mc', 'pilatus:mc']
+
+        if self.current_system.name in ['eiger', 'pilatus']:
+            # no cray-hdf5 as of PE 21.02 with PrgEnv-intel on Eiger and
+            # Pilatus
+            self.valid_prog_environs = ['PrgEnv-aocc', 'PrgEnv-cray',
+                                        'PrgEnv-gnu']
+        else:
+            self.valid_prog_environs = ['PrgEnv-cray', 'PrgEnv-gnu',
+                                        'PrgEnv-intel', 'PrgEnv-pgi']
 
         self.modules = ['cray-hdf5']
         self.keep_files = ['h5dump_out.txt']

cscs-checks/libraries/io/netcdf_compile_run.py

@@ -22,9 +22,9 @@ def __init__(self, lang, linkage):
         self.linkage = linkage
         self.descr = f'{lang_names[lang]} NetCDF {linkage.capitalize()}'
         self.valid_systems = ['daint:gpu', 'daint:mc', 'dom:gpu', 'dom:mc',
-                              'arolla:cn', 'tsa:cn', 'eiger:mc']
-        if linkage == 'static':
-            self.valid_systems.remove('eiger:mc')
+                              'arolla:cn', 'tsa:cn']
+        if linkage == 'dynamic':
+            self.valid_systems += ['eiger:mc', 'pilatus:mc']
 
         if self.current_system.name in ['daint', 'dom']:
             self.valid_prog_environs = ['PrgEnv-cray', 'PrgEnv-gnu',
@@ -33,8 +33,10 @@ def __init__(self, lang, linkage):
         elif self.current_system.name in ['arolla', 'tsa']:
             self.exclusive_access = True
             self.valid_prog_environs = ['PrgEnv-gnu-nompi', 'PrgEnv-pgi-nompi']
-        elif self.current_system.name in ['eiger']:
-            self.valid_prog_environs = ['PrgEnv-cray', 'PrgEnv-gnu']
+        elif self.current_system.name in ['eiger', 'pilatus']:
+            # no cray-netcdf as of PE 21.02 with PrgEnv-intel
+            self.valid_prog_environs = ['PrgEnv-aocc', 'PrgEnv-cray',
+                                        'PrgEnv-gnu']
             self.modules = ['cray-hdf5', 'cray-netcdf']
         else:
             self.valid_prog_environs = []

cscs-checks/libraries/math/scalapack_compile_run.py

@@ -12,8 +12,10 @@ class ScaLAPACKTest(rfm.RegressionTest):
     linkage = parameter(['static', 'dynamic'])
 
     sourcepath = 'sample_pdsyev_call.f'
-    valid_systems = ['daint:gpu', 'daint:mc', 'dom:mc', 'dom:gpu', 'eiger:mc']
-    valid_prog_environs = ['PrgEnv-cray', 'PrgEnv-gnu', 'PrgEnv-intel']
+    valid_systems = ['daint:gpu', 'daint:mc', 'dom:mc', 'dom:gpu',
+                     'eiger:mc', 'pilatus:mc']
+    valid_prog_environs = ['PrgEnv-aocc', 'PrgEnv-cray', 'PrgEnv-gnu',
+                           'PrgEnv-intel']
     num_tasks = 16
     num_tasks_per_node = 8
     build_system = 'SingleSource'
@@ -26,9 +28,9 @@ def set_build_flags(self):
 
     @rfm.run_after('init')
     def set_linkage(self):
-        if self.current_system.name == 'eiger':
+        if self.current_system.name in ['eiger', 'pilatus']:
             self.skip_if(self.linkage == 'static',
-                         'static linking not supported on Eiger')
+                         'static linking not supported on Alps')
 
         self.variables = {'CRAYPE_LINK_TYPE': self.linkage}
 

cscs-checks/microbenchmarks/cpu/alloc_speed/alloc_speed.py

@@ -15,13 +15,14 @@ def __init__(self, hugepages):
         self.build_system = 'SingleSource'
         self.build_system.cxxflags = ['-O3', '-std=c++11']
         self.valid_systems = ['daint:gpu', 'daint:mc', 'dom:gpu', 'dom:mc',
-                              'eiger:mc']
+                              'eiger:mc', 'pilatus:mc']
         self.valid_prog_environs = ['PrgEnv-gnu']
         if hugepages == 'no':
             self.valid_systems += ['arolla:cn', 'arolla:pn',
                                    'tsa:cn', 'tsa:pn']
         else:
-            if self.current_system.name in {'dom', 'daint', 'eiger'}:
+            if self.current_system.name in {'dom', 'daint',
+                                            'eiger', 'pilatus'}:
                 self.modules = ['craype-hugepages%s' % hugepages]
 
         self.sanity_patterns = sn.assert_found('4096 MB', self.stdout)
@@ -46,6 +47,9 @@ def __init__(self, hugepages):
                 'eiger:mc': {
                     'time': (0.12, -0.20, 0.05, 's')
                 },
+                'pilatus:mc': {
+                    'time': (0.12, -0.20, 0.05, 's')
+                },
             },
             '2M': {
                 'dom:gpu': {
@@ -63,6 +67,9 @@ def __init__(self, hugepages):
                 'eiger:mc': {
                     'time': (0.06, -0.20, 0.10, 's')
                 },
+                'pilatus:mc': {
+                    'time': (0.06, -0.20, 0.10, 's')
+                },
                 '*': {
                     'time': (0, None, None, 's')
                 }

cscs-checks/microbenchmarks/cpu/dgemm/dgemm.py

@@ -18,12 +18,12 @@ def __init__(self):
         self.perf_patterns = {}
         self.valid_systems = ['daint:gpu', 'daint:mc', 'dom:gpu', 'dom:mc',
                               'arolla:cn', 'arolla:pn', 'tsa:cn', 'tsa:pn',
-                              'eiger:mc']
+                              'eiger:mc', 'pilatus:mc']
         if self.current_system.name in ['daint', 'dom']:
             self.valid_prog_environs = ['PrgEnv-gnu', 'PrgEnv-intel']
         elif self.current_system.name in ['arolla', 'tsa']:
             self.valid_prog_environs = ['PrgEnv-gnu-nompi']
-        elif self.current_system.name in ['eiger']:
+        elif self.current_system.name in ['eiger', 'pilatus']:
             self.valid_prog_environs = ['PrgEnv-gnu']
         else:
             self.valid_prog_environs = []
@@ -39,6 +39,7 @@ def __init__(self):
             'dom:gpu': (300.0, -0.15, None, 'Gflop/s'),
             'dom:mc': (1040.0, -0.15, None, 'Gflop/s'),
             'eiger:mc': (3200.0, -0.15, None, 'Gflop/s'),
+            'pilatus:mc': (3200.0, -0.15, None, 'Gflop/s'),
         }
         self.maintainers = ['AJ', 'VH']
         self.tags = {'benchmark', 'diagnostic', 'craype'}
@@ -72,7 +73,7 @@ def set_tasks(self):
             self.num_cpus_per_task = 16
         elif self.current_partition.fullname in ['arolla:pn', 'tsa:pn']:
             self.num_cpus_per_task = 40
-        elif self.current_partition.fullname in ['eiger:mc']:
+        elif self.current_partition.fullname in ['eiger:mc', 'pilatus:mc']:
             self.num_cpus_per_task = 128
 
         if self.num_cpus_per_task:

cscs-checks/microbenchmarks/cpu/strided_bandwidth/strides.py

@@ -12,7 +12,7 @@ def __init__(self):
         self.sourcepath = 'strides.cpp'
         self.build_system = 'SingleSource'
         self.valid_systems = ['daint:gpu', 'dom:gpu', 'daint:mc', 'dom:mc',
-                              'eiger:mc']
+                              'eiger:mc', 'pilatus:mc']
         self.valid_prog_environs = ['PrgEnv-gnu']
         self.num_tasks = 1
         self.num_tasks_per_node = 1
@@ -33,6 +33,7 @@ def __init__(self):
             'dom:mc':  72,
             'dom:gpu': 24,
             'eiger:mc': 128,
+            'pilatus:mc': 128
         }
 
         self.maintainers = ['SK']
@@ -65,6 +66,9 @@ def __init__(self):
             'eiger:mc': {
                 'bandwidth': (270, -0.1, 0.1, 'GB/s')
             },
+            'pilatus:mc': {
+                'bandwidth': (270, -0.1, 0.1, 'GB/s')
+            }
         }
 
     @rfm.run_before('run')
@@ -96,6 +100,9 @@ def __init__(self):
             'eiger:mc': {
                 'bandwidth': (33, -0.1, 0.2, 'GB/s')
             },
+            'pilatus:mc': {
+                'bandwidth': (33, -0.1, 0.2, 'GB/s')
+            }
         }
 
     @rfm.run_before('run')

cscs-checks/microbenchmarks/mpi/halo_exchange/halo_cell_exchange.py

@@ -14,9 +14,8 @@ def __init__(self):
         self.build_system = 'SingleSource'
         self.build_system.cflags = ['-O2']
         self.valid_systems = ['daint:gpu', 'dom:gpu', 'daint:mc', 'dom:mc',
-                              'arolla:cn', 'tsa:cn', 'eiger:mc']
-        self.valid_prog_environs = ['PrgEnv-cray', 'PrgEnv-pgi',
-                                    'PrgEnv-gnu']
+                              'arolla:cn', 'tsa:cn', 'eiger:mc', 'pilatus:mc']
+        self.valid_prog_environs = ['PrgEnv-cray', 'PrgEnv-gnu', 'PrgEnv-pgi']
         self.num_tasks = 6
         self.num_tasks_per_node = 1
         self.num_gpus_per_node = 0
@@ -121,6 +120,17 @@ def __init__(self):
                 'time_6_10000': (1.04e-05, None, 0.50, 's'),
                 'time_6_1000000': (3.55e-04, None, 0.50, 's')
             },
+            'pilatus:mc': {
+                'time_2_10': (3.46e-06, None, 0.50, 's'),
+                'time_2_10000': (8.51e-06, None, 0.50, 's'),
+                'time_2_1000000': (2.07e-04, None, 0.50, 's'),
+                'time_4_10': (4.46e-06, None, 0.50, 's'),
+                'time_4_10000': (1.08e-05, None, 0.50, 's'),
+                'time_4_1000000': (3.55e-04, None, 0.50, 's'),
+                'time_6_10': (4.53e-06, None, 0.50, 's'),
+                'time_6_10000': (1.04e-05, None, 0.50, 's'),
+                'time_6_1000000': (3.55e-04, None, 0.50, 's')
+            },
         }
 
         self.maintainers = ['AJ']