From 5a891b8083b1b1eb5eccd4c05e6e3914ce7ddcea Mon Sep 17 00:00:00 2001 From: ajocksch Date: Tue, 3 Mar 2020 09:50:15 +0100 Subject: [PATCH] petsc workaround intel --- cscs-checks/libraries/petsc/petsc_helloworld.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/cscs-checks/libraries/petsc/petsc_helloworld.py b/cscs-checks/libraries/petsc/petsc_helloworld.py index c52b9868f5..8cdee41f47 100644 --- a/cscs-checks/libraries/petsc/petsc_helloworld.py +++ b/cscs-checks/libraries/petsc/petsc_helloworld.py @@ -15,17 +15,18 @@ def __init__(self, linkage): '(%s linking)') % linkage self.valid_systems = ['daint:gpu', 'daint:mc', 'dom:gpu', 'dom:mc', 'tiger:gpu'] - self.valid_prog_environs = ['PrgEnv-cray', 'PrgEnv-gnu'] - if linkage == 'dynamic': - # FIXME: static compilation yields a link error in case of - # PrgEnv-intel (Cray Bug #255701) - self.valid_prog_environs += ['PrgEnv-intel'] - + self.valid_prog_environs = ['PrgEnv-cray', 'PrgEnv-gnu', + 'PrgEnv-intel'] self.sourcepath = 'poisson2d.c' self.modules = ['cray-petsc'] self.num_tasks = 16 self.num_tasks_per_node = 8 self.build_system = 'SingleSource' + # FIXME: static compilation yields a link error in case of + # PrgEnv-intel (Cray Bug #255701) workaround use C++ compiler + if linkage == 'static': + self.build_system.cc = 'CC' + self.variables = {'CRAYPE_LINK_TYPE': linkage} self.executable_opts = ['-da_grid_x 4', '-da_grid_y 4', '-ksp_monitor']