Merge pull request #1836 from dalg24/cleanup_kokkos_enable_pthread

Drop outdated workarounds for backward compatibility with Kokkos
kokkos · May 21, 2023 · 7df961e · 7df961e
2 parents 49b0c49 + 6f26e15
commit 7df961e
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git a/cmake/kokkos_backends.cmake b/cmake/kokkos_backends.cmake
@@ -16,9 +16,3 @@ CHECK_KOKKOS_BACKEND(OPENMPTARGET)
 CHECK_KOKKOS_BACKEND(CUDA)
 CHECK_KOKKOS_BACKEND(HIP)
 CHECK_KOKKOS_BACKEND(SYCL)
-
-# for backward compatibility.  can be dropped when requiring Kokkos 3.6
-IF (Kokkos_ENABLE_PTHREAD)
-  SET(KOKKOS_ENABLE_THREADS ON)
-  SET(KOKKOSKERNELS_INST_EXECSPACE_THREADS_DEFAULT ON)
-ENDIF()
diff --git a/common/src/KokkosKernels_default_types.hpp b/common/src/KokkosKernels_default_types.hpp
@@ -65,7 +65,7 @@ using default_device    = Kokkos::Experimental::HIP;
 using default_device    = Kokkos::Experimental::OpenMPTarget;
 #elif defined(KOKKOS_ENABLE_OPENMP)
 using default_device = Kokkos::OpenMP;
-#elif defined(KOKKOS_ENABLE_PTHREAD) || defined(KOKKOS_ENABLE_THREADS)
+#elif defined(KOKKOS_ENABLE_THREADS)
 using default_device = Kokkos::Threads;
 #else
 using default_device = Kokkos::Serial;