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

[mfem] Add a patch for MFEM v4.7 that adds support for SUDIALS v7 (#47591)

Browse Source
This commit is contained in:
Veselin Dobrev 2024-11-15 06:50:44 -08:00 committed by GitHub
parent 66a93b5433
commit ac0ed2c4cc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 1136 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1129
var/spack/repos/builtin/packages/mfem/mfem-4.7-sundials-7.patch Normal file
View File

File diff suppressed because it is too large Load Diff

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

@ -308,8 +308,10 @@ class Mfem(Package, CudaPackage, ROCmPackage):
depends_on("sundials@2.7.0:+mpi+hypre", when="@3.3.2:+sundials+mpi") depends_on("sundials@2.7.0:+mpi+hypre", when="@3.3.2:+sundials+mpi")
depends_on("sundials@5.0.0:5", when="@4.1.0:4.4+sundials~mpi") depends_on("sundials@5.0.0:5", when="@4.1.0:4.4+sundials~mpi")
depends_on("sundials@5.0.0:5+mpi+hypre", when="@4.1.0:4.4+sundials+mpi") depends_on("sundials@5.0.0:5+mpi+hypre", when="@4.1.0:4.4+sundials+mpi")
depends_on("sundials@5.0.0:6.7.0", when="@4.5.0:+sundials~mpi") depends_on("sundials@5.0.0:6.7.0", when="@4.5.0:4.6+sundials~mpi")
depends_on("sundials@5.0.0:6.7.0+mpi+hypre", when="@4.5.0:+sundials+mpi") depends_on("sundials@5.0.0:6.7.0+mpi+hypre", when="@4.5.0:4.6+sundials+mpi")
depends_on("sundials@5.0.0:", when="@4.7.0:+sundials~mpi")
depends_on("sundials@5.0.0:+mpi+hypre", when="@4.7.0:+sundials+mpi")
conflicts("cxxstd=11", when="^sundials@6.4.0:") conflicts("cxxstd=11", when="^sundials@6.4.0:")
for sm_ in CudaPackage.cuda_arch_values: for sm_ in CudaPackage.cuda_arch_values:
depends_on( depends_on(
@ -507,6 +509,7 @@ class Mfem(Package, CudaPackage, ROCmPackage):
sha256="2a31682d876626529e2778a216d403648b83b90997873659a505d982d0e65beb", sha256="2a31682d876626529e2778a216d403648b83b90997873659a505d982d0e65beb",
) )
patch("mfem-4.7.patch", when="@4.7.0") patch("mfem-4.7.patch", when="@4.7.0")
patch("mfem-4.7-sundials-7.patch", when="@4.7.0+sundials ^sundials@7:")
phases = ["configure", "build", "install"] phases = ["configure", "build", "install"]

2
var/spack/repos/builtin/packages/sundials/package.py
View File

@ -733,6 +733,8 @@ def libs(self):
# Q: should the result be ordered by dependency? # Q: should the result be ordered by dependency?
else: else:
sun_libs = ["libsundials_" + p for p in query_parameters] sun_libs = ["libsundials_" + p for p in query_parameters]
if self.spec.satisfies("@7:"):
sun_libs += ["libsundials_core"]
is_shared = "+shared" in self.spec is_shared = "+shared" in self.spec
libs = find_libraries(sun_libs, root=self.prefix, shared=is_shared, recursive=True) libs = find_libraries(sun_libs, root=self.prefix, shared=is_shared, recursive=True)