Skip to content

[test] Fix CUDA Fortran + OpenACC tests #2193

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 14, 2021
Merged

[test] Fix CUDA Fortran + OpenACC tests #2193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions cscs-checks/prgenv/cuda-fortran/cuda_fortran_check.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
9 changes: 2 additions & 7 deletions cscs-checks/prgenv/openacc_checks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down