Skip to content

Commit 2f3cfcb

Browse files
author
Vasileios Karakasis
authored
Merge pull request #1138 from vkarak/test/remove-stale-fixme-tags
[test] Remove stale FIXME and NOTE tags from tests
2 parents d4ae03b + 371f1b6 commit 2f3cfcb

File tree

4 files changed

+7
-19
lines changed

4 files changed

+7
-19
lines changed

cscs-checks/libraries/math/trilinos_compile_run.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
@rfm.parameterized_test(['static'], ['dynamic'])
77
class TrilinosTest(rfm.RegressionTest):
88
def __init__(self, linkage):
9-
super().__init__()
109
self.valid_systems = ['daint:gpu', 'daint:mc', 'dom:gpu', 'dom:mc',
1110
'tiger:gpu']
1211
# NOTE: PrgEnv-cray in dynamic does not work because of CrayBug/809265
@@ -38,7 +37,7 @@ def __init__(self, linkage):
3837
self.maintainers = ['AJ', 'CB']
3938
self.tags = {'production', 'craype'}
4039

41-
def setup(self, partition, environ, **job_opts):
42-
prgenv_flags = self.prgenv_flags[environ.name]
43-
self.build_system.cxxflags = prgenv_flags
44-
super().setup(partition, environ, **job_opts)
40+
@rfm.run_before('compile')
41+
def set_cxxflags(self):
42+
flags = self.prgenv_flags[self.current_environ.name]
43+
self.build_system.cxxflags = flags

cscs-checks/mch/g2g_meteoswiss_check.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,9 @@
55
@rfm.parameterized_test([1], [2])
66
class G2GMeteoswissTest(rfm.RegressionTest):
77
def __init__(self, g2g):
8-
super().__init__()
98
self.descr = 'G2G Meteoswiss check with G2G=%s' % g2g
109
self.strict_check = False
1110
self.valid_systems = ['kesch:cn']
12-
13-
# FIXME: temporary workaround until the mvapich module is fixed;
14-
# 'PrgEnv-gnu-c2sm-gpu' will be added later
1511
self.valid_prog_environs = ['PrgEnv-gnu']
1612
self.exclusive_access = True
1713
self.modules = ['cmake']

cscs-checks/mch/gpu_direct_cuda.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,8 @@
66
@rfm.simple_test
77
class GpuDirectCudaCheck(rfm.RegressionTest):
88
def __init__(self):
9-
super().__init__()
109
self.descr = 'tests gpu-direct for CUDA'
1110
self.valid_systems = ['daint:gpu', 'dom:gpu', 'kesch:cn', 'tiger:gpu']
12-
# FIXME: temporary workaround until the mvapich module is fixed
13-
# 'PrgEnv-gnu-c2sm-gpu' will be added later
1411
self.valid_prog_environs = ['PrgEnv-gnu']
1512
self.sourcepath = 'gpu_direct_cuda.cu'
1613
self.build_system = 'SingleSource'

cscs-checks/tools/profiling_and_debugging/perftools.py

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ def __init__(self, lang):
2929
self.modules += ['craype-accel-nvidia60']
3030

3131
self.build_system = 'Make'
32-
# NOTE: Restrict concurrency to allow creation of Fortran modules
3332
if lang == 'F90':
33+
# NOTE: Restrict concurrency to allow creation of Fortran modules
3434
self.build_system.max_concurrency = 1
3535

3636
self.prgenv_flags = {
@@ -50,10 +50,6 @@ def __init__(self, lang):
5050
'LIB=-lstdc++']
5151

5252
self.executable = 'jacobi'
53-
# NOTE: Reduce time limit because for PrgEnv-pgi even if the output
54-
# is correct, the batch job uses all the time.
55-
self.time_limit = (0, 5, 0)
56-
5753
self.num_tasks = 3
5854
self.num_tasks_per_node = 3
5955
self.num_cpus_per_task = 4
@@ -94,8 +90,8 @@ def __init__(self, lang):
9490
self.maintainers = ['JG', 'MKr']
9591
self.tags = {'production', 'craype'}
9692

97-
def setup(self, environ, partition, **job_opts):
98-
super().setup(environ, partition, **job_opts)
93+
@rfm.run_before('compile')
94+
def setflags(self):
9995
flags = self.prgenv_flags[self.current_environ.name]
10096
self.build_system.cflags = flags
10197
self.build_system.cxxflags = flags

0 commit comments

Comments
 (0)