Add optional add_sycl_to_target to cmake

Author: sbalint98

CMakeLists.txt

@@ -49,6 +49,7 @@ endif()
 option(ENABLE_CUBLAS_BACKEND "" OFF)
 option(ENABLE_CURAND_BACKEND "" OFF)
 option(ENABLE_NETLIB_BACKEND "" OFF)
+set(ONEMKL_SYCL_IMPLEMENTATION "dpc++" CACHE STRING "Specifiy the SYCL implementation against which oneMKL should be built")
 
 ## Domains
 set(DOMAINS_LIST "")
@@ -119,7 +120,19 @@ add_subdirectory(cmake)
 list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")
 
 # Find necessary packages
-find_package(Compiler REQUIRED)
+if (ONEMKL_SYCL_IMPLEMENTATION STREQUAL "hipSYCL")
+  message(STATUS "Looking for hipSYCL")
+  find_package(hipSYCL CONFIG PATHS /opt/hipSYCL/lib/cmake/ REQUIRED)
+  set(CMAKE_CXX_STANDARD 17)
+  set(USE_ADD_SYCL_TO_TARGET_INTEGRATION true)
+  add_library(ONEMKL::SYCL::SYCL INTERFACE IMPORTED)
+elseif(ONEMKL_SYCL_IMPLEMENTATION STREQUAL "dpc++")
+  message(STATUS "Looking for dpc++")
+  set(USE_ADD_SYCL_TO_TARGET_INTEGRATION false)
+  find_package(Compiler REQUIRED)
+else()
+  message(FATAL_ERROR "SYCL implementation ${ONEMKL_SYCL_IMPLEMENTATION} is not known")
+endif()
 
 # Add source directory and output to bin/
 add_subdirectory(src bin)

src/CMakeLists.txt

@@ -48,6 +48,9 @@ if(BUILD_SHARED_LIBS)
            $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
            $<INSTALL_INTERFACE:include>
   )
+  if (USE_ADD_SYCL_TO_TARGET_INTEGRATION)
+    add_sycl_to_target(TARGET onemkl)
+  endif()
   set_target_properties(onemkl PROPERTIES
     SOVERSION ${PROJECT_VERSION_MAJOR}
   )

src/blas/CMakeLists.txt

@@ -31,12 +31,16 @@ target_include_directories(onemkl_blas
           ${CMAKE_BINARY_DIR}/bin
           $<TARGET_FILE_DIR:onemkl>
 )
-
 target_compile_options(onemkl_blas PRIVATE ${ONEMKL_BUILD_COPT})
 
 set_target_properties(onemkl_blas PROPERTIES
   POSITION_INDEPENDENT_CODE ON
 )
-target_link_libraries(onemkl_blas PUBLIC ONEMKL::SYCL::SYCL)
+if (USE_ADD_SYCL_TO_TARGET_INTEGRATION)
+  add_sycl_to_target(TARGET onemkl_blas)
+else()
+  target_link_libraries(onemkl_blas PUBLIC ONEMKL::SYCL::SYCL)
+endif()
+
 endif()
 

src/blas/backends/cublas/CMakeLists.txt

@@ -42,7 +42,10 @@ set_target_properties(${LIB_OBJ} PROPERTIES
   POSITION_INDEPENDENT_CODE ON)
 
 target_link_libraries(${LIB_NAME} PUBLIC ${LIB_OBJ})
