Reduce PR to direct SYCL integration only

Author: allnes

.github/workflows/sycl-ci.yml

@@ -76,10 +76,7 @@ jobs:
             -DCMAKE_CXX_COMPILER=${ITLABAI_CXX}
             -DCMAKE_PREFIX_PATH=${ITLABAI_CMAKE_PREFIX_PATH}
             -DITLABAI_ENABLE_SYCL=ON
-            -DITLABAI_SYCL_IMPLEMENTATION=AdaptiveCpp
-            -DITLABAI_ENABLE_OPENCV_APPS=OFF
-            -DITLABAI_BUILD_TESTS=ON
-            -DACPP_TARGETS=${ACPP_TARGETS}
+            -DITLABAI_SYCL_TARGETS=${ACPP_TARGETS}
           )
           if command -v ccache >/dev/null 2>&1; then
             cmake_args+=(
@@ -91,8 +88,8 @@ jobs:
             cmake_args+=(-DOpenMP_ROOT=${ITLABAI_OPENMP_ROOT})
           fi
           cmake "${cmake_args[@]}"
-          cmake --build "${build_dir}" --parallel
-          ctest --test-dir "${build_dir}" --output-on-failure -E '^SYCL\.Example$' --parallel
+          cmake --build "${build_dir}" --target SYCL_Example run_test --parallel
+          ctest --test-dir "${build_dir}" --output-on-failure -R '^UnitTests$'
         done
 
     - name: Configure, build and test
@@ -110,10 +107,7 @@ jobs:
             "-DCMAKE_CXX_COMPILER=$env:ITLABAI_CXX",
             "-DCMAKE_PREFIX_PATH=$env:ITLABAI_CMAKE_PREFIX_PATH",
             '-DITLABAI_ENABLE_SYCL=ON',
-            '-DITLABAI_SYCL_IMPLEMENTATION=AdaptiveCpp',
-            '-DITLABAI_ENABLE_OPENCV_APPS=OFF',
-            '-DITLABAI_BUILD_TESTS=ON',
-            "-DACPP_TARGETS=$env:ACPP_TARGETS"
+            "-DITLABAI_SYCL_TARGETS=$env:ACPP_TARGETS"
           )
           if (Get-Command ccache -ErrorAction SilentlyContinue) {
             $cmakeArgs += '-DCMAKE_C_COMPILER_LAUNCHER=ccache'
@@ -124,8 +118,8 @@ jobs:
           }
           & cmake @cmakeArgs
           if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
-          & cmake --build $buildDir --parallel
+          & cmake --build $buildDir --target SYCL_Example run_test --parallel
           if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
-          & ctest --test-dir $buildDir --output-on-failure -E '^SYCL\.Example$' --parallel
+          & ctest --test-dir $buildDir --output-on-failure -R '^UnitTests$'
           if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
         }

CMakeLists.txt

@@ -1,14 +1,9 @@
 cmake_minimum_required(VERSION 3.20)
 
-project(ITLabAI LANGUAGES CXX)
+project(ITLabAI)
 
 set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Build type" FORCE)
 option(ITLABAI_ENABLE_SYCL "Build SYCL example and helper targets" OFF)
-option(ITLABAI_ENABLE_OPENCV_APPS "Build OpenCV-dependent apps" ON)
-option(ITLABAI_BUILD_TESTS "Build unit tests" ON)
-set(ITLABAI_SYCL_IMPLEMENTATION "AdaptiveCpp" CACHE STRING
-    "SYCL implementation to use")
-set_property(CACHE ITLABAI_SYCL_IMPLEMENTATION PROPERTY STRINGS AdaptiveCpp)
 set(ITLABAI_SYCL_TARGETS "" CACHE STRING
     "Optional SYCL targets; forwarded to AdaptiveCpp as ACPP_TARGETS")
 
@@ -29,25 +24,22 @@ option(ENABLE_STATISTIC_WEIGHTS "Enable statistic weights" OFF)
 if(ENABLE_STATISTIC_WEIGHTS)
     add_definitions(-DENABLE_STATISTIC_WEIGHTS)
 endif()
+
 set(CMAKE_CXX_STANDARD 20)
 
 enable_testing()
 
-find_package(OpenMP REQUIRED COMPONENTS CXX)
+find_package(OpenMP REQUIRED)
 
 if(OpenMP_FOUND)
     message(STATUS "OpenMP found - enabling parallel support")
+    add_definitions(-DHAS_OPENMP)
+    link_libraries(OpenMP::OpenMP_CXX)
 else()
     message(STATUS "OpenMP not found - parallel features disabled")
 endif()
 
 if(ITLABAI_ENABLE_SYCL)
