Narrow SYCL integration to minimal glue

Author: allnes

.github/workflows/sycl-ci.yml

@@ -76,7 +76,7 @@ jobs:
             -DCMAKE_CXX_COMPILER=${ITLABAI_CXX}
             -DCMAKE_PREFIX_PATH=${ITLABAI_CMAKE_PREFIX_PATH}
             -DITLABAI_ENABLE_SYCL=ON
-            -DITLABAI_SYCL_TARGETS=${ACPP_TARGETS}
+            -DACPP_TARGETS=${ACPP_TARGETS}
           )
           if command -v ccache >/dev/null 2>&1; then
             cmake_args+=(
@@ -107,7 +107,7 @@ jobs:
             "-DCMAKE_CXX_COMPILER=$env:ITLABAI_CXX",
             "-DCMAKE_PREFIX_PATH=$env:ITLABAI_CMAKE_PREFIX_PATH",
             '-DITLABAI_ENABLE_SYCL=ON',
-            "-DITLABAI_SYCL_TARGETS=$env:ACPP_TARGETS"
+            "-DACPP_TARGETS=$env:ACPP_TARGETS"
           )
           if (Get-Command ccache -ErrorAction SilentlyContinue) {
             $cmakeArgs += '-DCMAKE_C_COMPILER_LAUNCHER=ccache'

CMakeLists.txt

@@ -4,8 +4,6 @@ project(ITLabAI)
 
 set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Build type" FORCE)
 option(ITLABAI_ENABLE_SYCL "Build SYCL example and helper targets" OFF)
-set(ITLABAI_SYCL_TARGETS "" CACHE STRING
-    "Optional SYCL targets; forwarded to AdaptiveCpp as ACPP_TARGETS")
 
 option(ENABLE_STATISTIC_TENSORS "Enable statistic tensors" OFF)
 
@@ -39,17 +37,6 @@ else()
     message(STATUS "OpenMP not found - parallel features disabled")
 endif()
 
-if(ITLABAI_ENABLE_SYCL)
-    if(ITLABAI_SYCL_TARGETS)
-        set(ACPP_TARGETS "${ITLABAI_SYCL_TARGETS}" CACHE STRING
-            "AdaptiveCpp targets" FORCE)
-    endif()
-    find_package(AdaptiveCpp CONFIG REQUIRED)
-    function(itlabai_add_sycl_to_target)
-        add_sycl_to_target(${ARGN})
-    endfunction()
-endif()
-
 include_directories("include")
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
@@ -97,4 +84,9 @@ endforeach()
 add_subdirectory(app)
 add_subdirectory(include)
 add_subdirectory(src)
+
+if(ITLABAI_ENABLE_SYCL)
+    add_subdirectory(app/SYCL)
+endif()
+
 add_subdirectory(test)

app/CMakeLists.txt

@@ -2,7 +2,3 @@ add_subdirectory(ReaderImage)
 add_subdirectory(Accuracy)
 add_subdirectory(Converters)
 add_subdirectory(Graph)
-
-if(ITLABAI_ENABLE_SYCL)
-    add_subdirectory(SYCL)
-endif()

app/SYCL/CMakeLists.txt

@@ -1,10 +1,12 @@
+find_package(AdaptiveCpp CONFIG REQUIRED)
+
 add_executable(SYCL_Example
     sycl_example.cpp
 )
 target_link_libraries(SYCL_Example PRIVATE layers_lib AdaptiveCpp::acpp-rt)
 
 add_library(SYCL_Example_kernel OBJECT sycl_kernel.cpp)
-itlabai_add_sycl_to_target(TARGET SYCL_Example_kernel SOURCES
+add_sycl_to_target(TARGET SYCL_Example_kernel SOURCES
     sycl_kernel.cpp
 )
 target_sources(SYCL_Example PRIVATE $<TARGET_OBJECTS:SYCL_Example_kernel>)