Fix CUDA Fortran + OpenACC tests

Author: Vasileios Karakasis

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')

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')