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

xsdk: remove develop and 0.7.0, and deprecate 0.8.0 (#46121)

Browse Source
This commit is contained in:
Satish Balay 2024-09-02 02:04:36 -05:00 committed by GitHub
parent 6b649ccf4f
commit 8f6092bf83
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 158 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
var/spack/repos/builtin/packages/xsdk-examples/package.py
View File

@ -16,11 +16,9 @@ class XsdkExamples(CMakePackage, CudaPackage, ROCmPackage):
maintainers("balay", "luszczek", "balos1", "shuds13", "v-dobrev")
version("develop", branch="master")
version("0.4.0", sha256="de54e02e0222420976a2f4cf0a6230e4bb625b443c66500fa1441032db206df9")
version(
"0.3.0",
sha256="e7444a403c0a69eeeb34a4068be4d6f4e5b54cbfd275629019b9236a538a739e",
"0.4.0",
sha256="de54e02e0222420976a2f4cf0a6230e4bb625b443c66500fa1441032db206df9",
deprecated=True,
)
@ -38,7 +36,6 @@ class XsdkExamples(CMakePackage, CudaPackage, ROCmPackage):
"xsdk+rocm amdgpu_target={0}".format(ac_), when="+rocm amdgpu_target={0}".format(ac_)
)
depends_on("xsdk@develop", when="@develop")
# Use ^dealii~hdf5 because of HDF5 linking issue in deal.II 9.4.0.
# Disable 'arborx' to remove the 'kokkos' dependency which conflicts with
# the internal Kokkos used by 'trilinos':
@ -51,11 +48,6 @@ class XsdkExamples(CMakePackage, CudaPackage, ROCmPackage):
depends_on("mfem+hiop", when="^xsdk+hiop")
depends_on("sundials+magma", when="+cuda")
with when("@0.3.0"):
depends_on("xsdk@0.7.0")
depends_on("mfem+strumpack", when="^xsdk+strumpack")
depends_on("sundials+magma", when="+cuda")
depends_on("mpi")
depends_on("cmake@3.21:", type="build", when="@0.3.0:")

152
var/spack/repos/builtin/packages/xsdk/package.py
View File

