Merge branch 'master' into nvidia_automatic_arrays_acc

Author: jgphpc

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

@@ -21,16 +21,16 @@ def __init__(self):
                               'arolla:cn', 'arolla:pn', 'tsa:cn', 'tsa:pn']
         self.valid_prog_environs = ['PrgEnv-cray', 'PrgEnv-gnu',
                                     'PrgEnv-intel', 'PrgEnv-pgi',
-                                    'PrgEnv-cray_classic']
+                                    'PrgEnv-nvidia']
 
         self.use_multithreading = False
 
         self.prgenv_flags = {
-            'PrgEnv-cray_classic': ['-homp', '-O3'],
             'PrgEnv-cray': ['-fopenmp', '-O3'],
             'PrgEnv-gnu': ['-fopenmp', '-O3'],
             'PrgEnv-intel': ['-qopenmp', '-O3'],
-            'PrgEnv-pgi': ['-mp', '-O3']
+            'PrgEnv-pgi': ['-mp', '-O3'],
+            'PrgEnv-nvidia': ['-mp', '-O3']
         }
 
         if self.current_system.name in ['arolla', 'tsa']:
@@ -64,12 +64,6 @@ def __init__(self):
                                       self.stdout, 'triad', float)
         }
         self.stream_bw_reference = {
-            'PrgEnv-cray_classic': {
-                'daint:gpu': {'triad': (57000, -0.05, None, 'MB/s')},
-                'daint:mc': {'triad': (117000, -0.05, None, 'MB/s')},
-                'dom:gpu': {'triad': (57000, -0.05, None, 'MB/s')},
-                'dom:mc': {'triad': (117000, -0.05, None, 'MB/s')},
-            },
             'PrgEnv-cray': {
                 'daint:gpu': {'triad': (44000, -0.05, None, 'MB/s')},
                 'daint:mc': {'triad': (89000, -0.05, None, 'MB/s')},

cscs-checks/microbenchmarks/gpu/hooks.py

@@ -24,9 +24,6 @@ def set_gpu_arch(self):
         else:
             self.modules = ['cdt-cuda/21.05']
 
-        if cs == 'dom':
-            self.modules += ['cudatoolkit/11.1.0_3.39-4.1__g484e319']
-
     elif cs in {'arola', 'tsa'}:
         self.gpu_arch = '70'
         self.modules = ['cuda/10.1.243']

cscs-checks/prgenv/affinity_check.py

@@ -13,6 +13,12 @@
 from reframe.core.exceptions import SanityError
 
 
+def add_prgenv_nvidia(self):
+    cs = self.current_system.name
+    if cs in {'daint', 'dom'}:
+        self.valid_prog_environs += ['PrgEnv-nvidia']
+
+
 @rfm.simple_test
 class CompileAffinityTool(rfm.CompileOnlyRegressionTest):
     valid_systems = [
@@ -34,10 +40,21 @@ class CompileAffinityTool(rfm.CompileOnlyRegressionTest):
     maintainers = ['RS', 'SK']
     tags = {'production', 'scs', 'maintenance', 'craype'}
 
+    run_after('init')(bind(add_prgenv_nvidia))
+
     @run_before('compile')
     def set_build_opts(self):
         self.build_system.options = ['-C affinity', 'MPI=1']
 
+    @run_before('compile')
+    def prgenv_nvidia_workaround(self):
+        cs = self.current_system.name
+        ce = self.current_environ.name
+        if ce == 'PrgEnv-nvidia' and cs == 'dom':
+            self.build_system.cppflags = [
+                '-D__GCC_ATOMIC_TEST_AND_SET_TRUEVAL'
+            ]
+
     @run_before('sanity')
     def assert_exec_exists(self):
         self.sanity_patterns = sn.assert_found(r'affinity', self.stdout)
@@ -106,6 +123,8 @@ class to figure out the processor's topology. The content of this reference
     maintainers = ['RS', 'SK']
     tags = {'production', 'scs', 'maintenance', 'craype'}
 
+    run_after('init')(bind(add_prgenv_nvidia))
+
     @run_after('init')
     def set_deps(self):
         self.depends_on('CompileAffinityTool')

cscs-checks/prgenv/cuda/cuda_aware_mpi.py

@@ -47,6 +47,10 @@ def set_valid_prog_environs(self):
     def set_compilers(self):
         if self.current_environ.name == 'PrgEnv-pgi':
             self.build_system.cflags = ['-std=c99', ' -O3']
+        elif self.current_environ.name == 'PrgEnv-nvidia':
+            self.variables = {
+                'CUDA_HOME': '$CRAY_NVIDIA_PREFIX/cuda'
+            }
 
         gcd_flgs = (
             '-gencode arch=compute_{0},code=sm_{0}'.format(self.gpu_arch)

cscs-checks/prgenv/cuda/cuda_samples.py

@@ -53,8 +53,16 @@ def set_build_options(self):
         self.build_system.options = [
             f'SMS="{self.gpu_arch}"', f'CUDA_PATH=$CUDA_HOME'
         ]
+        cs = self.current_system.name
+        ce = self.current_environ.name
+        if cs == 'dom' and ce == 'PrgEnv-nvidia':
+            cuda_ver = 'v11.3-6-g95b7cea'
+        else:
+            cuda_ver = 'v11.0'
+
         self.prebuild_cmds = [
-            f'git checkout v11.0', f'cd Samples/{self.sample}'
+            f'git checkout {cuda_ver}',
+            f'cd Samples/{self.sample}'
         ]
 
     @run_before('run')

reframe/core/buildsystems.py

@@ -14,6 +14,10 @@
 
 class _UndefinedType:
     '''Used as an initial value for undefined values instead of None.'''
+    __slots__ = ()
+
+    def __deepcopy__(self, memo):
+        return self
 
 
 _Undefined = _UndefinedType()

reframe/core/meta.py

@@ -243,7 +243,7 @@ class was created or even at the instance level (e.g. doing
 
         blacklist = [
             'parameter', 'variable', 'bind', 'run_before', 'run_after',
-            'require_deps'
+            'require_deps', 'required'
         ]
         for b in blacklist:
             namespace.pop(b, None)

reframe/core/variables.py

@@ -493,6 +493,11 @@ def extend(self, cls):
             if key in self.vars:
                 self.vars[key].define(value)
                 _assigned_vars.add(key)
+            elif value is Undefined:
+                # Cannot be set as Undefined if not a variable
+                raise ValueError(
+                    f'{key!r} has not been declared as a variable'
+                )
 
         # Delete the vars from the class __dict__.
         for key in _assigned_vars:

unittests/test_meta.py

@@ -20,6 +20,7 @@ class MyTest(rfm.RegressionTest):
         run_before('run')(ext)
         run_after('run')(ext)
         require_deps(ext)
+        v = required
 
         def __init__(self):
             assert not hasattr(self, 'parameter')
@@ -28,6 +29,7 @@ def __init__(self):
             assert not hasattr(self, 'run_before')
             assert not hasattr(self, 'run_after')
             assert not hasattr(self, 'require_deps')
+            assert not hasattr(self, 'required')
 
     MyTest()
 

unittests/test_variables.py

@@ -170,6 +170,13 @@ def __init__(self):
     MyTest()
 
 
+def test_required_non_var():
+    msg = "'not_a_var' has not been declared as a variable"
+    with pytest.raises(ValueError, match=msg):
+        class Foo(rfm.RegressionTest):
+            not_a_var = required
+
+
 def test_invalid_field():
     class Foo:
         '''An invalid descriptor'''