From 070bfa1ed7d21a00061fcea39d5f4d80cba56ccb Mon Sep 17 00:00:00 2001
From: brian-kelley <bmkelle@sandia.gov>
Date: Thu, 20 Mar 2025 20:13:00 -0600
Subject: [PATCH] KokkosKernels: apply PR 2296 as patch (#49627)

Applies this fix to all affected versions (4.0.00:4.4.00).
Fixes issue #49622.

Signed-off-by: Brian Kelley <bmkelle@sandia.gov>
---
 .../builtin/packages/kokkos-kernels/package.py   |  3 +++
 .../packages/kokkos-kernels/pr_2296_400.patch    | 16 ++++++++++++++++
 .../packages/kokkos-kernels/pr_2296_430.patch    | 16 ++++++++++++++++
 3 files changed, 35 insertions(+)
 create mode 100644 var/spack/repos/builtin/packages/kokkos-kernels/pr_2296_400.patch
 create mode 100644 var/spack/repos/builtin/packages/kokkos-kernels/pr_2296_430.patch

diff --git a/var/spack/repos/builtin/packages/kokkos-kernels/package.py b/var/spack/repos/builtin/packages/kokkos-kernels/package.py
index 1200d29dcd9..51a17438b06 100644
--- a/var/spack/repos/builtin/packages/kokkos-kernels/package.py
+++ b/var/spack/repos/builtin/packages/kokkos-kernels/package.py
@@ -250,6 +250,9 @@ class KokkosKernels(CMakePackage, CudaPackage):
 
     variant("shared", default=True, description="Build shared libraries")
 
+    patch("pr_2296_430.patch", when="@4.3.00:4.4.00")
+    patch("pr_2296_400.patch", when="@4.0.00:4.2.01")
+
     # sanity check
     sanity_check_is_file = [join_path("include", "KokkosKernels_config.h")]
     sanity_check_is_dir = ["include"]
diff --git a/var/spack/repos/builtin/packages/kokkos-kernels/pr_2296_400.patch b/var/spack/repos/builtin/packages/kokkos-kernels/pr_2296_400.patch
new file mode 100644
index 00000000000..b24c9f95aa5
--- /dev/null
+++ b/var/spack/repos/builtin/packages/kokkos-kernels/pr_2296_400.patch
@@ -0,0 +1,16 @@
+diff --git a/sparse/src/KokkosSparse_spadd_handle.hpp b/sparse/src/KokkosSparse_spadd_handle.hpp
+index 6d726e3da..01d96f551 100644
+--- a/sparse/src/KokkosSparse_spadd_handle.hpp
++++ b/sparse/src/KokkosSparse_spadd_handle.hpp
+@@ -76,10 +76,6 @@ class SPADDHandle {
+    */
+   size_type get_c_nnz() { return this->result_nnz_size; }
+ 
+-  void set_sort_option(int option) { this->sort_option = option; }
+-
+-  int get_sort_option() { return this->sort_option; }
+-
+   /**
+    * \brief Default constructor.
+    */
+
diff --git a/var/spack/repos/builtin/packages/kokkos-kernels/pr_2296_430.patch b/var/spack/repos/builtin/packages/kokkos-kernels/pr_2296_430.patch
new file mode 100644
index 00000000000..8ee32003b94
--- /dev/null
+++ b/var/spack/repos/builtin/packages/kokkos-kernels/pr_2296_430.patch
@@ -0,0 +1,16 @@
+diff --git a/sparse/src/KokkosSparse_spadd_handle.hpp b/sparse/src/KokkosSparse_spadd_handle.hpp
+index ea9594ca3..8d2830958 100644
+--- a/sparse/src/KokkosSparse_spadd_handle.hpp
++++ b/sparse/src/KokkosSparse_spadd_handle.hpp
+@@ -102,10 +102,6 @@ class SPADDHandle {
+    */
+   size_type get_c_nnz() { return this->result_nnz_size; }
+ 
+-  void set_sort_option(int option) { this->sort_option = option; }
+-
+-  int get_sort_option() { return this->sort_option; }
+-
+ #ifdef KOKKOSKERNELS_ENABLE_TPL_CUSPARSE
+   SpaddCusparseData cusparseData;
+ #endif
+