diff --git a/var/spack/repos/builtin/packages/xsdk/package.py b/var/spack/repos/builtin/packages/xsdk/package.py
index 8048808a65bf1a743c7cab0c1ab826349a382f5c..832d9537c62e3051f9809eaca2d1fa2367c34c61 100644
--- a/var/spack/repos/builtin/packages/xsdk/package.py
+++ b/var/spack/repos/builtin/packages/xsdk/package.py
@@ -84,6 +84,7 @@ class Xsdk(BundlePackage, CudaPackage, ROCmPackage):
homepage = "https://xsdk.info"
maintainers("balay", "luszczek", "balos1", "shuds13", "v-dobrev")
+ version("1.1.0")
version("1.0.0")
version("0.8.0", deprecated=True)
@@ -94,7 +95,7 @@ class Xsdk(BundlePackage, CudaPackage, ROCmPackage):
variant("omega-h", default=True, description="Enable omega-h package build")
variant("strumpack", default=True, description="Enable strumpack package build")
variant("dealii", default=True, description="Enable dealii package build")
- variant("alquimia", default=True, description="Enable alquimia package build")
+ variant("alquimia", default=True, when="@:1.0.0", description="Enable alquimia package build")
variant("phist", default=True, description="Enable phist package build")
variant("ginkgo", default=True, description="Enable ginkgo package build")
variant("libensemble", default=True, description="Enable py-libensemble package build")
@@ -105,16 +106,25 @@ class Xsdk(BundlePackage, CudaPackage, ROCmPackage):
variant("heffte", default=True, description="Enable heffte package build")
variant("slate", default=(sys.platform != "darwin"), description="Enable slate package build")
variant("arborx", default=True, description="Enable ArborX build")
- variant("exago", default=True, description="Enable exago build")
+ variant("exago", default=True, when="@:1.0.0", description="Enable exago build")
variant("hiop", default=True, description="Enable hiop build")
variant("raja", default=(sys.platform != "darwin"), description="Enable raja for hiop, exago")
- variant("pflotran", default=True, description="Enable pflotran package build")
+ variant("pflotran", default=True, when="@:1.0.0", description="Enable pflotran package build")
+ xsdk_depends_on(
+ "hypre@2.32.0+superlu-dist+shared", when="@1.1.0", cuda_var="cuda", rocm_var="rocm"
+ )
xsdk_depends_on(
"hypre@2.30.0+superlu-dist+shared", when="@1.0.0", cuda_var="cuda", rocm_var="rocm"
)
xsdk_depends_on("hypre@2.26.0+superlu-dist+shared", when="@0.8.0", cuda_var="cuda")
+ xsdk_depends_on(
+ "mfem@4.7.0+shared+mpi+superlu-dist+petsc+sundials+examples+miniapps",
+ when="@1.1.0",
+ cuda_var="cuda",
+ rocm_var="rocm",
+ )
xsdk_depends_on(
"mfem@4.6.0+shared+mpi+superlu-dist+petsc+sundials+examples+miniapps",
when="@1.0.0",
@@ -128,10 +138,18 @@ class Xsdk(BundlePackage, CudaPackage, ROCmPackage):
rocm_var="rocm",
)
+ xsdk_depends_on("superlu-dist@9.1.0", when="@1.1.0", cuda_var="cuda", rocm_var="rocm")
xsdk_depends_on("superlu-dist@8.2.1", when="@1.0.0", cuda_var="cuda", rocm_var="rocm")
xsdk_depends_on("superlu-dist@8.1.2", when="@0.8.0")
xsdk_depends_on("trilinos +superlu-dist", when="@1.0.0: +trilinos ~cuda ~rocm")
+ xsdk_depends_on(
+ "trilinos@16.0.0+hypre+hdf5~mumps+boost"
+ + "~suite-sparse+tpetra+nox+ifpack2+zoltan+zoltan2+amesos2"
+ + "~exodus~dtk+intrepid2+shards+stratimikos gotype=int"
+ + " cxxstd=17",
+ when="@1.1.0 +trilinos",
+ )
xsdk_depends_on(
"trilinos@14.4.0+hypre+hdf5~mumps+boost"
+ "~suite-sparse+tpetra+nox+ifpack2+zoltan+zoltan2+amesos2"
@@ -147,12 +165,19 @@ class Xsdk(BundlePackage, CudaPackage, ROCmPackage):
when="@0.8.0 +trilinos",
)
+ xsdk_depends_on("datatransferkit@3.1.1", when="@1.1.0 +trilinos +datatransferkit")
xsdk_depends_on("datatransferkit@3.1.1", when="@1.0.0 +trilinos +datatransferkit")
dtk7ver = "3.1-rc2" if sys.platform == "darwin" else "3.1-rc3"
xsdk_depends_on("datatransferkit@" + dtk7ver, when="@0.8.0 +trilinos +datatransferkit")
xsdk_depends_on("petsc +batch", when="^cray-mpich")
xsdk_depends_on("petsc +sycl +kokkos", when="@1.0.0: +sycl")
+ xsdk_depends_on(
+ "petsc@3.22.1+mpi+hypre+superlu-dist+metis+hdf5~mumps+double~int64",
+ when="@1.1.0",
+ cuda_var="cuda",
+ rocm_var="rocm",
+ )
xsdk_depends_on(
"petsc@3.20.1+mpi+hypre+superlu-dist+metis+hdf5~mumps+double~int64",
when="@1.0.0",
@@ -168,6 +193,12 @@ class Xsdk(BundlePackage, CudaPackage, ROCmPackage):
xsdk_depends_on("dealii +trilinos~adol-c", when="+trilinos +dealii")
xsdk_depends_on("dealii ~trilinos", when="~trilinos +dealii")
+ xsdk_depends_on(
+ "dealii@9.6.0~assimp~python~doc~gmsh+petsc+slepc+mpi~int64"
+ + "~netcdf+metis~sundials~ginkgo~symengine~simplex~arborx~cgal~oce"
+ + "~opencascade~vtk~taskflow",
+ when="@1.1.0 +dealii",
+ )
xsdk_depends_on(
"dealii@9.5.1~assimp~python~doc~gmsh+petsc+slepc+mpi~int64"
+ "~netcdf+metis+sundials~ginkgo~symengine~simplex~arborx~cgal~oce"
@@ -190,6 +221,12 @@ class Xsdk(BundlePackage, CudaPackage, ROCmPackage):
xsdk_depends_on("sundials +trilinos", when="+trilinos")
xsdk_depends_on("sundials +ginkgo", when="+ginkgo @0.8.0:")
xsdk_depends_on("sundials +sycl cxxstd=17", when="@1.0.0: +sycl")
+ xsdk_depends_on(
+ "sundials@7.1.1~int64+hypre+petsc+superlu-dist",
+ when="@1.1.0",
+ cuda_var=["cuda", "?magma"],
+ rocm_var=["rocm", "?magma"],
+ )
xsdk_depends_on(
"sundials@6.6.2~int64+hypre+petsc+superlu-dist",
when="@1.0.0",
@@ -203,33 +240,43 @@ class Xsdk(BundlePackage, CudaPackage, ROCmPackage):
rocm_var=["rocm", "?magma"],
)
+ xsdk_depends_on("plasma@24.8.7", when="@1.1.0 %gcc@6.0:")
xsdk_depends_on("plasma@23.8.2:", when="@1.0.0 %gcc@6.0:")
xsdk_depends_on("plasma@22.9.29:", when="@0.8.0 %gcc@6.0:")
+ xsdk_depends_on("magma@2.8.0", when="@1.1.0", cuda_var="?cuda", rocm_var="?rocm")
xsdk_depends_on("magma@2.7.1", when="@1.0.0", cuda_var="?cuda", rocm_var="?rocm")
xsdk_depends_on("magma@2.7.0", when="@0.8.0", cuda_var="?cuda", rocm_var="?rocm")
xsdk_depends_on("amrex +sycl", when="@1.0.0: +sycl")
+ xsdk_depends_on("amrex@24.10+sundials", when="@1.1.0 +amrex", cuda_var="cuda", rocm_var="rocm")
xsdk_depends_on("amrex@23.08+sundials", when="@1.0.0 +amrex", cuda_var="cuda", rocm_var="rocm")
xsdk_depends_on("amrex@22.09+sundials", when="@0.8.0 +amrex", cuda_var="cuda", rocm_var="rocm")
+ xsdk_depends_on("slepc@3.22.1", when="@1.1.0", cuda_var="cuda", rocm_var="rocm")
xsdk_depends_on("slepc@3.20.0", when="@1.0.0", cuda_var="cuda", rocm_var="rocm")
xsdk_depends_on("slepc@3.18.1", when="@0.8.0", cuda_var="cuda", rocm_var="rocm")
xsdk_depends_on("omega-h +trilinos", when="+trilinos +omega-h")
xsdk_depends_on("omega-h ~trilinos", when="~trilinos +omega-h")
+ xsdk_depends_on("omega-h@10.8.6", when="@1.1.0 +omega-h")
xsdk_depends_on("omega-h@10.6.0", when="@1.0.0 +omega-h")
xsdk_depends_on("omega-h@9.34.13", when="@0.8.0 +omega-h")
xsdk_depends_on("strumpack ~cuda", when="~cuda +strumpack")
xsdk_depends_on("strumpack ~slate~openmp", when="~slate @0.8.0: +strumpack")
+ xsdk_depends_on("strumpack@8.0.0", when="@1.1.0 +strumpack", cuda_var=["cuda"])
xsdk_depends_on("strumpack@7.2.0", when="@1.0.0 +strumpack", cuda_var=["cuda"])
xsdk_depends_on("strumpack@7.0.1", when="@0.8.0 +strumpack", cuda_var=["cuda"])
+ xsdk_depends_on("pumi@2.2.9+shared", when="@1.1.0")
xsdk_depends_on("pumi@2.2.8+shared", when="@1.0.0")
xsdk_depends_on("pumi@2.2.7+shared", when="@0.8.0")
tasmanian_openmp = "~openmp" if sys.platform == "darwin" else "+openmp"
+ xsdk_depends_on(
+ "tasmanian@8.1+mpi+blas" + tasmanian_openmp, when="@1.1.0", cuda_var=["cuda", "?magma"]
+ )
xsdk_depends_on(
"tasmanian@8.0+mpi+blas" + tasmanian_openmp, when="@1.0.0", cuda_var=["cuda", "?magma"]
)
@@ -240,6 +287,7 @@ class Xsdk(BundlePackage, CudaPackage, ROCmPackage):
)
xsdk_depends_on("arborx+sycl", when="@1.0.0: +arborx +sycl")
+ xsdk_depends_on("arborx@1.7", when="@1.1.0 +arborx")
xsdk_depends_on("arborx@1.4.1", when="@1.0.0 +arborx")
xsdk_depends_on("arborx@1.2", when="@0.8.0 +arborx")
@@ -251,10 +299,14 @@ class Xsdk(BundlePackage, CudaPackage, ROCmPackage):
xsdk_depends_on("phist kernel_lib=tpetra", when="+trilinos +phist")
xsdk_depends_on("phist kernel_lib=petsc", when="~trilinos +phist")
+ xsdk_depends_on("phist@1.12.1 ~fortran ~scamac ~openmp ~host ~int64", when="@1.1.0 +phist")
xsdk_depends_on("phist@1.12.0 ~fortran ~scamac ~openmp ~host ~int64", when="@1.0.0 +phist")
xsdk_depends_on("phist@1.11.2 ~fortran ~scamac ~openmp ~host ~int64", when="@0.8.0 +phist")
xsdk_depends_on("ginkgo+sycl", when="@1.0.0: +ginkgo +sycl")
+ xsdk_depends_on(
+ "ginkgo@1.8.0 +mpi ~openmp", when="@1.1.0 +ginkgo", cuda_var="cuda", rocm_var="rocm"
+ )
xsdk_depends_on(
"ginkgo@1.7.0 +mpi ~openmp", when="@1.0.0 +ginkgo", cuda_var="cuda", rocm_var="rocm"
)
@@ -262,32 +314,44 @@ class Xsdk(BundlePackage, CudaPackage, ROCmPackage):
"ginkgo@1.5.0 +mpi ~openmp", when="@0.8.0 +ginkgo", cuda_var="cuda", rocm_var="rocm"
)
+ xsdk_depends_on("py-libensemble@1.4.2+petsc4py", when="@1.1.0 +libensemble")
+ xsdk_depends_on("py-petsc4py@3.22.1", when="@1.1.0 +libensemble")
xsdk_depends_on("py-libensemble@1.0.0+petsc4py", when="@1.0.0 +libensemble")
xsdk_depends_on("py-petsc4py@3.20.1", when="@1.0.0 +libensemble")
xsdk_depends_on("py-libensemble@0.9.3+petsc4py", when="@0.8.0 +libensemble")
xsdk_depends_on("py-petsc4py@3.18.1", when="@0.8.0 +libensemble")
xsdk_depends_on("precice ~petsc", when="+precice ^cray-mpich")
+ xsdk_depends_on("precice@3.1.2", when="@1.1.0 +precice")
xsdk_depends_on("precice@2.5.0", when="@1.0.0 +precice")
xsdk_depends_on("precice@2.5.0", when="@0.8.0 +precice")
bfpk_openmp = "~openmp" if sys.platform == "darwin" else "+openmp"
+ xsdk_depends_on("butterflypack@3.2.0" + bfpk_openmp, when="@1.1.0 +butterflypack")
xsdk_depends_on("butterflypack@2.4.0" + bfpk_openmp, when="@1.0.0 +butterflypack")
xsdk_depends_on("butterflypack@2.2.2" + bfpk_openmp, when="@0.8.0 +butterflypack")
+ xsdk_depends_on("heffte+fftw", when="+heffte ~rocm")
+ xsdk_depends_on(
+ "heffte@2.4.1",
+ when="@1.1.0 +heffte",
+ cuda_var=["cuda", "?magma"],
+ rocm_var=["rocm", "?magma"],
+ )
xsdk_depends_on(
- "heffte@2.4.0+fftw",
+ "heffte@2.4.0",
when="@1.0.0 +heffte",
cuda_var=["cuda", "?magma"],
rocm_var=["rocm", "?magma"],
)
xsdk_depends_on(
- "heffte@2.3.0+fftw",
+ "heffte@2.3.0",
when="@0.8.0 +heffte",
cuda_var=["cuda", "?magma"],
rocm_var=["rocm", "?magma"],
)
+ xsdk_depends_on("slate@2024.10.29", when="@1.1.0 +slate", cuda_var="cuda")
xsdk_depends_on("slate@2023.08.25", when="@1.0.0 +slate", cuda_var="cuda")
xsdk_depends_on("slate@2022.07.00", when="@0.8.0 +slate", cuda_var="cuda")
@@ -296,6 +360,8 @@ class Xsdk(BundlePackage, CudaPackage, ROCmPackage):
xsdk_depends_on("exago@1.5.0~ipopt~hiop~python", when="@0.8.0 +exago ~raja")
xsdk_depends_on("exago@1.5.0~ipopt+hiop+raja", when="@0.8.0 +exago +raja", cuda_var="cuda")
+ xsdk_depends_on("hiop@1.1.0", when="@1.1.0 +hiop ~raja")
+ xsdk_depends_on("hiop@1.1.0+raja", when="@1.1.0 +hiop +raja", cuda_var="cuda")
xsdk_depends_on("hiop@1.0.0", when="@1.0.0 +hiop ~raja")
xsdk_depends_on("hiop@1.0.0+raja", when="@1.0.0 +hiop +raja", cuda_var="cuda")
xsdk_depends_on("hiop@0.7.1", when="@0.8.0 +hiop ~raja")