Merge branch 'main' into Semyon1104/BuildGraph_branching

Semyon1104 · web-flow · commit 5075d25ce893 · 2025-10-01T18:53:51.000+03:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -106,7 +106,7 @@ jobs:
       env:
         CTEST_OUTPUT_ON_FAILURE: 1
   build-macos:
-    runs-on: macos-14
+    runs-on: macos-15
     steps:
     - uses: actions/checkout@v4
       with:
@@ -132,21 +132,27 @@ jobs:
       env:
         CTEST_OUTPUT_ON_FAILURE: 1
   build-windows:
-    runs-on: windows-2022
+    runs-on: windows-2025
     steps:
     - uses: actions/checkout@v4
       with:
         submodules: true
+    - name: Add msbuild to PATH
+      uses: microsoft/setup-msbuild@v2
+      with:
+        vs-version: 'latest'
     - name: Setup ccache
-      uses: hendrikmuhs/ccache-action@v1.2
+      uses: Chocobo1/setup-ccache-action@v1
       with:
-        key: ccache-${{ github.job }}
-        max-size: 2G
-        variant: sccache
+        windows_compile_environment: msvc
+    - name: Setup ninja
+      uses: seanmiddleditch/gha-setup-ninja@v6
+    - name: Setup MSVC for Ninja again
+      uses: ilammy/msvc-dev-cmd@v1
     - name: Build
       run: |
-        cmake -S . -B build -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache
-        cmake --build build --parallel
+        cmake -S . -B build -G Ninja -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_BUILD_TYPE=Release
+        cmake --build build --parallel --config Release
     - name: Test
       run: |
         cd build
@@ -159,9 +165,16 @@ jobs:
         submodules: true
     - name: Install prerequisites
       run: sudo apt-get update && sudo apt-get install -y libomp-dev build-essential cmake
+    - name: Setup ccache
+      uses: hendrikmuhs/ccache-action@v1.2
+      with:
+        key: ccache-${{ github.job }}
     - name: Build and Test
       run: |
-        cmake -S . -B build -DCMAKE_BUILD_TYPE=Release
+        cmake -S . -B build \
+          -DCMAKE_C_COMPILER_LAUNCHER=ccache \
+          -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
+          -DCMAKE_BUILD_TYPE=Release
         cmake --build build --parallel
         cmake --build build -t test
       env:
@@ -269,7 +282,7 @@ jobs:
     - name: Verify library integrity
       run: |
        echo "### Library verification ###"
-       file build/bin/opencv_libs/libopencv_imgcodecs.so.4.9.0 | grep "shared object"
+       file build/bin/opencv_libs/libopencv_imgcodecs.so.4.12.0 | grep "shared object"
 
     - name: Run evaluation
       run: |
diff --git a/3rdparty/opencv b/3rdparty/opencv
@@ -1 +1 @@
-Subproject commit 2e3ccb4e8e098cf481c938998ff941e320fa4f85
+Subproject commit 49486f61fb25722cbcf586b7f4320921d46fb38e
diff --git a/app/Graph/CMakeLists.txt b/app/Graph/CMakeLists.txt
@@ -26,15 +26,9 @@ if (NOT CMAKE_BUILD_TYPE)
 endif()
 
 if (WIN32)
-	if ("${CMAKE_BUILD_TYPE}" STREQUAL "DEBUG")
-	    set(CMAKE_BUILD_TYPE "Debug")
-	endif()
-    if ("${CMAKE_BUILD_TYPE}" STREQUAL "RELEASE")
-	    set(CMAKE_BUILD_TYPE "Release")
-	endif()
     add_custom_command(TARGET Graph_Build POST_BUILD
         COMMAND ${CMAKE_COMMAND} -E copy_directory
-            "${OPENCV_BUILD_DIR}/bin/${CMAKE_BUILD_TYPE}/."
+            "${OPENCV_BUILD_DIR}/bin/."
             "${CMAKE_BINARY_DIR}/bin/")
 endif()
 
