From e291daaa173b4aeada12aea2b067d59f9f779883 Mon Sep 17 00:00:00 2001 From: "Victor A. P. Magri" <50467563+victorapm@users.noreply.github.com> Date: Wed, 22 Jan 2025 11:53:41 -0800 Subject: [PATCH] Add OpenMP dependency to Kokkos and KokkosKernels (#48455) * Add OpenMP dependency to Kokkos and KokkosKernels * Add Chris' suggestions --- var/spack/repos/builtin/packages/trilinos/package.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/var/spack/repos/builtin/packages/trilinos/package.py b/var/spack/repos/builtin/packages/trilinos/package.py index 840b15bc417..89224744bd0 100644 --- a/var/spack/repos/builtin/packages/trilinos/package.py +++ b/var/spack/repos/builtin/packages/trilinos/package.py @@ -421,7 +421,7 @@ class Trilinos(CMakePackage, CudaPackage, ROCmPackage): depends_on("kokkos-kernels@4.5.01", when="@master:") depends_on("kokkos-kernels@4.3.01", when="@16") depends_on("kokkos-kernels@4.2.01", when="@15.1:15") - depends_on("kokkos-kernels@4.1.00", when="@15.0") + depends_on("kokkos+openmp", when="+openmp") for a in CudaPackage.cuda_arch_values: arch_str = f"+cuda cuda_arch={a}" @@ -906,7 +906,7 @@ def define_tpl(trilinos_name, spack_name, have_dep): # External Kokkos if spec.satisfies("@14.4.0: +kokkos"): options.append(define_tpl_enable("Kokkos")) - if spec.satisfies("@15.0: +kokkos"): + if spec.satisfies("@15.1: +kokkos"): options.append(define_tpl_enable("KokkosKernels", True)) # MPI settings