Correct logic for kokkos-kernels in package.py (#561)

* Correct logic for kokkos-kernels in package.py

We really only need to require kokkos-kernels when we have the closure models enabled as well. Otherwise they aren't needed.

This is also true for Eigen

* Make kokkos-kernels changes to v2 spack as well

* Update CHANGELOG.md

* Fix broken markdown in CHANGELOG.md

* Fix some more broken markdown and consistency stuff in CHANGELOG.md

* Change logic so that +kokkos-kernels is associated with +kokkos+closure

* We don't have a +openmp option and really we just want kokkos kernels to paired with kokkos regardless of the kokkos backend

Author: jhp-lanl

CHANGELOG.md

@@ -3,15 +3,16 @@
 ## Current develop
 
 ### Added (new features/APIs/variables/...)
-- [[PR556](https://github.com/lanl/singularity-eos/pull/556) Add introspection into types available in the variant
+- [[PR556]](https://github.com/lanl/singularity-eos/pull/556) Add introspection into types available in the variant
 
 ### Fixed (Repair bugs, etc)
+- [[PR561]](https://github.com/lanl/singularity-eos/pull/561) Fix logic for kokkos-kernels in spackage so that it is only required for closure models on GPU
 
 ### Changed (changing behavior/API/variables/...)
 
 ### Infrastructure (changes irrelevant to downstream codes)
-- [[559]](https://github.com/lanl/singularity-eos/pull/559) Document the intent of the virtual keyword in solvers
-- [[558]](https://github.com/lanl/singularity-eos/pull/558) Make EOSPAC CMake options depend on SINGULARITY_USE_EOSPAC option
+- [[PR559]](https://github.com/lanl/singularity-eos/pull/559) Document the intent of the virtual keyword in solvers
+- [[PR558]](https://github.com/lanl/singularity-eos/pull/558) Make EOSPAC CMake options depend on SINGULARITY_USE_EOSPAC option
 
 ### Removed (removing behavior/API/varaibles/...)
 
@@ -61,7 +62,7 @@ Date: 4/7/2025
 - [[PR444]](https://github.com/lanl/singularity-eos/pull/444) Add Z split modifier and electron ideal gas EOS
 
 ### Fixed (Repair bugs, etc)
-- [PR492](https://github.com/lanl/singularity-eos/pull/492) Fix import issue in spack's package.py.
+- [[PR492]](https://github.com/lanl/singularity-eos/pull/492) Fix import issue in spack's package.py.
 - [[PR485]](https://github.com/lanl/singularity-eos/pull/485) Fix segfault in Fortran interface related to EOSPAC initialization
 - [[PR478]](https://github.com/lanl/singularity-eos/pull/478) Fix bug in KPT test. Add more extensive clang build to github CI matrix.
 - [[PR473]](https://github.com/lanl/singularity-eos/pull/473) Resolve memory issue. Thanks for the catch, Richard!

spack-repo/v1/packages/singularity-eos/package.py

@@ -57,7 +57,7 @@ class SingularityEos(CMakePackage, CudaPackage, ROCmPackage):
     # build with kokkos, kokkos-kernels for offloading support
     variant("kokkos", default=False, description="Enable kokkos")
     variant(
-        "kokkos-kernels", default=False, description="Enable kokkos-kernals for linear algebra"
+        "kokkos-kernels", default=False, description="Enable kokkos-kernels for linear algebra"
     )
 
     # for compatibility with downstream projects
@@ -120,10 +120,13 @@ class SingularityEos(CMakePackage, CudaPackage, ROCmPackage):
     depends_on("catch2@3.0.1:", when="@1.9.0: +tests")
     depends_on("py-numpy", when="+python+tests")
 
-    # linear algebra when not using GPUs
-    depends_on("eigen@3.3.8:", when="~kokkos-kernels")
-    requires("+kokkos-kernels", when="+cuda")
-    requires("+kokkos-kernels", when="+rocm")
+    # Require kokkos for device/offloading support
+    requires("+kokkos", when="+cuda")
+    requires("+kokkos", when="+rocm")
+
+    # linear algebra when using closure models. Eigen without kokkos
+    depends_on("eigen@3.3.8:", when="~kokkos-kernels+closure")
+    requires("+kokkos-kernels", when="+kokkos+closure")
 
     depends_on("eospac", when="+eospac")
 

spack-repo/v2/spack_repo/singularity_eos/packages/singularity_eos/package.py

@@ -60,7 +60,7 @@ class SingularityEos(CMakePackage, CudaPackage, ROCmPackage):
     # build with kokkos, kokkos-kernels for offloading support
     variant("kokkos", default=False, description="Enable kokkos")
     variant(
-        "kokkos-kernels", default=False, description="Enable kokkos-kernals for linear algebra"
+        "kokkos-kernels", default=False, description="Enable kokkos-kernels for linear algebra"
     )
 
     # for compatibility with downstream projects
@@ -123,10 +123,13 @@ class SingularityEos(CMakePackage, CudaPackage, ROCmPackage):
     depends_on("catch2@3.0.1:", when="@1.9.0: +tests")
     depends_on("py-numpy", when="+python+tests")
 
-    # linear algebra when not using GPUs
-    depends_on("eigen@3.3.8:", when="~kokkos-kernels")
-    requires("+kokkos-kernels", when="+cuda")
-    requires("+kokkos-kernels", when="+rocm")
+    # Require kokkos for device/offloading support
+    requires("+kokkos", when="+cuda")
+    requires("+kokkos", when="+rocm")
+
+    # linear algebra when using closure models. Eigen without kokkos
+    depends_on("eigen@3.3.8:", when="~kokkos-kernels+closure")
+    requires("+kokkos-kernels", when="+kokkos+closure")
 
     depends_on("eospac", when="+eospac")