From 4fef0bac20e68731ca0bf459ee15f5bbace7d591 Mon Sep 17 00:00:00 2001 From: Richard Berger Date: Wed, 25 Jan 2023 14:08:16 -0700 Subject: spiner: add v1.6.0 (#35154) --- var/spack/repos/builtin/packages/spiner/package.py | 56 ++++++++++++++-------- 1 file changed, 35 insertions(+), 21 deletions(-) diff --git a/var/spack/repos/builtin/packages/spiner/package.py b/var/spack/repos/builtin/packages/spiner/package.py index 19eff41910..b30a845ceb 100644 --- a/var/spack/repos/builtin/packages/spiner/package.py +++ b/var/spack/repos/builtin/packages/spiner/package.py @@ -17,9 +17,22 @@ class Spiner(CMakePackage, CudaPackage): maintainers = ["rbberger"] version("main", branch="main") - version("1.5.1", sha256="dd1cada84446443e8925438b8da53ab5a6cb9f373f1a993905ef0bf51f48223c") - version("1.5.0", sha256="b27ddabc0d21870b845444c24307d3a0c1b175483e72cc138139d6e0dd29b244") - version("1.4.0", sha256="c3801b9eab26feabec33ff8c59e4056f384287f407d23faba010d354766f3ac5") + version("1.6.0", sha256="afa5526d87c78c1165ead06c09c5c2b9e4a913687443e5adff7b709ea4dd7edf") + version( + "1.5.1", + sha256="dd1cada84446443e8925438b8da53ab5a6cb9f373f1a993905ef0bf51f48223c", + deprecated=True, + ) + version( + "1.5.0", + sha256="b27ddabc0d21870b845444c24307d3a0c1b175483e72cc138139d6e0dd29b244", + deprecated=True, + ) + version( + "1.4.0", + sha256="c3801b9eab26feabec33ff8c59e4056f384287f407d23faba010d354766f3ac5", + deprecated=True, + ) # When overriding/overloading varaints, the last variant is always used, except for # "when" clauses. Therefore, call the whens FIRST then the non-whens. @@ -35,22 +48,22 @@ class Spiner(CMakePackage, CudaPackage): variant("mpi", default=False, description="Support parallel hdf5") variant("python", default=False, description="Python, Numpy & Matplotlib Support") - variant("doc", default=False, description="Sphinx Documentation Support") - variant("format", default=False, description="Clang-Format Support") - depends_on("cmake@3.12:") - depends_on("catch2@2.13.4:2.13.9") - depends_on("ports-of-call@1.2.0:") + depends_on("cmake@3.12:", when="@:1.5.1", type="build") + depends_on("cmake@3.23:", when="@1.6.0:", type="build") + depends_on("catch2@2.13.4:2.13.9", type="test") + depends_on("ports-of-call@1.2.0:", when="@:1.5.1") + depends_on("ports-of-call@1.3.0:", when="@1.6.0:") # Currently the raw cuda backend of ports-of-call is not supported. - depends_on("ports-of-call portability_strategy=Kokkos", when="+kokkos") - depends_on("ports-of-call portability_strategy=None", when="~kokkos") + depends_on("ports-of-call portability_strategy=Kokkos", when="@:1.5.1 +kokkos") + depends_on("ports-of-call portability_strategy=None", when="@:1.5.1 ~kokkos") for _flag in list(CudaPackage.cuda_arch_values): - depends_on("kokkos@3.2.00: cuda_arch=" + _flag, when="+cuda+kokkos cuda_arch=" + _flag) + depends_on("kokkos@3.3.00: cuda_arch=" + _flag, when="+cuda+kokkos cuda_arch=" + _flag) for _flag in ("~cuda", "+cuda", "~openmp", "+openmp"): - depends_on("kokkos@3.2.00: " + _flag, when="+kokkos" + _flag) + depends_on("kokkos@3.3.00: " + _flag, when="+kokkos" + _flag) depends_on( - "kokkos@3.2.00: ~shared+wrapper+cuda_lambda+cuda_relocatable_device_code", + "kokkos@3.3.00: ~shared+wrapper+cuda_lambda+cuda_constexpr+cuda_relocatable_device_code", when="+cuda+kokkos", ) @@ -61,22 +74,23 @@ class Spiner(CMakePackage, CudaPackage): depends_on("py-numpy", when="+python") depends_on("py-matplotlib", when="+python") - depends_on("py-sphinx", when="+doc") - depends_on("py-sphinx-rtd-theme@0.4.3", when="+doc") - depends_on("py-sphinx-multiversion", when="+doc") - - depends_on("llvm@12.0.0+clang", when="+format") - conflicts("+mpi", when="~hdf5") conflicts("+cuda", when="~kokkos") conflicts("+openmp", when="~kokkos") conflicts("cuda_arch=none", when="+cuda", msg="CUDA architecture is required") def cmake_args(self): + if self.spec.satisfies("@1.6.0:"): + use_kokkos_option = "SPINER_TEST_USE_KOKKOS" + use_cuda_option = "SPINER_TEST_USE_CUDA" + else: + use_kokkos_option = "SPINER_USE_KOKKOS" + use_cuda_option = "SPINER_USE_CUDA" + args = [ self.define("BUILD_TESTING", self.run_tests), - self.define_from_variant("SPINER_USE_KOKKOS", "kokkos"), - self.define_from_variant("SPINER_USE_CUDA", "cuda"), + self.define_from_variant(use_kokkos_option, "kokkos"), + self.define_from_variant(use_cuda_option, "cuda"), self.define_from_variant("SPINER_USE_HDF", "hdf5"), ] if "+cuda" in self.spec: -- cgit v1.2.3-60-g2f50