-    if(NOT ITLABAI_SYCL_IMPLEMENTATION STREQUAL "AdaptiveCpp")
-        message(FATAL_ERROR
-            "ITLABAI_ENABLE_SYCL=ON currently supports only "
-            "ITLABAI_SYCL_IMPLEMENTATION=AdaptiveCpp")
-    endif()
-
     if(ITLABAI_SYCL_TARGETS)
         set(ACPP_TARGETS "${ITLABAI_SYCL_TARGETS}" CACHE STRING
             "AdaptiveCpp targets" FORCE)
@@ -64,46 +56,31 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
 
 add_subdirectory(3rdparty)
 
-if(ITLABAI_ENABLE_OPENCV_APPS)
-    include(cmake/opencv_config.cmake)
-endif()
+include(cmake/opencv_config.cmake)
 include(cmake/kokkos_config.cmake)
 
-include_directories(SYSTEM "${KOKKOS_INSTALL_DIR}/include")
+include_directories("${KOKKOS_INSTALL_DIR}/include")
 
 add_library(Kokkos_imported INTERFACE)
 add_dependencies(Kokkos_imported kokkos_external)
 
-target_include_directories(Kokkos_imported SYSTEM INTERFACE
+target_include_directories(Kokkos_imported INTERFACE 
     "${KOKKOS_INSTALL_DIR}/include"
 )
-target_link_directories(Kokkos_imported INTERFACE
+
+target_link_directories(Kokkos_imported INTERFACE 
     "${KOKKOS_INSTALL_DIR}/lib"
 )
+
+
 target_link_libraries(Kokkos_imported INTERFACE kokkoscore kokkoscontainers)
 
 
 if(MSVC)
     add_compile_options(/wd4267 /wd4244 /wd4127 /wd4324)
 endif()
 
-get_filename_component(ITLABAI_C_COMPILER_NAME "${CMAKE_C_COMPILER}" NAME)
-get_filename_component(ITLABAI_CXX_COMPILER_NAME "${CMAKE_CXX_COMPILER}" NAME)
-string(TOLOWER "${ITLABAI_C_COMPILER_NAME}" ITLABAI_C_COMPILER_NAME_LOWER)
-string(TOLOWER "${ITLABAI_CXX_COMPILER_NAME}" ITLABAI_CXX_COMPILER_NAME_LOWER)
-
-set(ITLABAI_WINDOWS_USES_MSVC_FRONTEND OFF)
-if(WIN32 AND (
-    ITLABAI_C_COMPILER_NAME_LOWER MATCHES "(^|-)cl(\\.exe)?$"
-    OR ITLABAI_C_COMPILER_NAME_LOWER MATCHES "clang-cl(\\.exe)?$"
-    OR ITLABAI_C_COMPILER_NAME_LOWER MATCHES "icx-cl(\\.exe)?$"
-    OR ITLABAI_CXX_COMPILER_NAME_LOWER MATCHES "(^|-)cl(\\.exe)?$"
-    OR ITLABAI_CXX_COMPILER_NAME_LOWER MATCHES "clang-cl(\\.exe)?$"
-    OR ITLABAI_CXX_COMPILER_NAME_LOWER MATCHES "icx-cl(\\.exe)?$"))
-    set(ITLABAI_WINDOWS_USES_MSVC_FRONTEND ON)
-endif()
-
-if(NOT WIN32 OR NOT ITLABAI_WINDOWS_USES_MSVC_FRONTEND)
+if (NOT WIN32)
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Werror")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Werror")
 else()
@@ -120,7 +97,4 @@ endforeach()
 add_subdirectory(app)
 add_subdirectory(include)
 add_subdirectory(src)
-
-if(ITLABAI_BUILD_TESTS)
-    add_subdirectory(test)
-endif()
+add_subdirectory(test)

app/CMakeLists.txt

@@ -1,11 +1,8 @@
-if(ITLABAI_ENABLE_SYCL)
-    add_subdirectory(SYCL)
-endif()
-
+add_subdirectory(ReaderImage)
+add_subdirectory(Accuracy)
 add_subdirectory(Converters)
+add_subdirectory(Graph)
 
-if(ITLABAI_ENABLE_OPENCV_APPS)
-    add_subdirectory(ReaderImage)
-    add_subdirectory(Accuracy)
-    add_subdirectory(Graph)
+if(ITLABAI_ENABLE_SYCL)
+    add_subdirectory(SYCL)
 endif()

scripts/ci/sycl_setup.py

@@ -63,7 +63,6 @@ def set_common_env(cc: Path, cxx: Path, prefixes: list[Path], openmp_root: Path
     write_env("ITLABAI_CC", str(cc))
     write_env("ITLABAI_CXX", str(cxx))
     write_env("ITLABAI_CMAKE_PREFIX_PATH", ";".join(str(path) for path in prefixes))
-    write_env("ITLABAI_ENABLE_OPENCV_APPS", "OFF")
     write_env("ACPP_TARGETS", "omp.library-only")
     if openmp_root is not None:
         write_env("ITLABAI_OPENMP_ROOT", str(openmp_root))