Fixed mfem mpi build issue. (#6254)

* Fixed mfem mpi build issue.

* Fixed a non-mpi build issue and switched to the latest official MFEM release.
This commit is contained in:
Aaron Fisher 2017-11-10 18:49:17 -08:00 committed by Christoph Junghans
parent e38f31e773
commit af06ea0e74

View File

@ -51,16 +51,17 @@ class Mfem(Package):
# If this quick verification procedure fails, additional discussion # If this quick verification procedure fails, additional discussion
# will be required to verify the new version. # will be required to verify the new version.
version('3.3.2-rc2', git='https://github.com/mfem/mfem', version('3.3.2',
tag='v3.3.2-rc2') '01a762a5d0a2bc59ce4e2f59009045a4',
url='https://goo.gl/Kd7Jk8', extension='.tar.gz',
preferred=True)
version('laghos-v1.0', git='https://github.com/mfem/mfem', version('laghos-v1.0', git='https://github.com/mfem/mfem',
tag='laghos-v1.0') tag='laghos-v1.0')
version('3.3', version('3.3',
'b17bd452593aada93dc0fee748fcfbbf4f04ce3e7d77fdd0341cc9103bcacd0b', 'b17bd452593aada93dc0fee748fcfbbf4f04ce3e7d77fdd0341cc9103bcacd0b',
url='http://goo.gl/Vrpsns', extension='.tar.gz', url='http://goo.gl/Vrpsns', extension='.tar.gz')
preferred=True)
version('3.2', version('3.2',
'2938c3deed4ec4f7fd5b5f5cfe656845282e86e2dcd477d292390058b7b94340', '2938c3deed4ec4f7fd5b5f5cfe656845282e86e2dcd477d292390058b7b94340',
@ -160,6 +161,7 @@ def yes_no(varstr):
'PREFIX=%s' % prefix, 'PREFIX=%s' % prefix,
'MFEM_USE_MEMALLOC=YES', 'MFEM_USE_MEMALLOC=YES',
'MFEM_DEBUG=%s' % yes_no('+debug'), 'MFEM_DEBUG=%s' % yes_no('+debug'),
'CXX=%s' % env['CXX'],
'MFEM_USE_LIBUNWIND=%s' % yes_no('+debug'), 'MFEM_USE_LIBUNWIND=%s' % yes_no('+debug'),
'MFEM_USE_GZSTREAM=%s' % yes_no('+gzstream'), 'MFEM_USE_GZSTREAM=%s' % yes_no('+gzstream'),
'MFEM_USE_METIS_5=%s' % metis5_str, 'MFEM_USE_METIS_5=%s' % metis5_str,
@ -174,6 +176,9 @@ def yes_no(varstr):
'MFEM_USE_MPFR=%s' % yes_no('+mpfr'), 'MFEM_USE_MPFR=%s' % yes_no('+mpfr'),
'MFEM_USE_OPENMP=%s' % yes_no('+openmp')] 'MFEM_USE_OPENMP=%s' % yes_no('+openmp')]
if '+mpi' in spec:
options += ['MPICXX=%s' % spec['mpi'].mpicxx]
if '+hypre' in spec: if '+hypre' in spec:
options += [ options += [
'HYPRE_DIR=%s' % spec['hypre'].prefix, 'HYPRE_DIR=%s' % spec['hypre'].prefix,