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

MFEM: add mpi link dir (#41337)

Browse Source 
Also fix netcdf-c zlib reference
This commit is contained in:
Chris White 2023-11-29 20:32:50 -08:00 committed by GitHub
parent f4f67adf49
commit 2ececcd03e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
var/spack/repos/builtin/packages/mfem/package.py
View File

@ -751,12 +751,14 @@ def find_optional_library(name, prefix):
) )
gfortran_lib = LibraryList(libfile) gfortran_lib = LibraryList(libfile)
sp_lib += [ld_flags_from_library_list(gfortran_lib)] sp_lib += [ld_flags_from_library_list(gfortran_lib)]
if ("^mpich" in strumpack) or ("^mvapich2" in strumpack): if "+mpi" in strumpack:
sp_lib += ["-lmpifort"] mpi = strumpack["mpi"]
elif "^openmpi" in strumpack: if ("^mpich" in strumpack) or ("^mvapich2" in strumpack):
sp_lib += ["-lmpi_mpifh"] sp_lib += [ld_flags_from_dirs([mpi.prefix.lib], ["mpifort"])]
elif "^spectrum-mpi" in strumpack: elif "^openmpi" in strumpack:
sp_lib += ["-lmpi_ibm_mpifh"] sp_lib += [ld_flags_from_dirs([mpi.prefix.lib], ["mpi_mpifh"])]
elif "^spectrum-mpi" in strumpack:
sp_lib += [ld_flags_from_dirs([mpi.prefix.lib], ["mpi_ibm_mpifh"])]
if "+openmp" in strumpack: if "+openmp" in strumpack:
# The '+openmp' in the spec means strumpack will TRY to find # The '+openmp' in the spec means strumpack will TRY to find
# OpenMP; if not found, we should not add any flags -- how do # OpenMP; if not found, we should not add any flags -- how do

2
var/spack/repos/builtin/packages/netcdf-c/package.py
View File

@ -441,7 +441,7 @@ def configure_args(self):
if "~shared" in hdf5: if "~shared" in hdf5:
if "+szip" in hdf5: if "+szip" in hdf5:
extra_libs.append(hdf5["szip"].libs) extra_libs.append(hdf5["szip"].libs)
extra_libs.append(hdf5["zlib"].libs) extra_libs.append(hdf5["zlib-api"].libs)
if self.spec.satisfies("@4.9.0:+shared"): if self.spec.satisfies("@4.9.0:+shared"):
lib_search_dirs.extend(self.spec["zlib-api"].libs.directories) lib_search_dirs.extend(self.spec["zlib-api"].libs.directories)