From e47b43713afe4677e95c87d47e32078ce858abfa Mon Sep 17 00:00:00 2001 From: Vasileios Karakasis Date: Tue, 14 Sep 2021 09:19:51 +0200 Subject: [PATCH] Fix CUDA Fortran + OpenACC tests --- cscs-checks/prgenv/cuda-fortran/cuda_fortran_check.py | 8 ++------ cscs-checks/prgenv/openacc_checks.py | 9 ++------- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/cscs-checks/prgenv/cuda-fortran/cuda_fortran_check.py b/cscs-checks/prgenv/cuda-fortran/cuda_fortran_check.py index cf66339414..67be5cdcb8 100644 --- a/cscs-checks/prgenv/cuda-fortran/cuda_fortran_check.py +++ b/cscs-checks/prgenv/cuda-fortran/cuda_fortran_check.py @@ -31,12 +31,8 @@ def set_fflags(self): # FIXME: PGI 20.x does not support CUDA 11, see case #275674 @run_before('compile') def cudatoolkit_pgi_20x_workaround(self): - if self.current_system.name == 'daint': - cudatoolkit_version = '10.2.89_3.29-7.0.2.1_3.27__g67354b4' - else: - self.variables['CUDA_HOME'] = '$CUDATOOLKIT_HOME' - cudatoolkit_version = '10.2.89_3.28-2.1__g52c0314' - + cudatoolkit_version = '10.2.89_3.28-2.1__g52c0314' + self.variables['CUDA_HOME'] = '$CUDATOOLKIT_HOME' self.modules += [f'cudatoolkit/{cudatoolkit_version}'] @run_before('sanity') diff --git a/cscs-checks/prgenv/openacc_checks.py b/cscs-checks/prgenv/openacc_checks.py index b821f4ac20..ea08f6812c 100644 --- a/cscs-checks/prgenv/openacc_checks.py +++ b/cscs-checks/prgenv/openacc_checks.py @@ -53,14 +53,9 @@ def set_variables(self): # FIXME: PGI 20.x does not support CUDA 11, see case #275674 @run_before('compile') def cudatoolkit_pgi_20x_workaround(self): - # FIXME: Align cudatoolkit versions when daint/dom are in sync - if self.current_system.name == 'daint': - cudatoolkit_version = '10.2.89_3.29-7.0.2.1_3.27__g67354b4' - elif self.current_system.name == 'dom': - self.variables['CUDA_HOME'] = '$CUDATOOLKIT_HOME' - cudatoolkit_version = '10.2.89_3.28-2.1__g52c0314' - if self.current_system.name in {'daint', 'dom'}: + cudatoolkit_version = '10.2.89_3.28-2.1__g52c0314' + self.variables['CUDA_HOME'] = '$CUDATOOLKIT_HOME' self.modules += [f'cudatoolkit/{cudatoolkit_version}'] @run_before('compile')