Merge pull request #2026 from jjotero/bugfix/cuda_samples

[test] Update checkout version of the `cuda-samples` repo

Author: jjotero

cscs-checks/microbenchmarks/gpu/hooks.py

@@ -24,9 +24,6 @@ def set_gpu_arch(self):
         else:
             self.modules = ['cdt-cuda/21.05']
 
-        if cs == 'dom':
-            self.modules += ['cudatoolkit/11.1.0_3.39-4.1__g484e319']
-
     elif cs in {'arola', 'tsa'}:
         self.gpu_arch = '70'
         self.modules = ['cuda/10.1.243']

cscs-checks/prgenv/cuda/cuda_samples.py

@@ -53,8 +53,16 @@ def set_build_options(self):
         self.build_system.options = [
             f'SMS="{self.gpu_arch}"', f'CUDA_PATH=$CUDA_HOME'
         ]
+        cs = self.current_system.name
+        ce = self.current_environ.name
+        if cs == 'dom' and ce == 'PrgEnv-nvidia':
+            cuda_ver = 'v11.3-6-g95b7cea'
+        else:
+            cuda_ver = 'v11.0'
+
         self.prebuild_cmds = [
-            f'git checkout v11.0', f'cd Samples/{self.sample}'
+            f'git checkout {cuda_ver}',
+            f'cd Samples/{self.sample}'
         ]
 
     @run_before('run')