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

arborx: remove Trilinos dependency for @1.6: (#47305)

Browse Source
This commit is contained in:
Andrey Prokopenko 2024-11-04 04:29:32 -05:00 committed by GitHub
parent 9a94ea7dfe
commit 18936771ff
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
var/spack/repos/builtin/packages/arborx/package.py
View File

@ -63,7 +63,7 @@ class Arborx(CMakePackage, CudaPackage, ROCmPackage):
for backend in kokkos_backends: for backend in kokkos_backends:
deflt, descr = kokkos_backends[backend] deflt, descr = kokkos_backends[backend]
variant(backend.lower(), default=deflt, description=descr) variant(backend.lower(), default=deflt, description=descr)
variant("trilinos", default=False, description="use Kokkos from Trilinos") variant("trilinos", default=False, when="@:1.5", description="use Kokkos from Trilinos")
depends_on("cmake@3.12:", type="build") depends_on("cmake@3.12:", type="build")
depends_on("cmake@3.16:", type="build", when="@1.0:") depends_on("cmake@3.16:", type="build", when="@1.0:")
@ -77,8 +77,8 @@ class Arborx(CMakePackage, CudaPackage, ROCmPackage):
depends_on("kokkos@3.6.00:", when="@1.3~trilinos") depends_on("kokkos@3.6.00:", when="@1.3~trilinos")
depends_on("kokkos@3.7.01:", when="@1.4:1.4.1~trilinos") depends_on("kokkos@3.7.01:", when="@1.4:1.4.1~trilinos")
depends_on("kokkos@4.0.00:", when="@1.5~trilinos") depends_on("kokkos@4.0.00:", when="@1.5~trilinos")
depends_on("kokkos@4.1.00:", when="@1.6~trilinos") depends_on("kokkos@4.1.00:", when="@1.6")
depends_on("kokkos@4.2.00:", when="@1.7:~trilinos") depends_on("kokkos@4.2.00:", when="@1.7:")
for backend in kokkos_backends: for backend in kokkos_backends:
depends_on("kokkos+%s" % backend.lower(), when="~trilinos+%s" % backend.lower()) depends_on("kokkos+%s" % backend.lower(), when="~trilinos+%s" % backend.lower())
@ -96,8 +96,9 @@ class Arborx(CMakePackage, CudaPackage, ROCmPackage):
conflicts("^kokkos", when="+trilinos") conflicts("^kokkos", when="+trilinos")
depends_on("kokkos+cuda_lambda", when="~trilinos+cuda") depends_on("kokkos+cuda_lambda", when="~trilinos+cuda")
# Trilinos/Kokkos # Trilinos with internal Kokkos
# Notes: # Notes:
# - starting with Trilinos 14.4, Trilinos' spack package uses external Kokkos
# - current version of Trilinos package does not allow disabling Serial # - current version of Trilinos package does not allow disabling Serial
# - current version of Trilinos package does not allow enabling CUDA # - current version of Trilinos package does not allow enabling CUDA
depends_on("trilinos+kokkos", when="+trilinos") depends_on("trilinos+kokkos", when="+trilinos")
@ -106,18 +107,16 @@ class Arborx(CMakePackage, CudaPackage, ROCmPackage):
depends_on("trilinos@13.4.0:", when="@1.3+trilinos") depends_on("trilinos@13.4.0:", when="@1.3+trilinos")
depends_on("trilinos@14.0.0:", when="@1.4:1.4.1+trilinos") depends_on("trilinos@14.0.0:", when="@1.4:1.4.1+trilinos")
depends_on("trilinos@14.2.0:", when="@1.5+trilinos") depends_on("trilinos@14.2.0:", when="@1.5+trilinos")
depends_on("trilinos@14.4.0:", when="@1.6+trilinos")
depends_on("trilinos@15.1.0:", when="@1.7:+trilinos")
patch("trilinos14.0-kokkos-major-version.patch", when="@1.4+trilinos ^trilinos@14.0.0") patch("trilinos14.0-kokkos-major-version.patch", when="@1.4+trilinos ^trilinos@14.0.0")
conflicts("~serial", when="+trilinos") conflicts("~serial", when="+trilinos")
def cmake_args(self): def cmake_args(self):
spec = self.spec spec = self.spec
if "~trilinos" in spec: if "+trilinos" in spec:
kokkos_spec = spec["kokkos"]
else:
kokkos_spec = spec["trilinos"] kokkos_spec = spec["trilinos"]
else:
kokkos_spec = spec["kokkos"]
options = [ options = [
f"-DKokkos_ROOT={kokkos_spec.prefix}", f"-DKokkos_ROOT={kokkos_spec.prefix}",