From d680299bd7480c1138db5956910e091513ffe9b9 Mon Sep 17 00:00:00 2001 From: jg Date: Fri, 11 Oct 2019 08:02:15 -0500 Subject: [PATCH 1/2] tiger --- cscs-checks/mch/gpu_direct_acc.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/cscs-checks/mch/gpu_direct_acc.py b/cscs-checks/mch/gpu_direct_acc.py index ab783bc9db..3d5eb261a0 100644 --- a/cscs-checks/mch/gpu_direct_acc.py +++ b/cscs-checks/mch/gpu_direct_acc.py @@ -1,3 +1,4 @@ +import os import reframe as rfm import reframe.utility.sanity as sn @@ -11,9 +12,14 @@ def __init__(self): self.valid_systems = ['daint:gpu', 'dom:gpu', 'kesch:cn'] self.valid_prog_environs = ['PrgEnv-cray', 'PrgEnv-pgi'] - if self.current_system.name in ['daint', 'dom']: + if self.current_system.name in ['daint', 'dom', 'tiger']: self.modules = ['craype-accel-nvidia60'] - self.variables = {'MPICH_RDMA_ENABLED_CUDA': '1'} + self.variables = { + 'MPICH_RDMA_ENABLED_CUDA': '1', + # this is mandatory to have the Cray wrapper compiling + # OpenACC codes correctly: + 'PATH': '%s:$PATH' % os.environ['CRAY_BINUTILS_BIN'] + } self.num_tasks = 2 self.num_gpus_per_node = 1 self.num_tasks_per_node = 1 @@ -31,6 +37,7 @@ def __init__(self): self.sourcepath = 'gpu_direct_acc.F90' self.build_system = 'SingleSource' + self.prebuild_cmd = ['module list -l'] self.sanity_patterns = sn.all([ sn.assert_found(r'GPU with OpenACC', self.stdout), sn.assert_found(r'Result :\s+OK', self.stdout) From 17b5b8eb4da20bb5d967798542740a83c7665eba Mon Sep 17 00:00:00 2001 From: jg Date: Mon, 21 Oct 2019 06:15:52 -0500 Subject: [PATCH 2/2] fix for comment --- cscs-checks/mch/gpu_direct_acc.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/cscs-checks/mch/gpu_direct_acc.py b/cscs-checks/mch/gpu_direct_acc.py index c5d86a46cd..15ed1f5265 100644 --- a/cscs-checks/mch/gpu_direct_acc.py +++ b/cscs-checks/mch/gpu_direct_acc.py @@ -16,10 +16,12 @@ def __init__(self): self.modules = ['craype-accel-nvidia60'] self.variables = { 'MPICH_RDMA_ENABLED_CUDA': '1', - # this is mandatory to have the Cray wrapper compiling - # OpenACC codes correctly: - 'PATH': '%s:$PATH' % os.environ['CRAY_BINUTILS_BIN'] } + + if self.current_system.name in ['tiger']: + craypath = '%s:$PATH' % os.environ['CRAY_BINUTILS_BIN'] + self.variables['PATH'] = craypath + self.num_tasks = 2 self.num_gpus_per_node = 1 self.num_tasks_per_node = 1