zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Flang NVidia offload fix (#18965)

Browse Source 
* Make release_90 preferred version.

* Be more explicity about CUDA dependencies.

* Remove duplicate CUDA dependency in Flang package and introduce nvptx variant.

* Fix nvptx variant message.
This commit is contained in:
Nichols A. Romero 2020-10-14 11:35:25 -05:00 committed by GitHub
parent 383b5b70cc
commit 2651fab8d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
var/spack/repos/builtin/packages/flang/package.py
View File

@ -8,7 +8,7 @@
import os import os
class Flang(CMakePackage, CudaPackage): class Flang(CMakePackage):
"""Flang is a Fortran compiler targeting LLVM.""" """Flang is a Fortran compiler targeting LLVM."""
homepage = "https://github.com/flang-compiler/flang" homepage = "https://github.com/flang-compiler/flang"
@ -24,17 +24,27 @@ class Flang(CMakePackage, CudaPackage):
version('20180921', sha256='f33bd1f054e474f1e8a204bb6f78d42f8f6ecf7a894fdddc3999f7c272350784') version('20180921', sha256='f33bd1f054e474f1e8a204bb6f78d42f8f6ecf7a894fdddc3999f7c272350784')
version('20180612', sha256='6af858bea013548e091371a97726ac784edbd4ff876222575eaae48a3c2920ed') version('20180612', sha256='6af858bea013548e091371a97726ac784edbd4ff876222575eaae48a3c2920ed')
# variants
msg = ('Target OpenMP offloading to NVIDIA GPUs '
'(experimental w/ no support). '
'Only works with GCC compilers compatible with CUDA 9.x. '
'Specify ^llvm-flang+cuda cuda_arch=<value> explictly.')
variant('nvptx',
default=False,
description=msg)
# Patched only relevant for March 2019 release with OpenMP Offload support # Patched only relevant for March 2019 release with OpenMP Offload support
patch('https://github.com/flang-compiler/flang/commit/b342225a64692d2b9c3aff7658a8e4f94a8923eb.diff', patch('https://github.com/flang-compiler/flang/commit/b342225a64692d2b9c3aff7658a8e4f94a8923eb.diff',
sha256='3bd2c7453131eaaf11328785a3031fa2298bdd0c02cfd5e2b478e6e847d5da43', sha256='3bd2c7453131eaaf11328785a3031fa2298bdd0c02cfd5e2b478e6e847d5da43',
when='@20190329 +cuda') when='@20190329 +nvptx')
# Build dependency # Build dependency
depends_on('cmake@3.8:', type='build') depends_on('cmake@3.8:', type='build')
depends_on('python@2.7:', type='build') depends_on('python@2.7:', type='build')
depends_on('llvm-flang@release_90', when='@master') depends_on('llvm-flang@release_90', when='@master ~nvptx')
depends_on('llvm-flang@20190329', when='@20190329') depends_on('llvm-flang@20190329', when='@20190329 ~nvptx')
depends_on('llvm-flang@20181226_70', when='@20181226') depends_on('llvm-flang@20181226_70', when='@20181226')
depends_on('llvm-flang@20180921', when='@20180921') depends_on('llvm-flang@20180921', when='@20180921')
depends_on('llvm-flang@20180612', when='@20180612') depends_on('llvm-flang@20180612', when='@20180612')
@ -45,10 +55,11 @@ class Flang(CMakePackage, CudaPackage):
depends_on('pgmath@20180921', when='@20180921') depends_on('pgmath@20180921', when='@20180921')
depends_on('pgmath@20180612', when='@20180612') depends_on('pgmath@20180612', when='@20180612')
depends_on('llvm-flang +cuda', when='+cuda') depends_on('llvm-flang+cuda@release_70', when='@master +nvptx')
depends_on('llvm-flang+cuda@20190329', when='@20190329 +nvptx')
# conflicts # conflicts
conflicts('+cuda', when='@:20181226', conflicts('+nvptx', when='@:20181226',
msg='OpenMP offload to NVidia GPUs available 20190329 or later') msg='OpenMP offload to NVidia GPUs available 20190329 or later')
# Spurious problems running in parallel the Makefile # Spurious problems running in parallel the Makefile

8
var/spack/repos/builtin/packages/llvm-flang/package.py
View File

@ -16,7 +16,7 @@ class LlvmFlang(CMakePackage, CudaPackage):
maintainer = ['naromero77'] maintainer = ['naromero77']
version('release_90', branch='release_90') version('release_90', branch='release_90', preferred=True)
version('release_80', branch='release_80') version('release_80', branch='release_80')
version('release_70', branch='release_70') version('release_70', branch='release_70')
version('release_60', branch='release_60') version('release_60', branch='release_60')
@ -46,7 +46,11 @@ class LlvmFlang(CMakePackage, CudaPackage):
# libomptarget dependencies # libomptarget dependencies
depends_on('libelf', when='+cuda') depends_on('libelf', when='+cuda')
depends_on('libffi', when='+cuda') depends_on('libffi', when='+cuda')
depends_on('cuda@:9', when='+cuda') # llvm 7 not compatible with newer version of cuda # note that there may be other llvm-flang + cuda conflicts, but these
# are the only versions that are relevant for the flang+nvptx package
# llvm 7 not compatible with newer version of cuda
depends_on('cuda@:9', when='+cuda@release_70')
depends_on('cuda@:9', when='+cuda@20190329')
# LLVM-Flang Componentes: Driver, OpenMP # LLVM-Flang Componentes: Driver, OpenMP
resource(name='flang-driver', resource(name='flang-driver',