Revert "Desul atomics: Trade SYCL-specific compile definition for a m…

…acro defintion in the configuration header"
tcclevenger · Nov 9, 2023 · 81e308e · 81e308e
1 parent 3f773d0
commit 81e308e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/cmake/kokkos_arch.cmake b/cmake/kokkos_arch.cmake
@@ -595,8 +595,9 @@ IF(KOKKOS_ENABLE_SYCL)
   INCLUDE(CheckCXXSymbolExists)
   CHECK_CXX_SYMBOL_EXISTS(SYCL_EXT_ONEAPI_DEVICE_GLOBAL "sycl/sycl.hpp" KOKKOS_IMPL_HAVE_SYCL_EXT_ONEAPI_DEVICE_GLOBAL)
   IF (KOKKOS_IMPL_HAVE_SYCL_EXT_ONEAPI_DEVICE_GLOBAL)
-    # Use the non-separable compilation implementation to support shared libraries as well.
     SET(KOKKOS_IMPL_SYCL_DEVICE_GLOBAL_SUPPORTED ON)
+    # Use the non-separable compilation implementation to support shared libraries as well.
+    COMPILER_SPECIFIC_FLAGS(DEFAULT -DDESUL_SYCL_DEVICE_GLOBAL_SUPPORTED)
   ELSEIF(NOT BUILD_SHARED_LIBS)
     INCLUDE(CheckCXXSourceCompiles)
     CHECK_CXX_SOURCE_COMPILES("
@@ -619,7 +620,7 @@ IF(KOKKOS_ENABLE_SYCL)
     IF(KOKKOS_IMPL_SYCL_DEVICE_GLOBAL_SUPPORTED)
       # Only the separable compilation implementation is supported.
       COMPILER_SPECIFIC_FLAGS(
-        DEFAULT -fsycl-device-code-split=off
+        DEFAULT -fsycl-device-code-split=off -DDESUL_SYCL_DEVICE_GLOBAL_SUPPORTED
       )
     ENDIF()
   ENDIF()

diff --git a/core/src/Kokkos_Atomics_Desul_Config.hpp b/core/src/Kokkos_Atomics_Desul_Config.hpp
@@ -32,8 +32,4 @@ static_assert(false,
 #define DESUL_CUDA_ARCH_IS_PRE_VOLTA
 #endif
 
-#if defined(KOKKOS_IMPL_SYCL_DEVICE_GLOBAL_SUPPORTED)
-#define DESUL_SYCL_DEVICE_GLOBAL_SUPPORTED
-#endif
-
 #endif  // KOKKOS_ATOMICS_DESUL_CONFIG_HPP