Address PR comments

Author: ekouts

cscs-checks/microbenchmarks/stream/stream.py

@@ -111,8 +111,8 @@ def __init__(self):
         self.tags = {'production', 'craype'}
         self.maintainers = ['RS', 'SK']
 
-    @rfm.run_before('compile')
-    def prepare_compile(self):
+    @rfm.run_after('setup')
+    def prepare_test(self):
         self.num_cpus_per_task = self.stream_cpus_per_task.get(
             self.current_partition.fullname, 1)
         self.variables['OMP_NUM_THREADS'] = str(self.num_cpus_per_task)

cscs-checks/prgenv/affinity_check.py

@@ -23,8 +23,8 @@ def __init__(self, variant):
         self.maintainers = ['RS', 'SK']
         self.tags = {'production', 'scs', 'maintenance', 'craype'}
 
-    @rfm.run_after('setup')
-    def prepare_test(self):
+    @rfm.run_before('sanity')
+    def set_sanity(self):
 
         def parse_cpus(x):
             return sorted([int(xi) for xi in x.split()])
@@ -48,8 +48,6 @@ def parse_cpus(x):
             re_aff_ranks, self.cases[self.variant][ref_key],
             'rank', int)
 
-        self.use_multithreading = self.cases[self.variant]['multithreading']
-
         # Ranks and threads can be extracted into lists in order to compare
         # them since the affinity programm prints them in ascending order.
         self.sanity_patterns = sn.all([
@@ -58,6 +56,10 @@ def parse_cpus(x):
             sn.assert_eq(sn.sorted(self.aff_cores), sn.sorted(self.ref_cores))
         ])
 
+    @rfm.run_before('run')
+    def set_multithreading(self):
+        self.use_multithreading = self.cases[self.variant]['multithreading']
+
 
 @rfm.parameterized_test(['omp_bind_threads'],
                         ['omp_bind_threads_nomultithread'],