From a4ac3f2767988696f2ecc75db2779cdf81f77d3d Mon Sep 17 00:00:00 2001 From: eugeneswalker <38933153+eugeneswalker@users.noreply.github.com> Date: Mon, 14 Aug 2023 11:29:13 -0700 Subject: trilinos@14.4.0 +kokkos: use external kokkos (#39397) --- var/spack/repos/builtin/packages/trilinos/package.py | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/var/spack/repos/builtin/packages/trilinos/package.py b/var/spack/repos/builtin/packages/trilinos/package.py index 1bc41e0d9f..2c7acc1d10 100644 --- a/var/spack/repos/builtin/packages/trilinos/package.py +++ b/var/spack/repos/builtin/packages/trilinos/package.py @@ -368,6 +368,21 @@ class Trilinos(CMakePackage, CudaPackage, ROCmPackage): # ###################### Dependencies ########################## + # External Kokkos + depends_on("kokkos@4.1.00", when="@14.4.0: +kokkos") + depends_on("kokkos +wrapper", when="trilinos@14.4.0: +kokkos +wrapper") + depends_on("kokkos ~wrapper", when="trilinos@14.4.0: +kokkos ~wrapper") + + for a in CudaPackage.cuda_arch_values: + arch_str = "+cuda cuda_arch=" + a + kokkos_spec = "kokkos@4.1.00 " + arch_str + depends_on(kokkos_spec, when="@14.4.0 +kokkos " + arch_str) + + for a in ROCmPackage.amdgpu_targets: + arch_str = "+rocm amdgpu_target={0}".format(a) + kokkos_spec = "kokkos@4.1.00 {0}".format(arch_str) + depends_on(kokkos_spec, when="@14.4.0 +kokkos {0}".format(arch_str)) + depends_on("adios2", when="+adios2") depends_on("blas") depends_on("boost+graph+math+exception+stacktrace", when="+boost") @@ -778,6 +793,10 @@ class Trilinos(CMakePackage, CudaPackage, ROCmPackage): for tpl_name, dep_name in tpl_dep_map: define_tpl(tpl_name, dep_name, dep_name in spec) + # External Kokkos + if spec.satisfies("@14.4.0 +kokkos"): + options.append(define_tpl_enable("Kokkos")) + # MPI settings options.append(define_tpl_enable("MPI")) if "+mpi" in spec: -- cgit v1.2.3-60-g2f50