From 69dc2ff92334066a0d92f3e04fa986343efe3b50 Mon Sep 17 00:00:00 2001 From: Theofilos Manitaras Date: Thu, 27 Jun 2019 09:10:40 +0200 Subject: [PATCH] Update the Trilinos tests * Enable dynamic tests. * Update test for cdt/19.06 --- .../libraries/math/trilinos_compile_run.py | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/cscs-checks/libraries/math/trilinos_compile_run.py b/cscs-checks/libraries/math/trilinos_compile_run.py index 7560ab9792..1f9a94a887 100644 --- a/cscs-checks/libraries/math/trilinos_compile_run.py +++ b/cscs-checks/libraries/math/trilinos_compile_run.py @@ -2,10 +2,8 @@ import reframe.utility.sanity as sn -# NOTE: The 'dynamic' version of the tests gets stuck in compilation for -# both PrgEnv-gnu and PrgEnv-intel @rfm.required_version('>=2.14') -@rfm.parameterized_test(['static']) +@rfm.parameterized_test(['static'], ['dynamic']) class TrilinosTest(rfm.RegressionTest): def __init__(self, linkage): super().__init__() @@ -13,9 +11,9 @@ def __init__(self, linkage): 'dom:gpu', 'dom:mc'] # NOTE: PrgEnv-cray in dynamic does not work because of CrayBug/809265 - # NOTE: PrgEnv-cray in static produces segmentation fault, - # Cray Case #222133 self.valid_prog_environs = ['PrgEnv-gnu', 'PrgEnv-intel'] + if linkage == 'static': + self.valid_prog_environs += ['PrgEnv-cray'] self.build_system = 'SingleSource' self.build_system.ldflags = ['-%s' % linkage, '-lparmetis'] @@ -30,10 +28,8 @@ def __init__(self, linkage): self.pre_run = ['wget ftp://math.nist.gov/pub/MatrixMarket2/' 'misc/hamm/add20.rua.gz', 'gunzip add20.rua.gz'] self.executable_opts = ['add20.rua'] - - # NOTE: default cray-trilinos module in PE/18.08 does not work self.modules = ['cray-mpich', 'cray-hdf5-parallel', - 'cray-tpsl', 'cray-trilinos/12.12.1.1'] + 'cray-tpsl', 'cray-trilinos'] self.num_tasks = 2 self.num_tasks_per_node = 2 self.variables = {'OMP_NUM_THREADS': '1'} @@ -46,8 +42,4 @@ def __init__(self, linkage): def setup(self, partition, environ, **job_opts): prgenv_flags = self.prgenv_flags[environ.name] self.build_system.cxxflags = prgenv_flags - if environ.name == 'PrgEnv-intel': - # CrayBug/836679 - self.modules += ['gcc'] - super().setup(partition, environ, **job_opts)