Skip to content

[feat] Support CUDA Fortran file extensions in SingleSource #1677

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 7 commits into from
Jan 13, 2021
Merged

[feat] Support CUDA Fortran file extensions in SingleSource #1677

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
743e496
Support CUDA Fortran file extensions in SingleSource
Jan 8, 2021
77d9d79
Correct indentation
Jan 8, 2021
b9c30ec
Add workaround for CUDA 11.0
Jan 11, 2021
9928a11
Fix pep8 for FIXME
Jan 11, 2021
4285478
Add case number to FIXME
Jan 12, 2021
2d4512d
Further comment improvement
Jan 12, 2021
bb3b985
Merge branch 'master' into enhancement/guess_cudafortran
Jan 12, 2021
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
15 changes: 9 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 @@ -13,9 +13,10 @@ class CUDAFortranCheck(rfm.RegressionTest):
def __init__(self):
self.valid_systems = ['daint:gpu', 'dom:gpu']
self.valid_prog_environs = ['PrgEnv-pgi']
self.sourcepath = 'vecAdd_cuda.f90'
self.sourcepath = 'vecAdd_cuda.cuf'
self.modules = ['craype-accel-nvidia60']
self.build_system = 'SingleSource'
self.build_system.fflags = ['-ta=tesla:cc60']
self.num_gpus_per_node = 1
result = sn.extractsingle(r'final result:\s+(?P<result>\d+\.?\d*)',
self.stdout, 'result', float)
Expand All @@ -24,13 +25,15 @@ def __init__(self):
self.tags = {'production', 'craype'}

@rfm.run_before('compile')
def cdt2006_pgi_workaround(self):
def cdt_pgi_workaround(self):
cdt = osext.cray_cdt_version()
if not cdt:
return

if (self.current_environ.name == 'PrgEnv-pgi' and cdt == '20.08'):
self.build_system.fflags = [
'CUDA_HOME=$CUDATOOLKIT_HOME',
'-ta=tesla:cc60', '-Mcuda=cuda10.2'
if cdt == '20.08':
self.build_system.fflags += [
'CUDA_HOME=$CUDATOOLKIT_HOME', '-Mcuda=cuda10.2'
]
else:
# FIXME: PGI 20.x does not support CUDA 11, see case #275674
self.modules += ['cudatoolkit/10.2.89_3.29-7.0.2.1_3.5__g67354b4']
0 ...s/prgenv/cuda-fortran/src/vecAdd_cuda.f90 → ...s/prgenv/cuda-fortran/src/vecAdd_cuda.cuf
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion reframe/core/buildsystems.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -448,7 +448,7 @@ def _guess_language(self, filename):

if ext in ['.f', '.for', '.ftn', '.F', '.FOR', '.fpp',
'.FPP', '.FTN', '.f90', '.f95', '.f03', '.f08',
'.F90', '.F95', '.F03', '.F08']:
'.F90', '.F95', '.F03', '.F08', '.cuf', '.CUF']:
return 'Fortran'

if ext in ['.cu']:
Expand Down