Merge branch 'master' into bugfix/cuda_samples

Author: jjotero

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/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')

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()