@@ -47,7 +41,7 @@ if (WIN32)
 	endif()
     add_custom_command(TARGET ACC POST_BUILD
         COMMAND ${CMAKE_COMMAND} -E copy_directory
-            "${OPENCV_BUILD_DIR}/bin/${CMAKE_BUILD_TYPE}/."
+            "${OPENCV_BUILD_DIR}/bin/."
             "${CMAKE_BINARY_DIR}/bin/")
 endif()
 
diff --git a/include/layers/OutputLayer.hpp b/include/layers/OutputLayer.hpp
@@ -104,7 +104,8 @@ std::pair<std::vector<std::string>, std::vector<ValueType>> top_k_vec(
   for (size_t i = 0; i < input.size(); i++) {
     sort_buf[i] = std::make_pair(labels[i], input[i]);
   }
-  std::sort(sort_buf.begin(), sort_buf.end(), compare_pair<ValueType>);
+  std::partial_sort(sort_buf.begin(), sort_buf.begin() + k, sort_buf.end(),
+                    compare_pair<ValueType>);
   std::vector<std::string> res_labels(k);
   std::vector<ValueType> res_input(k);
   for (size_t i = 0; i < k; i++) {
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -5,27 +5,22 @@ if (NOT WIN32)
     target_link_libraries(run_test PUBLIC OpenMP::OpenMP_CXX)
 endif()
 target_link_libraries(run_test PUBLIC perf_lib layers_lib)
-target_link_libraries(run_test PUBLIC gtest_main)
+target_link_libraries(run_test PUBLIC gtest)
 target_link_libraries(run_test PUBLIC ReadLib)
 target_link_libraries(run_test PUBLIC reader_lib)
 
 
+target_include_directories(run_test PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}")
 target_include_directories(run_test PRIVATE "${CMAKE_SOURCE_DIR}/app/ReaderImage")
 
 if (NOT CMAKE_BUILD_TYPE)
     set(CMAKE_BUILD_TYPE "Debug")
 endif()
 
 if (WIN32)
-	if ("${CMAKE_BUILD_TYPE}" STREQUAL "DEBUG")
-	    set(CMAKE_BUILD_TYPE "Debug")
-	endif()
-    if ("${CMAKE_BUILD_TYPE}" STREQUAL "RELEASE")
-	    set(CMAKE_BUILD_TYPE "Release")
-	endif()
     add_custom_command(TARGET run_test POST_BUILD
         COMMAND ${CMAKE_COMMAND} -E copy_directory
-            "${OPENCV_BUILD_DIR}/bin/${CMAKE_BUILD_TYPE}/."
+            "${OPENCV_BUILD_DIR}/bin/."
             "${CMAKE_BINARY_DIR}/bin/")
 endif()
 
diff --git a/test/inference/test_inference.cpp b/test/inference/test_inference.cpp
@@ -12,6 +12,7 @@
 #include "layers/OutputLayer.hpp"
 #include "layers/PoolingLayer.hpp"
 #include "layers/SplitLayer.hpp"
+#include "utils/flaky_test_runner.hpp"
 
 using namespace it_lab_ai;
 
@@ -494,7 +495,7 @@ TEST(bfs, check_struct_layer_added) {
   ASSERT_EQ(tmp, res);
 }
 
-TEST(bfs, check_struct_graph_split) {
+FLAKY_TEST(bfs, check_struct_graph_split) {
   std::vector<std::vector<std::pair<int, int>>> split = {
       {{12, 0}, {13, 0}, {14, 0}}};
   Graph graph(151, split);
@@ -572,4 +573,5 @@ TEST(bfs, check_struct_graph_split) {
   std::vector<int> tmp = *output.as<int>();
   std::vector<int> res(36, 81);
   ASSERT_EQ(tmp, res);
-}
+}
+FLAKY_END_TEST
diff --git a/test/main.cpp b/test/main.cpp
@@ -0,0 +1,25 @@
+#include <gtest/gtest.h>
+
+#include <cstdlib>
+#include <cstring>
+#include <iostream>
+
+int main(int argc, char** argv) {
+  ::testing::InitGoogleTest(&argc, argv);
+
+  const char* flaky_disabled = std::getenv("DISABLE_FLAKY_TESTS");
+  bool flaky_enabled =
+      (flaky_disabled == nullptr) || (std::strcmp(flaky_disabled, "1") != 0 &&
+                                      std::strcmp(flaky_disabled, "true") != 0);
+
+  if (flaky_enabled) {
+    const char* retries = std::getenv("FLAKY_RETRIES");
+    int retry_count = retries ? std::atoi(retries) : 10;
+    std::cout << "Flaky test support enabled. Max retries: " << retry_count
+              << std::endl;
+    std::cout << "Use FLAKY_TEST/FLAKY_TEST_F macros to create flaky tests."
+              << std::endl;
+  }
+
+  return RUN_ALL_TESTS();
+}
diff --git a/test/utils/flaky_test_runner.hpp b/test/utils/flaky_test_runner.hpp
@@ -0,0 +1,84 @@
+#pragma once
+
+#include <gtest/gtest.h>
+
+#include <cstdlib>
+#include <cstring>
+#include <iostream>
+
+namespace test_utils {
+
+static int getFlakyRetries() {
+  const char* retry_env = std::getenv("FLAKY_RETRIES");
+  if (retry_env != nullptr) {
+    try {
+      int retries = std::stoi(retry_env);
+      return std::max(1, std::min(retries, 100));
+    } catch (const std::exception&) {
+      return 10;
+    }
+  }
+  return 10;
+}
+
+static bool isFlakyTestsEnabled() {
+  const char* disabled = std::getenv("DISABLE_FLAKY_TESTS");
+  if (disabled == nullptr) {
+    return true;
+  }
+  return std::strcmp(disabled, "1") != 0 && std::strcmp(disabled, "true") != 0;
+}
+
+template <typename TestFunc>
+void runFlakyTest(const char* test_name, TestFunc test_func) {
+  if (!isFlakyTestsEnabled()) {
+    test_func();
+    return;
+  }
+
+  int max_retries = getFlakyRetries();
+
+  for (int attempt = 1; attempt <= max_retries; ++attempt) {
+    try {
+      if (attempt > 1) {
+        std::cout << "[FLAKY RETRY " << attempt << "/" << max_retries << "] "
+                  << test_name << std::endl;
+      }
+
+      test_func();
+
+      if (attempt > 1) {
+        std::cout << "[FLAKY SUCCESS] " << test_name << " passed on attempt "
+                  << attempt << std::endl;
+      }
+      return;
+
+    } catch (...) {
+      if (attempt == max_retries) {
+        std::cout << "[FLAKY EXHAUSTED] " << test_name << " failed after "
+                  << max_retries << " attempts" << std::endl;
+        throw;
+      } else if (attempt == 1) {
+        std::cout << "[FLAKY FAILED] " << test_name << " failed on attempt "
+                  << attempt << ", retrying..." << std::endl;
+      }
+    }
+  }
+}
+
+#define FLAKY_TEST(test_case_name, test_name) \
+  TEST(test_case_name, test_name) {           \
+    auto flaky_test_body = []()
+
+#define FLAKY_TEST_F(test_fixture, test_name) \
+  TEST_F(test_fixture, test_name) {           \
+    auto flaky_test_body = [this]()
+
+#define FLAKY_END_TEST                                               \
+  ;                                                                  \
+  test_utils::runFlakyTest(                                          \
+      testing::UnitTest::GetInstance()->current_test_info()->name(), \
+      flaky_test_body);                                              \
+  }
+
+}
