Requested changes related to mumps compilation (#4614)
* * add mpii* wrappers for use with intel compilers * in mumps package, scotch is compiled without metis option when ptscotch variant is selected. This removes confusion over which metis.h to use * for intel mkl, add SPACK_COMPILER_EXTRA_RPATHS ending in 'intel64' * scotch lib requires libz when compression is turned on. This caused a link issue on some Ubuntu distributions (not redhat). Change Scotch package to add -lz when needed * * intel-mkl append to SPACK_COMPILER_EXTRA_RPATHS rather than setting * use more concise method to obtain libz libraries for scotch * remove changes to intel mpi * remove commented out depends_on * fix flake8 errors
This commit is contained in:

committed by
Adam J. Stewart

parent
e5c665600c
commit
6550aeeafc
@@ -61,7 +61,7 @@ class Mumps(Package):
|
||||
variant('shared', default=True, description='Build shared libraries')
|
||||
|
||||
depends_on('scotch + esmumps', when='~ptscotch+scotch')
|
||||
depends_on('scotch + esmumps + mpi', when='+ptscotch')
|
||||
depends_on('scotch + esmumps ~ metis + mpi', when='+ptscotch')
|
||||
depends_on('metis@5:', when='+metis')
|
||||
depends_on('parmetis', when="+parmetis")
|
||||
depends_on('blas')
|
||||
@@ -160,7 +160,7 @@ def write_makefile_inc(self):
|
||||
'FC = {0}'.format(self.spec['mpi'].mpifc),
|
||||
"SCALAP = %s" % scalapack.ld_flags,
|
||||
"MUMPS_TYPE = par"])
|
||||
if (self.spec.satisfies('%xl_r' or '%xl')) and self.spec.satisfies('^spectrum-mpi'): # noqa
|
||||
if (self.spec.satisfies('%xl_r' or '%xl')) and self.spec.satisfies('^spectrum-mpi'): # noqa
|
||||
makefile_conf.extend(
|
||||
['FL = {0}'.format(self.spec['mpi'].mpicc)])
|
||||
else:
|
||||
|
Reference in New Issue
Block a user