sundials: add new version (#43008)

* sundials: add new version
* note previous default
* update when clause for removed options

---------

Co-authored-by: David J. Gardner <gardner48@llnl.gov>
This commit is contained in:
Cody Balos 2024-03-28 02:12:49 -07:00 committed by GitHub
parent f76eb993aa
commit ebaeea7820
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 10 additions and 8 deletions

View file

@ -206,7 +206,7 @@ class Dealii(CMakePackage, CudaPackage):
depends_on("slepc~arpack", when="+slepc+petsc+mpi+int64") depends_on("slepc~arpack", when="+slepc+petsc+mpi+int64")
depends_on("sundials@:3~pthread", when="@9.0:9.2+sundials") depends_on("sundials@:3~pthread", when="@9.0:9.2+sundials")
depends_on("sundials@5:5.8", when="@9.3:9.3.3+sundials") depends_on("sundials@5:5.8", when="@9.3:9.3.3+sundials")
depends_on("sundials@5:", when="@9.3.4:+sundials") depends_on("sundials@5:6.7", when="@9.3.4:+sundials")
depends_on("taskflow@3.4:", when="@9.6:+taskflow") depends_on("taskflow@3.4:", when="@9.6:+taskflow")
depends_on("trilinos gotype=int", when="+trilinos@12.18.1:") depends_on("trilinos gotype=int", when="+trilinos@12.18.1:")
# TODO: next line fixes concretization with trilinos and adol-c # TODO: next line fixes concretization with trilinos and adol-c

View file

@ -288,8 +288,8 @@ 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.0.1-xsdk:4.4+sundials~mpi") depends_on("sundials@5.0.0:5", when="@4.0.1-xsdk:4.4+sundials~mpi")
depends_on("sundials@5.0.0:5+mpi+hypre", when="@4.0.1-xsdk:4.4+sundials+mpi") depends_on("sundials@5.0.0:5+mpi+hypre", when="@4.0.1-xsdk:4.4+sundials+mpi")
depends_on("sundials@5.0.0:", when="@4.5.0:+sundials~mpi") depends_on("sundials@5.0.0:6.7.0", when="@4.5.0:+sundials~mpi")
depends_on("sundials@5.0.0:+mpi+hypre", when="@4.5.0:+sundials+mpi") depends_on("sundials@5.0.0:6.7.0+mpi+hypre", when="@4.5.0:+sundials+mpi")
for sm_ in CudaPackage.cuda_arch_values: for sm_ in CudaPackage.cuda_arch_values:
depends_on( depends_on(
"sundials@5.4.0:+cuda cuda_arch={0}".format(sm_), "sundials@5.4.0:+cuda cuda_arch={0}".format(sm_),

View file

@ -28,6 +28,7 @@ class Sundials(CMakePackage, CudaPackage, ROCmPackage):
# Versions # Versions
# ========================================================================== # ==========================================================================
version("develop", branch="develop") version("develop", branch="develop")
version("7.0.0", sha256="d762a7950ef4097fbe9d289f67a8fb717a0b9f90f87ed82170eb5c36c0a07989")
version("6.7.0", sha256="5f113a1564a9d2d98ff95249f4871a4c815a05dbb9b8866a82b13ab158c37adb") version("6.7.0", sha256="5f113a1564a9d2d98ff95249f4871a4c815a05dbb9b8866a82b13ab158c37adb")
version("6.6.2", sha256="08f8223a5561327e44c072e46faa7f665c0c0bc8cd7e45d23f486c3d24c65009") version("6.6.2", sha256="08f8223a5561327e44c072e46faa7f665c0c0bc8cd7e45d23f486c3d24c65009")
version("6.6.1", sha256="21f71e4aef95b18f954c8bbdc90b62877443950533d595c68051ab768b76984b") version("6.6.1", sha256="21f71e4aef95b18f954c8bbdc90b62877443950533d595c68051ab768b76984b")
@ -84,10 +85,10 @@ class Sundials(CMakePackage, CudaPackage, ROCmPackage):
values=("99", "11", "14", "17"), values=("99", "11", "14", "17"),
) )
# Logging # Logging (default=0 when "@6.2.0:6.7.0", default=2 when "@7.0.0:")
variant( variant(
"logging-level", "logging-level",
default="0", default="2",
description="logging level\n 0 = no logging,\n 1 = errors,\n " description="logging level\n 0 = no logging,\n 1 = errors,\n "
"2 = errors + warnings,\n 3 = errors + " "2 = errors + warnings,\n 3 = errors + "
"warnings + info,\n 4 = errors + warnings + info + debugging, " "warnings + info,\n 4 = errors + warnings + info + debugging, "
@ -97,12 +98,12 @@ class Sundials(CMakePackage, CudaPackage, ROCmPackage):
when="@6.2.0:", when="@6.2.0:",
) )
# MPI logging # MPI logging (option removed in 7.0)
variant( variant(
"logging-mpi", "logging-mpi",
default="OFF", default="OFF",
description="enable MPI support in the logger", description="enable MPI support in the logger",
when="@6.2.0:", when="@6.2.0:6.7.0",
) )
# Real type # Real type
@ -165,10 +166,11 @@ class Sundials(CMakePackage, CudaPackage, ROCmPackage):
variant("examples", default=True, description="Enable examples") variant("examples", default=True, description="Enable examples")
variant("examples-install", default=True, description="Install examples") variant("examples-install", default=True, description="Install examples")
# Generic (std-c) math libraries (UNIX only) # Generic (std-c) math libraries (UNIX only) (option removed in 7.0)
variant( variant(
"generic-math", "generic-math",
default=True, default=True,
when="@:6.7.0",
description="Use generic (std-c) math libraries on unix systems", description="Use generic (std-c) math libraries on unix systems",
) )