-
+if (USE_ADD_SYCL_TO_TARGET_INTEGRATION)
+  add_sycl_to_target(TARGET ${LIB_NAME})
+  add_sycl_to_target(TARGET ${LIB_OBJ})
+endif()
 # Add major version to the library
 set_target_properties(${LIB_NAME} PROPERTIES
   SOVERSION ${PROJECT_VERSION_MAJOR}

src/blas/backends/mklcpu/CMakeLists.txt

@@ -28,6 +28,10 @@ add_library(${LIB_OBJ} OBJECT
   mklcpu_level1.cpp mklcpu_level2.cpp mklcpu_level3.cpp mklcpu_batch.cpp mklcpu_extensions.cpp
   $<$<BOOL:${BUILD_SHARED_LIBS}>: mklcpu_wrappers.cpp>
 )
+if (USE_ADD_SYCL_TO_TARGET_INTEGRATION)
+  add_sycl_to_target(TARGET ${LIB_NAME})
+  add_sycl_to_target(TARGET ${LIB_OBJ})
+endif()
 
 target_include_directories(${LIB_OBJ}
   PRIVATE ${PROJECT_SOURCE_DIR}/include

src/rng/CMakeLists.txt

@@ -37,5 +37,10 @@ target_compile_options(onemkl_rng PRIVATE ${ONEMKL_BUILD_COPT})
 set_target_properties(onemkl_rng PROPERTIES
   POSITION_INDEPENDENT_CODE ON
 )
-target_link_libraries(onemkl_rng PUBLIC ONEMKL::SYCL::SYCL)
+if (USE_ADD_SYCL_TO_TARGET_INTEGRATION)
+  add_sycl_to_target(TARGET onemkl_rng)
+else()
+  target_link_libraries(onemkl_rng PUBLIC ONEMKL::SYCL::SYCL)
+endif()
+
 endif()

src/rng/backends/curand/CMakeLists.txt

@@ -42,7 +42,10 @@ set_target_properties(${LIB_OBJ} PROPERTIES
 )
 
 target_link_libraries(${LIB_NAME} PUBLIC ${LIB_OBJ})
-
+if (USE_ADD_SYCL_TO_TARGET_INTEGRATION)
+  add_sycl_to_target(TARGET ${LIB_OBJ})
+  add_sycl_to_target(TARGET ${LIB_NAME})
+endif()
 # Add major version to the library
 set_target_properties(${LIB_NAME} PROPERTIES
   SOVERSION ${PROJECT_VERSION_MAJOR}

src/rng/backends/mklcpu/CMakeLists.txt

@@ -38,7 +38,10 @@ target_include_directories(${LIB_OBJ}
 )
 
 target_compile_options(${LIB_OBJ} PRIVATE ${ONEMKL_BUILD_COPT} ${MKL_COPT})
-
+if (USE_ADD_SYCL_TO_TARGET_INTEGRATION)
+  add_sycl_to_target(TARGET ${LIB_OBJ})
+  add_sycl_to_target(TARGET ${LIB_NAME})
+endif()
 target_link_libraries(${LIB_OBJ} PUBLIC ONEMKL::SYCL::SYCL ${MKL_LINK_C})
 
 set_target_properties(${LIB_OBJ} PROPERTIES

tests/unit_tests/CMakeLists.txt

@@ -109,7 +109,9 @@ foreach(domain ${TARGET_DOMAINS})
       ONEMKL::SYCL::SYCL
       ${${domain}_TEST_LIST_CT}
   )
-
+  if (USE_ADD_SYCL_TO_TARGET_INTEGRATION)
+    add_sycl_to_target(TARGET test_main_${domain}_ct)
+  endif()
   string(TOUPPER ${domain} DOMAIN_PREFIX)
 
   if(BUILD_SHARED_LIBS)
@@ -130,5 +132,8 @@ foreach(domain ${TARGET_DOMAINS})
     PROPERTIES TEST_PREFIX ${DOMAIN_PREFIX}/CT/
     DISCOVERY_TIMEOUT 30
   )
+  if (USE_ADD_SYCL_TO_TARGET_INTEGRATION)
+    add_sycl_to_target(TARGET test_main_${domain}_rt)
+  endif()
 
 endforeach()

tests/unit_tests/blas/batch/CMakeLists.txt

@@ -32,6 +32,11 @@ if(BUILD_SHARED_LIBS)
       PUBLIC ${CBLAS_INCLUDE}
   )
   target_link_libraries(blas_batch_rt PUBLIC ONEMKL::SYCL::SYCL)
+  if (USE_ADD_SYCL_TO_TARGET_INTEGRATION)
+    add_sycl_to_target(TARGET blas_batch_rt)
+  else()
+    target_link_libraries(blas_batch_rt PUBLIC ONEMKL::SYCL::SYCL)
+  endif()
 endif()
 
 add_library(blas_batch_ct OBJECT ${BATCH_SOURCES})
@@ -45,3 +50,8 @@ target_include_directories(blas_batch_ct
     PUBLIC ${CBLAS_INCLUDE}
 )
 target_link_libraries(blas_batch_ct PUBLIC ONEMKL::SYCL::SYCL)
+if (USE_ADD_SYCL_TO_TARGET_INTEGRATION)
+  add_sycl_to_target(TARGET blas_batch_ct)
+else()
+  target_link_libraries(blas_batch_ct PUBLIC ONEMKL::SYCL::SYCL)
+endif()