Skip to content

Commit b2033ed

Browse files
author
Vasileios Karakasis
committed
Workaround for NetCDF tests for CDT20.06
1 parent f53604b commit b2033ed

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

cscs-checks/libraries/io/netcdf_compile_run.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import os
77

88
import reframe as rfm
9+
import reframe.utility.os_ext as os_ext
910
import reframe.utility.sanity as sn
1011

1112

@@ -113,6 +114,11 @@ def setflags(self):
113114
def cray_linker_workaround(self):
114115
# NOTE: Workaround for using CCE < 9.1 in CLE7.UP01.PS03 and above
115116
# See Patch Set README.txt for more details.
116-
if (self.current_system.name == 'dom' and
117-
self.current_environ.name == 'PrgEnv-cray'):
117+
cle = os_ext.cray_cle_info()
118+
if (cle.release == '7.0.UP01' and cle.patchset >= '03'):
118119
self.variables['LINKER_X86_64'] = '/usr/bin/ld'
120+
121+
@rfm.run_before('run')
122+
def cdt2006_cpp_workaround(self):
123+
if (os_ext.cray_cdt_version() == '20.06' and self.lang == 'cpp'):
124+
self.modules += ['cray-hdf5/1.10.6.1']

0 commit comments

Comments
 (0)