summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorTodd Gamblin <tgamblin@llnl.gov>2016-07-17 21:01:21 -0700
committerGitHub <noreply@github.com>2016-07-17 21:01:21 -0700
commit28ce08b9e26a2cda3764c37eb8860f90deadf6ff (patch)
tree1c85a4ba7220e2a6012146873788fba02c4693a9 /var
parent0e8bf79fa450da038bbcdfaed4df6af4217f5d25 (diff)
parent5a1ed51dcd374285028a4020678a5c2cf18da81b (diff)
downloadspack-28ce08b9e26a2cda3764c37eb8860f90deadf6ff.tar.gz
spack-28ce08b9e26a2cda3764c37eb8860f90deadf6ff.tar.bz2
spack-28ce08b9e26a2cda3764c37eb8860f90deadf6ff.tar.xz
spack-28ce08b9e26a2cda3764c37eb8860f90deadf6ff.zip
Merge pull request #1258 from eschnett/eschnett/openmpi-2.0.0
Update to OpenMPI 2.0.0
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/openmpi/package.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/openmpi/package.py b/var/spack/repos/builtin/packages/openmpi/package.py
index 15c8eefe96..3fcf942f05 100644
--- a/var/spack/repos/builtin/packages/openmpi/package.py
+++ b/var/spack/repos/builtin/packages/openmpi/package.py
@@ -63,6 +63,7 @@ class Openmpi(Package):
list_url = "http://www.open-mpi.org/software/ompi/"
list_depth = 3
+ version('2.0.0', 'cdacc800cb4ce690c1f1273cb6366674')
version('1.10.3', 'e2fe4513200e2aaa1500b762342c674b')
version('1.10.2', 'b2f43d9635d2d52826e5ef9feb97fd4c')
version('1.10.1', 'f0fcd77ed345b7eafb431968124ba16e')
@@ -101,6 +102,7 @@ class Openmpi(Package):
provides('mpi@:2.2', when='@1.6.5')
provides('mpi@:3.0', when='@1.7.5:')
+ provides('mpi@:3.1', when='@2.0.0:')
depends_on('hwloc')
depends_on('sqlite', when='+sqlite3')
@@ -169,7 +171,8 @@ class Openmpi(Package):
'--with-psm2' if '+psm2' in spec else '--without-psm2',
'--with-mxm' if '+mxm' in spec else '--without-mxm',
# Other options
- '--enable-mpi-thread-multiple' if '+thread_multiple' in spec else '--disable-mpi-thread-multiple', # NOQA: ignore=E501
+ ('--enable-mpi-thread-multiple' if '+thread_multiple' in spec
+ else '--disable-mpi-thread-multiple'),
'--with-pmi' if '+pmi' in spec else '--without-pmi',
'--with-sqlite3' if '+sqlite3' in spec else '--without-sqlite3',
'--enable-vt' if '+vt' in spec else '--disable-vt'