From 6f26e1527cb60e0d2dcc6a7a2985ce826a7f1350 Mon Sep 17 00:00:00 2001 From: Damien L-G Date: Thu, 18 May 2023 16:09:51 -0400 Subject: [PATCH] Drop outdated workarounds for backward compatibility with now unsupported Kokkos versions --- cmake/kokkos_backends.cmake | 6 ------ common/src/KokkosKernels_default_types.hpp | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/cmake/kokkos_backends.cmake b/cmake/kokkos_backends.cmake index 9346475f91..a90ad69bf0 100644 --- 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 index 9210264b61..672bdf3fbb 100644 --- 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;