Trim PR to SYCL-only changes

allnes · allnes · commit e0bdd5bcf9d3 · 2026-04-20T16:48:12.000+02:00
diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt
@@ -1,22 +1,15 @@
 add_subdirectory(googletest)
 
-if(WIN32 AND CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-    foreach(itlabai_gtest_target IN ITEMS gtest gtest_main gmock gmock_main)
-        if(TARGET ${itlabai_gtest_target})
-            target_compile_options(${itlabai_gtest_target} PRIVATE -Wno-character-conversion)
-        endif()
-    endforeach()
-endif()
-
 set(DNNL_CPU_RUNTIME "TBB" CACHE STRING "oneDNN CPU threading runtime")
 
 add_subdirectory(oneDNN)
 
-# Unified TBB configuration for the vendored fallback.
+# Unified TBB Configuration
 option(TBB_TEST "Build TBB tests" OFF)
 option(TBB_EXAMPLES "Build TBB examples" OFF)
 set(TBB_STRICT OFF CACHE BOOL "Treat compiler warnings as errors")
 
+# Configure TBB with unified settings
 add_subdirectory(TBB)
 
 # Create a unified TBB interface target
@@ -27,8 +20,17 @@ if(NOT TARGET TBB_unified)
         $<TARGET_PROPERTY:TBB::tbb,INTERFACE_INCLUDE_DIRECTORIES>
     )
     
-    # Platform-specific runtime library handling for Windows.
+    # Platform-specific runtime library handling for Windows
     if(WIN32)
+        # Get the TBB library directory based on build type
+        if(CMAKE_BUILD_TYPE)
+            string(TOLOWER ${CMAKE_BUILD_TYPE} lower_build)
+            set(TBB_LIB_DIR "${CMAKE_SOURCE_DIR}/3rdparty/TBB/build/tbb_${lower_build}")
+        else()
+            set(TBB_LIB_DIR "${CMAKE_SOURCE_DIR}/3rdparty/TBB/build/tbb_debug")
+        endif()
+        
+        # Create a custom target to copy TBB runtime libraries
         add_custom_target(copy_tbb_runtime ALL
             COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_BINARY_DIR}/bin"
             COMMAND ${CMAKE_COMMAND} -E copy_if_different
diff --git a/app/Accuracy/CMakeLists.txt b/app/Accuracy/CMakeLists.txt
@@ -3,16 +3,17 @@ set(SRC_FILES "${CMAKE_CURRENT_SOURCE_DIR}/acc.cpp")
 add_library(ACCLib STATIC ${INCLUDE_HEADERS} ${SRC_FILES})
 
 set_target_properties(ReadLib PROPERTIES LINKER_LANGUAGE CXX)
-target_link_libraries(ACCLib PUBLIC OpenCV_unified)
-target_link_libraries(ACCLib PUBLIC TBB_unified)
-target_link_libraries(ACCLib PUBLIC layers_lib)
-target_link_libraries(ACCLib PUBLIC gtest_main)
-target_link_libraries(ACCLib PUBLIC Kokkos_imported)
-add_dependencies(ACCLib opencv_external)
+
+find_package( OpenCV REQUIRED PATHS "${OPENCV_BUILD_DIR}" )
+include_directories( ${OpenCV_INCLUDE_DIRS} )
+target_link_libraries( ACCLib ${OpenCV_LIBS} )
+target_link_libraries( ACCLib TBB_unified)
+target_link_libraries( ACCLib layers_lib)
+target_link_libraries( ACCLib gtest_main)
+target_link_libraries( ACCLib Kokkos_imported)
 
 add_executable(Accuracy_Check accuracy_check.cpp)
 target_link_libraries(Accuracy_Check ACCLib)