@ -84,10 +84,8 @@ class Xsdk(BundlePackage, CudaPackage, ROCmPackage):
homepage = "https://xsdk.info"
maintainers("balay", "luszczek", "balos1", "shuds13", "v-dobrev")
version("develop")
version("1.0.0")
version("0.8.0")
version("0.7.0", deprecated=True)
version("0.8.0", deprecated=True)
variant("sycl", default=False, sticky=True, description="Enable sycl variant of xsdk packages")
variant("trilinos", default=True, sticky=True, description="Enable trilinos package build")
@ -111,21 +109,11 @@ class Xsdk(BundlePackage, CudaPackage, ROCmPackage):
variant("raja", default=(sys.platform != "darwin"), description="Enable raja for hiop, exago")
variant("pflotran", default=True, description="Enable pflotran package build")
xsdk_depends_on(
"hypre@develop+superlu-dist+shared", when="@develop", 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("hypre@2.23.0+superlu-dist+shared", when="@0.7.0", cuda_var="cuda")
xsdk_depends_on(
"mfem@develop+shared+mpi+superlu-dist+petsc+sundials+examples+miniapps",
when="@develop",
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",
@ -138,26 +126,11 @@ class Xsdk(BundlePackage, CudaPackage, ROCmPackage):
cuda_var="cuda",
rocm_var="rocm",
)
xsdk_depends_on(
"mfem@4.3.0+mpi+superlu-dist+petsc+sundials+examples+miniapps",
when="@0.7.0",
cuda_var="cuda",
rocm_var="rocm",
)
xsdk_depends_on("superlu-dist@develop", when="@develop", 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("superlu-dist@7.1.1", when="@0.7.0")
xsdk_depends_on("trilinos +superlu-dist", when="@1.0.0: +trilinos ~cuda ~rocm")
xsdk_depends_on(
"trilinos@develop+hypre+hdf5~mumps+boost"
+ "~suite-sparse+tpetra+nox+ifpack2+zoltan+zoltan2+amesos2"
+ "~exodus~dtk+intrepid2+shards+stratimikos gotype=int"
+ " cxxstd=14",
when="@develop +trilinos",
)
xsdk_depends_on(
"trilinos@14.4.0+hypre+hdf5~mumps+boost"
+ "~suite-sparse+tpetra+nox+ifpack2+zoltan+zoltan2+amesos2"
@ -172,28 +145,13 @@ class Xsdk(BundlePackage, CudaPackage, ROCmPackage):
+ " cxxstd=14",
when="@0.8.0 +trilinos",
)
xsdk_depends_on(
"trilinos@13.2.0+hypre+superlu-dist+hdf5~mumps+boost"
+ "~suite-sparse+tpetra+nox+ifpack2+zoltan+zoltan2+amesos2"
+ "~exodus~dtk+intrepid2+shards+stratimikos gotype=int"
+ " cxxstd=14",
when="@0.7.0 +trilinos",
)
xsdk_depends_on("datatransferkit@master", when="@develop +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("datatransferkit@" + dtk7ver, when="@0.7.0 +trilinos +datatransferkit")
xsdk_depends_on("petsc +batch", when="@0.7.0: ^cray-mpich")
xsdk_depends_on("petsc +batch", when="^cray-mpich")
xsdk_depends_on("petsc +sycl +kokkos", when="@1.0.0: +sycl")
xsdk_depends_on(
"petsc@main+mpi+hypre+superlu-dist+metis+hdf5~mumps+double~int64",
when="@develop",
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",
@ -206,19 +164,9 @@ class Xsdk(BundlePackage, CudaPackage, ROCmPackage):
cuda_var="cuda",
rocm_var="rocm",
)
xsdk_depends_on(
"petsc@3.16.1+mpi+hypre+superlu-dist+metis+hdf5~mumps+double~int64",
when="@0.7.0",
cuda_var="cuda",
)
xsdk_depends_on("dealii +trilinos~adol-c", when="+trilinos +dealii")
xsdk_depends_on("dealii ~trilinos", when="~trilinos +dealii")
xsdk_depends_on(
"dealii@master~assimp~python~doc~gmsh+petsc+slepc+mpi~int64"
+ "~netcdf+metis+sundials~ginkgo~symengine~nanoflann~simplex~arborx~cgal~oce",
when="@develop +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",
@ -229,31 +177,16 @@ class Xsdk(BundlePackage, CudaPackage, ROCmPackage):
+ "~netcdf+metis+sundials~ginkgo~symengine~simplex~arborx~cgal",
when="@0.8.0 +dealii",
)
xsdk_depends_on(
"dealii@9.3.2~assimp~python~doc~gmsh+petsc+slepc+mpi~int64+hdf5"
+ "~netcdf+metis~sundials~ginkgo~symengine~simplex~arborx",
when="@0.7.0 +dealii",
)
xsdk_depends_on("pflotran@develop", when="@develop +pflotran")
xsdk_depends_on("pflotran@5.0.0", when="@1.0.0 +pflotran")
xsdk_depends_on("pflotran@4.0.1", when="@0.8.0 +pflotran")
xsdk_depends_on("pflotran@3.0.2", when="@0.7.0 +pflotran")
xsdk_depends_on("alquimia@master", when="@develop +alquimia")
xsdk_depends_on("alquimia@1.1.0", when="@1.0.0 +alquimia")
xsdk_depends_on("alquimia@1.0.10", when="@0.8.0 +alquimia")
xsdk_depends_on("alquimia@1.0.9", when="@0.7.0 +alquimia")
xsdk_depends_on("sundials +trilinos", when="+trilinos @0.7.0:")
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@develop~int64+hypre+petsc+superlu-dist",
when="@develop",
cuda_var=["cuda", "?magma"],
rocm_var=["rocm", "?magma"],
)
xsdk_depends_on(
"sundials@6.6.2~int64+hypre+petsc+superlu-dist",
when="@1.0.0",
@ -266,74 +199,38 @@ class Xsdk(BundlePackage, CudaPackage, ROCmPackage):
cuda_var=["cuda", "?magma"],
rocm_var=["rocm", "?magma"],
)
xsdk_depends_on(
"sundials@5.8.0~int64+hypre+petsc+superlu-dist",
when="@0.7.0",
cuda_var="cuda",
rocm_var="rocm",
)
xsdk_depends_on("plasma@develop:", when="@develop %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("plasma@21.8.29:", when="@0.7.0 %gcc@6.0:")
xsdk_depends_on("magma@master", when="@develop", 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("magma@2.6.1", when="@0.7.0", cuda_var="?cuda", rocm_var="?rocm")
xsdk_depends_on("amrex +sycl", when="@1.0.0: +sycl")
xsdk_depends_on(
"amrex@develop+sundials", when="@develop %intel", cuda_var="cuda", rocm_var="rocm"
)
xsdk_depends_on(
"amrex@develop+sundials", when="@develop %gcc", cuda_var="cuda", rocm_var="rocm"
)
xsdk_depends_on(
"amrex@develop+sundials", when="@develop %cce", cuda_var="cuda", rocm_var="rocm"
)
xsdk_depends_on("amrex@23.08+sundials", when="@1.0.0 %intel", cuda_var="cuda", rocm_var="rocm")
xsdk_depends_on("amrex@23.08+sundials", when="@1.0.0 %gcc", cuda_var="cuda", rocm_var="rocm")
xsdk_depends_on("amrex@23.08+sundials", when="@1.0.0 %cce", cuda_var="cuda", rocm_var="rocm")
xsdk_depends_on("amrex@22.09+sundials", when="@0.8.0 %intel", cuda_var="cuda", rocm_var="rocm")
xsdk_depends_on("amrex@22.09+sundials", when="@0.8.0 %gcc", cuda_var="cuda", rocm_var="rocm")
xsdk_depends_on("amrex@22.09+sundials", when="@0.8.0 %cce", cuda_var="cuda", rocm_var="rocm")
xsdk_depends_on("amrex@21.10+sundials", when="@0.7.0 %intel", cuda_var="cuda", rocm_var="rocm")
xsdk_depends_on("amrex@21.10+sundials", when="@0.7.0 %gcc", cuda_var="cuda", rocm_var="rocm")
xsdk_depends_on("amrex@21.10+sundials", when="@0.7.0 %cce", cuda_var="cuda", rocm_var="rocm")
xsdk_depends_on("slepc@main", when="@develop")
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("slepc@3.16.0", when="@0.7.0")
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@main", when="@develop +omega-h")
xsdk_depends_on("omega-h@scorec.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("omega-h@9.34.1", when="@0.7.0 +omega-h")
xsdk_depends_on("strumpack ~cuda", when="~cuda @0.7.0: +strumpack")
xsdk_depends_on("strumpack ~cuda", when="~cuda +strumpack")
xsdk_depends_on("strumpack ~slate~openmp", when="~slate @0.8.0: +strumpack")
xsdk_depends_on("strumpack@master", when="@develop +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("strumpack@6.1.0~slate~openmp", when="@0.7.0 +strumpack")
xsdk_depends_on("pumi@master+shared", when="@develop")
xsdk_depends_on("pumi@2.2.8+shared", when="@1.0.0")
xsdk_depends_on("pumi@2.2.7+shared", when="@0.8.0")
xsdk_depends_on("pumi@2.2.6", when="@0.7.0")
tasmanian_openmp = "~openmp" if sys.platform == "darwin" else "+openmp"
xsdk_depends_on(
"tasmanian@develop+blas" + tasmanian_openmp,
when="@develop",
cuda_var=["cuda", "?magma"],
rocm_var=["rocm", "?magma"],
)
xsdk_depends_on(
"tasmanian@8.0+mpi+blas" + tasmanian_openmp, when="@1.0.0", cuda_var=["cuda", "?magma"]
)
@ -342,17 +239,10 @@ class Xsdk(BundlePackage, CudaPackage, ROCmPackage):
when="@0.8.0",
cuda_var=["cuda", "?magma"],
)
xsdk_depends_on(
"tasmanian@7.7+xsdkflags+mpi+blas" + tasmanian_openmp,
when="@0.7.0",
cuda_var=["cuda", "?magma"],
)
xsdk_depends_on("arborx@master", when="@develop +arborx")
xsdk_depends_on("arborx+sycl", when="@1.0.0: +arborx +sycl")
xsdk_depends_on("arborx@1.4.1", when="@1.0.0 +arborx")
xsdk_depends_on("arborx@1.2", when="@0.8.0 +arborx")
xsdk_depends_on("arborx@1.1", when="@0.7.0 +arborx")
# the Fortran 2003 bindings of phist require python@3:, but this
# creates a conflict with other packages like petsc@main. Actually
@ -362,52 +252,30 @@ 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@develop ~fortran ~scamac ~openmp ~host ~int64", when="@develop +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("phist@1.9.5 ~fortran ~scamac ~openmp ~host ~int64", when="@0.7.0 +phist")
xsdk_depends_on("ginkgo+sycl", when="@1.0.0: +ginkgo +sycl")
xsdk_depends_on(
"ginkgo@develop +mpi ~openmp", when="@develop +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"
)
xsdk_depends_on(
"ginkgo@1.5.0 +mpi ~openmp", when="@0.8.0 +ginkgo", cuda_var="cuda", rocm_var="rocm"
)
xsdk_depends_on(
"ginkgo@1.4.0 ~openmp", when="@0.7.0 +ginkgo", cuda_var="cuda", rocm_var="rocm"
)
xsdk_depends_on("py-libensemble@develop+petsc4py", when="@develop +libensemble")
xsdk_depends_on("py-petsc4py@main", when="@develop +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("py-libensemble@0.8.0+petsc4py", when="@0.7.0 +libensemble")
xsdk_depends_on("py-petsc4py@3.16.1", when="@0.7.0 +libensemble")
xsdk_depends_on("precice ~petsc", when="+precice ^cray-mpich")
xsdk_depends_on("precice@develop", when="@develop +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")
xsdk_depends_on("precice@2.3.0", when="@0.7.0 +precice")
bfpk_openmp = "~openmp" if sys.platform == "darwin" else "+openmp"
xsdk_depends_on("butterflypack@master", when="@develop +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("butterflypack@2.0.0", when="@0.7.0 +butterflypack")
xsdk_depends_on(
"heffte@develop+fftw",
when="@develop +heffte",
cuda_var=["cuda", "?magma"],
rocm_var=["rocm", "?magma"],
)
xsdk_depends_on(
"heffte@2.4.0+fftw",
when="@1.0.0 +heffte",
@ -420,27 +288,15 @@ class Xsdk(BundlePackage, CudaPackage, ROCmPackage):
cuda_var=["cuda", "?magma"],
rocm_var=["rocm", "?magma"],
)
xsdk_depends_on(
"heffte@2.2.0+fftw",
when="@0.7.0 +heffte",
cuda_var=["cuda", "?magma"],
rocm_var=["rocm", "?magma"],
)
xsdk_depends_on("slate@master", when="@develop +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")
xsdk_depends_on("slate@2021.05.02", when="@0.7.0 +slate %gcc@6.0:", cuda_var="cuda")
xsdk_depends_on("exago@develop~ipopt~hiop~python", when="@develop +exago ~raja")
xsdk_depends_on("exago@develop~ipopt+hiop+raja", when="@develop +exago +raja", cuda_var="cuda")
xsdk_depends_on("exago@1.6.0~ipopt~hiop~python", when="@1.0.0 +exago ~raja")
xsdk_depends_on("exago@1.6.0~ipopt+hiop+raja", when="@1.0.0 +exago +raja", cuda_var="cuda")
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@develop", when="@develop +hiop ~raja")
xsdk_depends_on("hiop@develop+raja", when="@develop +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")