Merge branch 'master' into ci-generate-pipeline-new

Author: Vasileios Karakasis

cscs-checks/libraries/boost/boost_python_check.py

@@ -4,18 +4,17 @@
 # SPDX-License-Identifier: BSD-3-Clause
 
 import reframe as rfm
-import reframe.utility.osext as osext
 import reframe.utility.sanity as sn
 
 
-@rfm.parameterized_test(['1.70.0'])
+@rfm.simple_test
 class BoostPythonBindingsTest(rfm.RegressionTest):
-    def __init__(self, boostver):
-        self.descr = f'Test for Boost {boostver} with Python bindings'
-        self.valid_systems = ['daint:gpu', 'daint:mc', 'dom:gpu', 'dom:mc']
+    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']
-        cdt_version = osext.cray_cdt_version()
-        self.modules = [f'Boost/{boostver}-CrayGNU-{cdt_version}-python3']
+        self.modules = [f'Boost']
         self.executable = f'python3 hello.py'
         self.sanity_patterns = sn.assert_found('hello, world', self.stdout)
         version_cmd = ('python3 -c \'import sys; '
@@ -25,5 +24,5 @@ def __init__(self, boostver):
             'PYTHON_INCLUDE': '$(python3-config --includes)',
             'PYTHON_BOOST_LIB': f'boost_python$({version_cmd})'
         }
-        self.maintainers = ['JB', 'AJ']
+        self.maintainers = ['TM', 'AJ']
         self.tags = {'scs', 'production'}

cscs-checks/libraries/gridtools/gridtools_tests.py

@@ -28,7 +28,7 @@ def __init__(self):
         ]
         self.build_system.flags_from_environ = False
         self.build_system.make_opts = ['perftests']
-        self.build_system.max_concurrency = 2
+        self.build_system.max_concurrency = 8
         self.postbuild_cmds = ['ls tests/regression/']
         self.sanity_patterns = sn.assert_found(r'perftest',
                                                self.stdout)
@@ -52,7 +52,15 @@ class GridToolsGPUBuildCheck(GridToolsBuildCheck):
     def __init__(self):
         super().__init__()
         self.descr = 'GridTools GPU build test'
-        self.modules.append('cudatoolkit')
+        if self.current_system.name == 'dom':
+            self.modules += [
+                'cudatoolkit/10.2.89_3.29-7.0.2.1_3.5__g67354b4',
+                'cdt-cuda/20.10',
+                'gcc/8.3.0'
+            ]
+        else:
+            self.modules.append('cudatoolkit')
+
         self.build_system.config_opts += [
             '-DGT_CUDA_ARCH=sm_60',
             '-DGT_TESTS_REQUIRE_GPU="ON"'

cscs-checks/libraries/math/scalapack_compile_run.py

@@ -15,6 +15,9 @@ def __init__(self, linkage):
         self.sourcesdir = os.path.join(self.current_system.resourcesdir,
                                        'scalapack')
         self.valid_systems = ['daint:gpu', 'daint:mc', 'dom:mc', 'dom:gpu']
+        if self.linkage == 'dynamic':
+            self.valid_systems.append('eiger:mc')
+
         self.valid_prog_environs = ['PrgEnv-cray', 'PrgEnv-gnu',
                                     'PrgEnv-intel']
         self.num_tasks = 16