-add_dependencies(Accuracy_Check opencv_external)
 
 file(DOWNLOAD
     "https://raw.githubusercontent.com/opencv/opencv/4.x/samples/data/lena.jpg"
diff --git a/app/Graph/CMakeLists.txt b/app/Graph/CMakeLists.txt
@@ -3,30 +3,31 @@ set(SRC_FILES "${CMAKE_CURRENT_SOURCE_DIR}/build.cpp")
 add_library(BuildGraph STATIC ${INCLUDE_HEADERS} ${SRC_FILES})
 
 set_target_properties(BuildGraph PROPERTIES LINKER_LANGUAGE CXX)
-target_link_libraries(BuildGraph PUBLIC OpenCV_unified)
+
+find_package(OpenCV REQUIRED PATHS "${OPENCV_BUILD_DIR}")
+include_directories(${OpenCV_INCLUDE_DIRS})
+
+target_link_libraries(BuildGraph PUBLIC ${OpenCV_LIBS})
 target_link_libraries(BuildGraph PUBLIC reader_lib)
 target_link_libraries(BuildGraph PUBLIC TBB_unified)
 target_link_libraries(BuildGraph PUBLIC layers_lib)
 target_link_libraries(BuildGraph PUBLIC layers_fused_lib)
 target_link_libraries(BuildGraph PUBLIC layers_oneDNN_lib)
 target_link_libraries(BuildGraph PUBLIC gtest_main)
-add_dependencies(BuildGraph opencv_external)
 
 target_include_directories(BuildGraph PUBLIC ${CMAKE_SOURCE_DIR}/3rdparty/Json/include)
 
 add_executable(Graph_Build graph_build.cpp)
 target_link_libraries(Graph_Build BuildGraph)
-add_dependencies(Graph_Build opencv_external)
 
 add_executable(ACC acc_check.cpp)
 target_link_libraries(ACC BuildGraph)
-add_dependencies(ACC opencv_external)
 
 add_executable(onnx_subgraphs onnx_subgraphs.cpp)
 target_link_libraries(onnx_subgraphs BuildGraph)
 target_link_libraries(onnx_subgraphs OpenMP::OpenMP_CXX)
+target_link_libraries(onnx_subgraphs ${OpenCV_LIBS})
 target_link_libraries(onnx_subgraphs graphT_lib)
-add_dependencies(onnx_subgraphs opencv_external)
 
 file(DOWNLOAD
     "https://raw.githubusercontent.com/DeepTrackAI/MNIST_dataset/main/mnist/test/1_000008.png"
diff --git a/app/ReaderImage/CMakeLists.txt b/app/ReaderImage/CMakeLists.txt
@@ -2,14 +2,16 @@ set(INCLUDE_HEADERS "${CMAKE_CURRENT_SOURCE_DIR}/reader_img.hpp")
 set(SRC_FILES "${CMAKE_CURRENT_SOURCE_DIR}/reader_img_s.cpp")
 add_library(ReadLib STATIC ${INCLUDE_HEADERS} ${SRC_FILES})
 
+
 set_target_properties(ReadLib PROPERTIES LINKER_LANGUAGE CXX)
-target_link_libraries(ReadLib PUBLIC OpenCV_unified)
-target_link_libraries(ReadLib PUBLIC TBB_unified)
-add_dependencies(ReadLib opencv_external)
+
+find_package( OpenCV REQUIRED PATHS "${OPENCV_BUILD_DIR}" )
+include_directories( ${OpenCV_INCLUDE_DIRS} )
+target_link_libraries( ReadLib ${OpenCV_LIBS} )
+target_link_libraries( ReadLib TBB_unified)
 
 add_executable(Reader reader_img.cpp)
 target_link_libraries(Reader ReadLib)
-add_dependencies(Reader opencv_external)
 
 file(DOWNLOAD
     "https://raw.githubusercontent.com/opencv/opencv/4.x/samples/data/lena.jpg"
diff --git a/cmake/opencv_config.cmake b/cmake/opencv_config.cmake
@@ -2,16 +2,16 @@ set(OPENCV_BUILD_DIR "${CMAKE_BINARY_DIR}/3rdparty/opencv_build")
 file(MAKE_DIRECTORY "${OPENCV_BUILD_DIR}")
 
 execute_process(
-    COMMAND ${CMAKE_COMMAND}
-        -S "${CMAKE_SOURCE_DIR}/3rdparty/opencv"
-        -B "${OPENCV_BUILD_DIR}"
+    COMMAND ${CMAKE_COMMAND} 
+        -S "${CMAKE_SOURCE_DIR}/3rdparty/opencv" 
+        -B "${OPENCV_BUILD_DIR}" 
         -G "${CMAKE_GENERATOR}"
-        -DCMAKE_C_COMPILER_LAUNCHER=${CMAKE_C_COMPILER_LAUNCHER}
-        -DCMAKE_CXX_COMPILER_LAUNCHER=${CMAKE_CXX_COMPILER_LAUNCHER}
-        -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-        -DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}
-        -DBUILD_PERF_TESTS=OFF
-        -DBUILD_TESTS=OFF
+        -DCMAKE_C_COMPILER_LAUNCHER=${CMAKE_C_COMPILER_LAUNCHER} 
+        -DCMAKE_CXX_COMPILER_LAUNCHER=${CMAKE_CXX_COMPILER_LAUNCHER} 
+        -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} 
+        -DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM} 
+        -DBUILD_PERF_TESTS=OFF 
+        -DBUILD_TESTS=OFF 
         -DBUILD_opencv_apps=OFF
         -DBUILD_JAVA=OFF
     WORKING_DIRECTORY "${OPENCV_BUILD_DIR}"
diff --git a/include/layers/ConcatLayer.hpp b/include/layers/ConcatLayer.hpp
@@ -1,6 +1,5 @@
 #pragma once
-#include <stdint.h>
-
+#include <cstdint>
 #include <numeric>
 #include <stdexcept>
 #include <vector>
diff --git a/include/layers/InputLayer.hpp b/include/layers/InputLayer.hpp
@@ -1,8 +1,7 @@
 #pragma once
-#include <stdint.h>
-
 #include <algorithm>
 #include <cmath>
+#include <cstdint>
 
 #include "layers/Layer.hpp"
 
diff --git a/include/layers/Layer.hpp b/include/layers/Layer.hpp
@@ -1,5 +1,6 @@
 #pragma once
 #include <algorithm>
+#include <execution>
 #include <functional>
 #include <initializer_list>
 #include <iostream>
diff --git a/include/layers/ReduceLayer.hpp b/include/layers/ReduceLayer.hpp
@@ -1,6 +1,5 @@
 #pragma once
-#include <stdint.h>
-
+#include <cstdint>
 #include <limits>
 #include <vector>
 
diff --git a/include/layers/Tensor.hpp b/include/layers/Tensor.hpp
@@ -1,7 +1,6 @@
 #pragma once
 
-#include <stdint.h>
-
+#include <cstdint>
 #include <iostream>
 #include <stdexcept>
 #include <type_traits>
diff --git a/include/layers_oneDNN/ReduceLayer.hpp b/include/layers_oneDNN/ReduceLayer.hpp
@@ -1,6 +1,5 @@
 #pragma once
-#include <stdint.h>
-
+#include <cstdint>
 #include <dnnl.hpp>
 #include <memory>
 #include <vector>
diff --git a/include/parallel/backends.hpp b/include/parallel/backends.hpp
@@ -1,14 +1,12 @@
 #pragma once
-// clang-format off
-#include <stdint.h>
 #include <oneapi/tbb/blocked_range.h>
 #include <oneapi/tbb/info.h>
 #include <oneapi/tbb/parallel_for.h>
-// clang-format on
 
 // NOLINTNEXTLINE(misc-header-include-cycle)
 #include <Kokkos_Core.hpp>
 #include <cstddef>
+#include <cstdint>
 #include <functional>
 #include <limits>
 #include <thread>
@@ -17,7 +15,7 @@
 namespace it_lab_ai {
 namespace parallel {
 
-enum class Backend : uint8_t {
+enum class Backend : std::uint8_t {
   kSeq = 0,
   kThreads = 1,
   kTbb = 2,
@@ -94,7 +92,7 @@ inline void impl_tbb(std::size_t count,
   }, oneapi::tbb::auto_partitioner());
 }
 
-#ifdef _OPENMP
+#ifdef HAS_OPENMP
 inline void impl_omp(std::size_t count,
                      const std::function<void(std::size_t)>& func,
                      const Options& opt) {
@@ -121,7 +119,7 @@ inline void impl_omp(std::size_t count,
 #else
 inline void impl_omp(std::size_t count,
                      const std::function<void(std::size_t)>& func,
-                     const Options& opt [[maybe_unused]]) {
+                     const Options& opt) {
   impl_seq(count, func);
 }
 #endif
diff --git a/include/parallel/parallel.hpp b/include/parallel/parallel.hpp
@@ -5,7 +5,7 @@ namespace it_lab_ai {
 namespace parallel {
 
 constexpr bool kHasOmp =
-#ifdef _OPENMP
+#ifdef HAS_OPENMP
     true;
 #else
     false;
@@ -16,7 +16,7 @@ inline Backend resolve_default_backend(std::size_t n, const Options& opt) {
     return Backend::kSeq;
   }
 
-#ifdef _OPENMP
+#ifdef HAS_OPENMP
   return Backend::kOmp;
 #else
   return Backend::kTbb;
diff --git a/include/perf/benchmarking.hpp b/include/perf/benchmarking.hpp
@@ -1,10 +1,7 @@
 // Using chrono for good measurements and parallelism support
 
 #pragma once
-// clang-format off
-#include <stdint.h>
 #include <omp.h>
-// clang-format on
 
 #include <chrono>
 #include <cmath>
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -1,28 +1,18 @@
 file(GLOB_RECURSE TEST_SRC_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp)
 
-if(NOT ITLABAI_ENABLE_OPENCV_APPS)
-    list(REMOVE_ITEM TEST_SRC_FILES "${CMAKE_CURRENT_SOURCE_DIR}/test_read/test_read.cpp")
-endif()
-
 add_executable(run_test ${TEST_SRC_FILES})
 
-if(WIN32)
-    target_compile_definitions(run_test PRIVATE _CRT_SECURE_NO_WARNINGS)
-endif()
-
 target_link_libraries(run_test PUBLIC OpenMP::OpenMP_CXX)
 target_link_libraries(run_test PUBLIC perf_lib layers_lib layers_oneDNN_lib layers_fused_lib)
 target_link_libraries(run_test PUBLIC gtest)
+target_link_libraries(run_test PUBLIC ReadLib)
 target_link_libraries(run_test PUBLIC reader_lib)
 target_link_libraries(run_test PUBLIC graph_lib)
 target_link_libraries(run_test PUBLIC graphT_lib)
 
-if(ITLABAI_ENABLE_OPENCV_APPS)
-    target_link_libraries(run_test PUBLIC ReadLib)
-    target_include_directories(run_test PRIVATE "${CMAKE_SOURCE_DIR}/app/ReaderImage")
-endif()
 
 target_include_directories(run_test PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}")
+target_include_directories(run_test PRIVATE "${CMAKE_SOURCE_DIR}/app/ReaderImage")
 
 if (WIN32)
     add_custom_command(TARGET run_test POST_BUILD
@@ -34,15 +24,13 @@ endif()
 
 add_test(UnitTests ${CMAKE_BINARY_DIR}/bin/run_test)
 
-if(ITLABAI_ENABLE_OPENCV_APPS)
-    file(DOWNLOAD
-        "https://raw.githubusercontent.com/opencv/opencv/4.x/samples/data/lena.jpg"
-        "${CMAKE_CURRENT_BINARY_DIR}/image.jpg"
-        SHOW_PROGRESS
-        STATUS status_code
-        LOG log_file
-    )
-endif()
+file(DOWNLOAD
+    "https://raw.githubusercontent.com/opencv/opencv/4.x/samples/data/lena.jpg"
+    "${CMAKE_CURRENT_BINARY_DIR}/image.jpg"
+    SHOW_PROGRESS
+    STATUS status_code
+    LOG log_file
+)
 
 file(DOWNLOAD
     "https://raw.githubusercontent.com/bpinaya/AlexNetRT/master/data/alexnet/imagenet-labels.txt"
diff --git a/test/single_layer/test_batchnormalizationlayer.cpp b/test/single_layer/test_batchnormalizationlayer.cpp
@@ -1,6 +1,5 @@
-﻿#include <stdint.h>
-
-#include <cmath>
+﻿#include <cmath>
+#include <cstdint>
 #include <iostream>
 #include <vector>
 
diff --git a/test/single_layer/test_matmullayer.cpp b/test/single_layer/test_matmullayer.cpp
@@ -1,5 +1,4 @@
-﻿#include <stdint.h>
-
+﻿#include <cstdint>
 #include <iostream>
 #include <vector>
 
diff --git a/test/single_layer/test_tensor.cpp b/test/single_layer/test_tensor.cpp
@@ -1,5 +1,4 @@
-﻿#include <stdint.h>
-
+﻿#include <cstdint>
 #include <iostream>
 #include <vector>
 
diff --git a/test/single_layer/test_transposelayer.cpp b/test/single_layer/test_transposelayer.cpp
@@ -1,5 +1,4 @@
-﻿#include <stdint.h>
-
+﻿#include <cstdint>
 #include <iostream>
 #include <vector>
 
