diff options
| author | Adam J. Stewart <ajstewart426@gmail.com> | 2017-06-16 10:00:19 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-16 10:00:19 -0500 |
| commit | 60db73a3f516c8cd94169700ee98295211dc5dc1 (patch) | |
| tree | 861634a01e7d935d65bdd0f6d56b3cdb26175144 /var | |
| parent | f6e3ad4d9058cacca1a01ffefae53bb354a75961 (diff) | |
| download | spack-60db73a3f516c8cd94169700ee98295211dc5dc1.tar.gz spack-60db73a3f516c8cd94169700ee98295211dc5dc1.tar.bz2 spack-60db73a3f516c8cd94169700ee98295211dc5dc1.tar.xz spack-60db73a3f516c8cd94169700ee98295211dc5dc1.zip | |
Fix OpenMPI CUDA support (#4323)
* Fix OpenMPI CUDA support
* Remove --with-cuda-libdir flag, not a real flag
* Fix PGI and CUDA 7 support
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/openmpi/package.py | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/openmpi/package.py b/var/spack/repos/builtin/packages/openmpi/package.py index 6d5e5e6d2b..bf6cf02995 100644 --- a/var/spack/repos/builtin/packages/openmpi/package.py +++ b/var/spack/repos/builtin/packages/openmpi/package.py @@ -191,6 +191,7 @@ class Openmpi(AutotoolsPackage): depends_on('jdk', when='+java') depends_on('sqlite', when='+sqlite3@:1.11') + conflicts('+cuda', when='@:1.6') # CUDA support was added in 1.7 conflicts('fabrics=psm2', when='@:1.8') # PSM2 support was added in 1.10.0 conflicts('fabrics=pmi', when='@:1.5.4') # PMI support was added in 1.5.5 conflicts('fabrics=mxm', when='@:1.5.3') # MXM support was added in 1.5.4 @@ -311,12 +312,29 @@ class Openmpi(AutotoolsPackage): config_args.append('--disable-mpi-thread-multiple') # CUDA support + # See https://www.open-mpi.org/faq/?category=buildcuda if spec.satisfies('@1.7:'): if '+cuda' in spec: + # OpenMPI dynamically loads libcuda.so, requires dlopen + config_args.append('--enable-dlopen') + # Searches for header files in DIR/include config_args.append('--with-cuda={0}'.format( spec['cuda'].prefix)) - config_args.append('--with-cuda-libdir={0}'.format( - spec['cuda'].libs.directories)) + if spec.satisfies('@1.7:1.7.2'): + # This option was removed from later versions + config_args.append('--with-cuda-libdir={0}'.format( + spec['cuda'].libs.directories[0])) + if spec.satisfies('@1.7.2'): + # There was a bug in 1.7.2 when --enable-static is used + config_args.append('--enable-mca-no-build=pml-bfo') + if spec.satisfies('%pgi^cuda@7.0:7.999'): + # OpenMPI has problems with CUDA 7 and PGI + config_args.append( + '--with-wrapper-cflags=-D__LP64__ -ta:tesla') + if spec.satisfies('%pgi@:15.8'): + # With PGI 15.9 and later compilers, the + # CFLAGS=-D__LP64__ is no longer needed. + config_args.append('CFLAGS=-D__LP64__') else: config_args.append('--without-cuda') |