From c1df1c7ee5bc97f4ce77098f0bb7919afe662fa8 Mon Sep 17 00:00:00 2001 From: Jon Rood Date: Tue, 25 Mar 2025 10:43:13 -0600 Subject: [PATCH] trilinos: fix kokkos constraints for version 16 (#49643) * trilinos: add equals sign to kokkos dependencies. * Fix some license headers to pass style check. * Generalize a bit. * Generalize a bit more. * datatransferkit: constraing to maximum of trilinos@16.0. --- .../packages/datatransferkit/package.py | 2 +- .../repos/builtin/packages/trilinos/package.py | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/var/spack/repos/builtin/packages/datatransferkit/package.py b/var/spack/repos/builtin/packages/datatransferkit/package.py index 8ac75863bb7..0274324d617 100644 --- a/var/spack/repos/builtin/packages/datatransferkit/package.py +++ b/var/spack/repos/builtin/packages/datatransferkit/package.py @@ -46,7 +46,7 @@ class Datatransferkit(CMakePackage): depends_on("trilinos+openmp", when="+openmp") depends_on("trilinos+stratimikos+belos", when="@master") depends_on("trilinos@13:13.4.1", when="@3.1-rc2:3.1-rc3") - depends_on("trilinos@14.2:", when="@3.1.0:") + depends_on("trilinos@14.2:16.0", when="@3.1.0:") def cmake_args(self): spec = self.spec diff --git a/var/spack/repos/builtin/packages/trilinos/package.py b/var/spack/repos/builtin/packages/trilinos/package.py index e1106ce4878..a405b31fd16 100644 --- a/var/spack/repos/builtin/packages/trilinos/package.py +++ b/var/spack/repos/builtin/packages/trilinos/package.py @@ -425,15 +425,15 @@ class Trilinos(CMakePackage, CudaPackage, ROCmPackage): depends_on("kokkos-kernels~shared", when="+cuda_rdc") depends_on("kokkos-kernels~shared", when="+rocm_rdc") depends_on("kokkos~complex_align") - depends_on("kokkos@4.5.01", when="@master:") - depends_on("kokkos@4.5.01", when="@16.1") - depends_on("kokkos@4.3.01", when="@16") - depends_on("kokkos@4.2.01", when="@15.1:15") - depends_on("kokkos@4.1.00", when="@14.4:15.0") - depends_on("kokkos-kernels@4.5.01", when="@master:") - depends_on("kokkos-kernels@4.5.01", when="@16.1") - depends_on("kokkos-kernels@4.3.01", when="@16") - depends_on("kokkos-kernels@4.2.01", when="@15.1:15") + depends_on("kokkos@=4.5.01", when="@master:") + depends_on("kokkos@=4.5.01", when="@16.1") + depends_on("kokkos@=4.3.01", when="@16.0") + depends_on("kokkos@=4.2.01", when="@15.1:15") + depends_on("kokkos@=4.1.00", when="@14.4:15.0") + depends_on("kokkos-kernels@=4.5.01", when="@master:") + depends_on("kokkos-kernels@=4.5.01", when="@16.1") + depends_on("kokkos-kernels@=4.3.01", when="@16.0") + depends_on("kokkos-kernels@=4.2.01", when="@15.1:15") depends_on("kokkos+openmp", when="+openmp") for a in CudaPackage.cuda_arch_values: