Desul atomics: Trade SYCL-specific compile definition for a macro def…

…intion in the configuration header
tcclevenger · Nov 8, 2023 · c8b4fe8 · c8b4fe8
1 parent 26464df
commit c8b4fe8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/cmake/kokkos_arch.cmake b/cmake/kokkos_arch.cmake
@@ -595,9 +595,8 @@ 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)
-    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)
+    SET(KOKKOS_IMPL_SYCL_DEVICE_GLOBAL_SUPPORTED ON)
   ELSEIF(NOT BUILD_SHARED_LIBS)
     INCLUDE(CheckCXXSourceCompiles)
     CHECK_CXX_SOURCE_COMPILES("
@@ -620,7 +619,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 -DDESUL_SYCL_DEVICE_GLOBAL_SUPPORTED
+        DEFAULT -fsycl-device-code-split=off
       )
     ENDIF()
   ENDIF()

diff --git a/core/src/Kokkos_Atomics_Desul_Config.hpp b/core/src/Kokkos_Atomics_Desul_Config.hpp
@@ -32,4 +32,8 @@ 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