From c2da70d34c72deba32880b5381f6903340b96a0b Mon Sep 17 00:00:00 2001 From: ajocksch Date: Fri, 25 Jun 2021 18:25:36 +0200 Subject: [PATCH 1/4] [test] Update haswell_fma_check --- cscs-checks/compile/haswell_fma_check.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cscs-checks/compile/haswell_fma_check.py b/cscs-checks/compile/haswell_fma_check.py index 7b759eaa30..bba6180a41 100644 --- a/cscs-checks/compile/haswell_fma_check.py +++ b/cscs-checks/compile/haswell_fma_check.py @@ -13,7 +13,8 @@ def __init__(self): self.descr = 'check for avx2 instructions' self.valid_systems = ['dom:login', 'daint:login'] self.valid_prog_environs = ['PrgEnv-cray', 'PrgEnv-gnu', - 'PrgEnv-intel', 'PrgEnv-pgi'] + 'PrgEnv-intel', 'PrgEnv-pgi', + 'PrgEnv-nvidia'] self.modules = ['craype-haswell'] self.sourcesdir = 'src/haswell_fma' From e4c1debe3004154486c8c94fe19a7423f78e694b Mon Sep 17 00:00:00 2001 From: ajocksch Date: Mon, 28 Jun 2021 15:48:11 +0200 Subject: [PATCH 2/4] [test] Update cuda_fortran_check --- .../prgenv/cuda-fortran/cuda_fortran_check.py | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/cscs-checks/prgenv/cuda-fortran/cuda_fortran_check.py b/cscs-checks/prgenv/cuda-fortran/cuda_fortran_check.py index a4176982ab..ddc0686ea0 100644 --- a/cscs-checks/prgenv/cuda-fortran/cuda_fortran_check.py +++ b/cscs-checks/prgenv/cuda-fortran/cuda_fortran_check.py @@ -11,11 +11,10 @@ class CUDAFortranCheck(rfm.RegressionTest): def __init__(self): self.valid_systems = ['daint:gpu', 'dom:gpu'] - self.valid_prog_environs = ['PrgEnv-pgi'] + self.valid_prog_environs = ['PrgEnv-pgi', 'PrgEnv-nvidia'] self.sourcepath = 'vecAdd_cuda.cuf' - self.modules = ['craype-accel-nvidia60'] self.build_system = 'SingleSource' - self.build_system.fflags = ['-ta=tesla:cc60'] + self.build_system.fflags = ['-ta=tesla:cc60', '-lcublas', '-lcusparse'] self.num_gpus_per_node = 1 result = sn.extractsingle(r'final result:\s+(?P\d+\.?\d*)', self.stdout, 'result', float) @@ -23,8 +22,13 @@ def __init__(self): self.maintainers = ['TM', 'AJ'] self.tags = {'production', 'craype'} - # FIXME: PGI 20.x does not support CUDA 11, see case #275674 @run_before('compile') - def cudatoolkit_pgi_20x_workaround(self): - cudatoolkit_version = '10.2.89_3.29-7.0.2.1_3.27__g67354b4' - self.modules += [f'cudatoolkit/{cudatoolkit_version}'] + def pgi_20x_and_prgenv_nvidia_workaround(self): + if self.current_system.name in ['daint']: + self.modules += [f'cudatoolkit/{cudatoolkit_version}'] + if self.current_environ.name.startswith('PrgEnv-nvidia'): + self.skip('PrgEnv-nvidia not supported on Daint') + elif self.current_system.name in ['dom']: + self.modules += [f'cdt-cuda/21.05'] + if self.current_environ.name.startswith('PrgEnv-pgi'): + self.skip('PrgEnv-pgi not supported on Dom') From 8a0232391c0501aa1b5bc9a3c76eb4afa06a8dca Mon Sep 17 00:00:00 2001 From: ajocksch Date: Mon, 28 Jun 2021 15:50:26 +0200 Subject: [PATCH 3/4] small fix --- cscs-checks/prgenv/cuda-fortran/cuda_fortran_check.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cscs-checks/prgenv/cuda-fortran/cuda_fortran_check.py b/cscs-checks/prgenv/cuda-fortran/cuda_fortran_check.py index ddc0686ea0..b21a3fc6f6 100644 --- a/cscs-checks/prgenv/cuda-fortran/cuda_fortran_check.py +++ b/cscs-checks/prgenv/cuda-fortran/cuda_fortran_check.py @@ -14,7 +14,7 @@ def __init__(self): self.valid_prog_environs = ['PrgEnv-pgi', 'PrgEnv-nvidia'] self.sourcepath = 'vecAdd_cuda.cuf' self.build_system = 'SingleSource' - self.build_system.fflags = ['-ta=tesla:cc60', '-lcublas', '-lcusparse'] + self.build_system.fflags = ['-ta=tesla:cc60'] self.num_gpus_per_node = 1 result = sn.extractsingle(r'final result:\s+(?P\d+\.?\d*)', self.stdout, 'result', float) From 235394e29f874a70a271a2c46d72bce815276f1c Mon Sep 17 00:00:00 2001 From: ajocksch Date: Mon, 28 Jun 2021 15:54:13 +0200 Subject: [PATCH 4/4] another fix --- cscs-checks/compile/haswell_fma_check.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cscs-checks/compile/haswell_fma_check.py b/cscs-checks/compile/haswell_fma_check.py index bba6180a41..7b759eaa30 100644 --- a/cscs-checks/compile/haswell_fma_check.py +++ b/cscs-checks/compile/haswell_fma_check.py @@ -13,8 +13,7 @@ def __init__(self): self.descr = 'check for avx2 instructions' self.valid_systems = ['dom:login', 'daint:login'] self.valid_prog_environs = ['PrgEnv-cray', 'PrgEnv-gnu', - 'PrgEnv-intel', 'PrgEnv-pgi', - 'PrgEnv-nvidia'] + 'PrgEnv-intel', 'PrgEnv-pgi'] self.modules = ['craype-haswell'] self.sourcesdir = 'src/haswell_fma'