From 5b116b52679b5cd5f4731272511641cb877fcb4d Mon Sep 17 00:00:00 2001 From: Javier Otero Date: Tue, 22 Jun 2021 10:11:23 +0200 Subject: [PATCH 1/2] Update cuda-samples repo checkout --- cscs-checks/microbenchmarks/gpu/hooks.py | 3 --- cscs-checks/prgenv/cuda/cuda_samples.py | 3 ++- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/cscs-checks/microbenchmarks/gpu/hooks.py b/cscs-checks/microbenchmarks/gpu/hooks.py index 7a5f049690..2cbead4b99 100644 --- a/cscs-checks/microbenchmarks/gpu/hooks.py +++ b/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'] diff --git a/cscs-checks/prgenv/cuda/cuda_samples.py b/cscs-checks/prgenv/cuda/cuda_samples.py index ecee46a25e..a57914adc4 100644 --- a/cscs-checks/prgenv/cuda/cuda_samples.py +++ b/cscs-checks/prgenv/cuda/cuda_samples.py @@ -54,7 +54,8 @@ def set_build_options(self): f'SMS="{self.gpu_arch}"', f'CUDA_PATH=$CUDA_HOME' ] self.prebuild_cmds = [ - f'git checkout v11.0', f'cd Samples/{self.sample}' + f'git checkout v11.3-6-g95b7cea', + f'cd Samples/{self.sample}' ] @run_before('run') From 335a7e4e96d27991e7ef6b0a8e51b8cea2561033 Mon Sep 17 00:00:00 2001 From: Javier Otero Date: Tue, 22 Jun 2021 12:17:18 +0200 Subject: [PATCH 2/2] Add conditional checkout version --- cscs-checks/prgenv/cuda/cuda_samples.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/cscs-checks/prgenv/cuda/cuda_samples.py b/cscs-checks/prgenv/cuda/cuda_samples.py index a57914adc4..2ce0139f87 100644 --- a/cscs-checks/prgenv/cuda/cuda_samples.py +++ b/cscs-checks/prgenv/cuda/cuda_samples.py @@ -53,8 +53,15 @@ 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.3-6-g95b7cea', + f'git checkout {cuda_ver}', f'cd Samples/{self.sample}' ]