Address PR comments

Author: Theofilos Manitaras

cscs-checks/libraries/io/hdf5_compile_run.py

@@ -76,12 +76,14 @@ def __init__(self, lang, linkage):
         self.maintainers = ['SO', 'RS']
         self.tags = {'production', 'craype'}
 
-    @rfm.run_after('setup')
-    def set_linker_variables(self):
+    @rfm.run_before('compile')
+    def cray_linker_workaround(self):
         # FIXME: static compilation yields a link error in case of
         # PrgEnv-cray(Cray Bug #255707)
-        if (self.linkage == 'static' and
-            self.current_system.name == 'dom' and
-            self.current_environ.name == 'PrgEnv-cray'):
-            self.variables = {'LINKER_X86_64': '/usr/bin/ld',
-                              'LINKER_AARCH64': '=/usr/bin/ld'}
+        if not (self.linkage == 'static' and
+                self.current_system.name == 'dom' and
+                self.current_environ.name == 'PrgEnv-cray'):
+            return
+
+        self.variables = {'LINKER_X86_64': '/usr/bin/ld',
+                          'LINKER_AARCH64': '/usr/bin/ld'}

cscs-checks/libraries/io/netcdf_compile_run.py

@@ -41,16 +41,7 @@ def __init__(self, lang, linkage):
         self.maintainers = ['AJ', 'SO']
         self.tags = {'production', 'craype', 'external-resources'}
 
-    @rfm.run_before('compile')
     def setflags(self):
-        # FIXME: static compilation yields a link error in case of
-        # PrgEnv-cray(Cray Bug #255707)
-        if (self.linkage == 'static' and
-            self.current_system.name == 'dom' and
-            self.current_environ.name == 'PrgEnv-cray'):
-            self.variables = {'LINKER_X86_64': '/usr/bin/ld',
-                              'LINKER_AARCH64': '=/usr/bin/ld'}
-
         if self.current_system.name == 'kesch':
             if self.current_environ.name == 'PrgEnv-cray-nompi':
                 self.modules = ['netcdf/4.4.1.1-gmvolf-17.02',
@@ -91,3 +82,15 @@ def setflags(self):
                 ]
         else:
             self.build_system.ldflags = ['-%s' % self.linkage]
+
+    @rfm.run_before('compile')
+    def cray_linker_workaround(self):
+        # FIXME: static compilation yields a link error in case of
+        # PrgEnv-cray(Cray Bug #255707)
+        if not (self.linkage == 'static' and
+                self.current_system.name == 'dom' and
+                self.current_environ.name == 'PrgEnv-cray'):
+            return
+
+        self.variables = {'LINKER_X86_64': '/usr/bin/ld',
+                          'LINKER_AARCH64': '/usr/bin/ld'}

cscs-checks/libraries/math/scalapack_compile_run.py

@@ -29,14 +29,16 @@ def __init__(self, linkage):
         self.tags = {'production', 'external-resources'}
 
     @rfm.run_before('compile')
-    def set_linker_variables(self):
+    def cray_linker_workaround(self):
         # FIXME: static compilation yields a link error in case of
         # PrgEnv-cray(Cray Bug #255707)
-        if (self.linkage == 'static' and
-            self.current_system.name == 'dom' and
-            self.current_environ.name == 'PrgEnv-cray'):
-            self.variables = {'LINKER_X86_64': '/usr/bin/ld',
-                              'LINKER_AARCH64': '=/usr/bin/ld'}
+        if not (self.linkage == 'static' and
+                self.current_system.name == 'dom' and
+                self.current_environ.name == 'PrgEnv-cray'):
+            return
+
+        self.variables.update({'LINKER_X86_64': '/usr/bin/ld',
+                               'LINKER_AARCH64': '/usr/bin/ld'})
 
 
 @rfm.required_version('>=2.14')
@@ -45,9 +47,6 @@ class ScaLAPACKSanity(ScaLAPACKTest):
     def __init__(self, linkage):
         super().__init__(linkage)
         self.sourcepath = 'scalapack_compile_run.f'
-        if linkage == 'static':
-            self.variables['LINKER_X86_64'] = '/usr/bin/ld'
-            self.variables['LINKER_AARCH64'] = '/usr/bin/ld'
 
         def fortran_float(value):
             return float(value.replace('D', 'E'))

cscs-checks/prgenv/helloworld.py

@@ -84,14 +84,6 @@ def num_ranks(match):
 
     @rfm.run_before('compile')
     def setflags(self):
-        # FIXME: static compilation yields a link error in case of
-        # PrgEnv-cray(Cray Bug #255707)
-        if (self.linkage == 'static' and
-            self.current_system.name == 'dom' and
-            self.current_environ.name.startswith('PrgEnv-cray')):
-            self.variables = {'LINKER_X86_64': '/usr/bin/ld',
-                              'LINKER_AARCH64': '=/usr/bin/ld'}
-
         envname = self.current_environ.name.replace('-nompi', '')
         prgenv_flags = self.prgenv_flags[envname]
         self.build_system.cflags = prgenv_flags
@@ -107,6 +99,18 @@ def compile_timer_end(self):
         elapsed = datetime.now() - self.compilation_time_seconds
         self.compilation_time_seconds = elapsed.total_seconds()
 
+    @rfm.run_before('compile')
+    def cray_linker_workaround(self):
+        # FIXME: static compilation yields a link error in case of
+        # PrgEnv-cray(Cray Bug #255707)
+        if not (self.linkage == 'static' and
+                self.current_system.name == 'dom' and
+                self.current_environ.name.startswith('PrgEnv-cray')):
+            return
+
+        self.variables.update({'LINKER_X86_64': '/usr/bin/ld',
+                               'LINKER_AARCH64': '/usr/bin/ld'})
+
 
 @rfm.required_version('>=2.14')
 @rfm.parameterized_test(*([lang, linkage]
@@ -164,7 +168,9 @@ def __init__(self, lang, linkage):
 
         # On SLURM there is no need to set OMP_NUM_THREADS if one defines
         # num_cpus_per_task, but adding for completeness and portability
-        self.variables['OMP_NUM_THREADS']: str(self.num_cpus_per_task)
+        self.variables = {
+            'OMP_NUM_THREADS':  str(self.num_cpus_per_task)
+        }
 
 
 @rfm.required_version('>=2.14')
@@ -217,4 +223,6 @@ def __init__(self, lang, linkage):
 
         # On SLURM there is no need to set OMP_NUM_THREADS if one defines
         # num_cpus_per_task, but adding for completeness and portability
-        self.variables['OMP_NUM_THREADS'] = str(self.num_cpus_per_task)
+        self.variables = {
+            'OMP_NUM_THREADS': str(self.num_cpus_per_task)
+        }