SYCL: Make sure to call find_dependency for oneDPL if necessary (kokk…

…os#6870) * Make sure to call find_dependency for oneDPL if necessary * Move linking with oneDPL to algorithms * Don't guard KOKKOS_IMPORT_TPL by CMake language
ldh4 · Mar 13, 2024 · 5e7cab9 · 5e7cab9
1 parent a2b64e0
commit 5e7cab9
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 2 deletions.
diff --git a/algorithms/src/CMakeLists.txt b/algorithms/src/CMakeLists.txt
@@ -31,3 +31,4 @@ KOKKOS_LIB_INCLUDE_DIRECTORIES(kokkosalgorithms
 )
 
 KOKKOS_LINK_TPL(kokkoscontainers PUBLIC ROCTHRUST)
+KOKKOS_LINK_TPL(kokkoscore PUBLIC ONEDPL)
diff --git a/cmake/Modules/FindTPLONEDPL.cmake b/cmake/Modules/FindTPLONEDPL.cmake
@@ -43,4 +43,7 @@ ELSE()
       COMPILE_DEFINITIONS PSTL_USE_PARALLEL_POLICIES=0 _GLIBCXX_USE_TBB_PAR_BACKEND=0
     )
   ENDIF()
+
+  # Export oneDPL as a Kokkos dependency
+  KOKKOS_EXPORT_CMAKE_TPL(oneDPL)
 ENDIF()
diff --git a/cmake/kokkos_tpls.cmake b/cmake/kokkos_tpls.cmake
@@ -82,8 +82,8 @@ IF (NOT WIN32)
 ENDIF()
 IF (NOT KOKKOS_ENABLE_COMPILE_AS_CMAKE_LANGUAGE)
   KOKKOS_IMPORT_TPL(ROCM INTERFACE)
-  KOKKOS_IMPORT_TPL(ONEDPL INTERFACE)
 ENDIF()
+KOKKOS_IMPORT_TPL(ONEDPL INTERFACE)
 KOKKOS_IMPORT_TPL(LIBQUADMATH)
 KOKKOS_IMPORT_TPL(ROCTHRUST)
 

diff --git a/core/src/CMakeLists.txt b/core/src/CMakeLists.txt
@@ -191,7 +191,6 @@ IF (NOT WIN32)
 ENDIF()
 IF (NOT KOKKOS_ENABLE_COMPILE_AS_CMAKE_LANGUAGE)
   KOKKOS_LINK_TPL(kokkoscore PUBLIC ROCM)
-  KOKKOS_LINK_TPL(kokkoscore PUBLIC ONEDPL)
 ENDIF()
 
 # FIXME: We need a proper solution to figure out whether to enable