Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions cscs-checks/libraries/math/trilinos_compile_run.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
@rfm.parameterized_test(['static'], ['dynamic'])
class TrilinosTest(rfm.RegressionTest):
def __init__(self, linkage):
super().__init__()
self.valid_systems = ['daint:gpu', 'daint:mc', 'dom:gpu', 'dom:mc',
'tiger:gpu']
# NOTE: PrgEnv-cray in dynamic does not work because of CrayBug/809265
Expand Down Expand Up @@ -38,7 +37,7 @@ def __init__(self, linkage):
self.maintainers = ['AJ', 'CB']
self.tags = {'production', 'craype'}

def setup(self, partition, environ, **job_opts):
prgenv_flags = self.prgenv_flags[environ.name]
self.build_system.cxxflags = prgenv_flags
super().setup(partition, environ, **job_opts)
@rfm.run_before('compile')
def set_cxxflags(self):
flags = self.prgenv_flags[self.current_environ.name]
self.build_system.cxxflags = flags
4 changes: 0 additions & 4 deletions cscs-checks/mch/g2g_meteoswiss_check.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,9 @@
@rfm.parameterized_test([1], [2])
class G2GMeteoswissTest(rfm.RegressionTest):
def __init__(self, g2g):
super().__init__()
self.descr = 'G2G Meteoswiss check with G2G=%s' % g2g
self.strict_check = False
self.valid_systems = ['kesch:cn']

# FIXME: temporary workaround until the mvapich module is fixed;
# 'PrgEnv-gnu-c2sm-gpu' will be added later
self.valid_prog_environs = ['PrgEnv-gnu']
self.exclusive_access = True
self.modules = ['cmake']
Expand Down
3 changes: 0 additions & 3 deletions cscs-checks/mch/gpu_direct_cuda.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,8 @@
@rfm.simple_test
class GpuDirectCudaCheck(rfm.RegressionTest):
def __init__(self):
super().__init__()
self.descr = 'tests gpu-direct for CUDA'
self.valid_systems = ['daint:gpu', 'dom:gpu', 'kesch:cn', 'tiger:gpu']
# FIXME: temporary workaround until the mvapich module is fixed
# 'PrgEnv-gnu-c2sm-gpu' will be added later
self.valid_prog_environs = ['PrgEnv-gnu']
self.sourcepath = 'gpu_direct_cuda.cu'
self.build_system = 'SingleSource'
Expand Down
10 changes: 3 additions & 7 deletions cscs-checks/tools/profiling_and_debugging/perftools.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ def __init__(self, lang):
self.modules += ['craype-accel-nvidia60']

self.build_system = 'Make'
# NOTE: Restrict concurrency to allow creation of Fortran modules
if lang == 'F90':
# NOTE: Restrict concurrency to allow creation of Fortran modules
self.build_system.max_concurrency = 1

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

self.executable = 'jacobi'
# NOTE: Reduce time limit because for PrgEnv-pgi even if the output
# is correct, the batch job uses all the time.
self.time_limit = (0, 5, 0)

self.num_tasks = 3
self.num_tasks_per_node = 3
self.num_cpus_per_task = 4
Expand Down Expand Up @@ -94,8 +90,8 @@ def __init__(self, lang):
self.maintainers = ['JG', 'MKr']
self.tags = {'production', 'craype'}

def setup(self, environ, partition, **job_opts):
super().setup(environ, partition, **job_opts)
@rfm.run_before('compile')
def setflags(self):
flags = self.prgenv_flags[self.current_environ.name]
self.build_system.cflags = flags
self.build_system.cxxflags = flags
Expand Down