[pull] master from Smorodov:master

.github/workflows/codeql-analysis.yml

@@ -17,7 +17,7 @@ on:
 jobs:
   analyze:
     name: Analyze
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
 
     strategy:
       fail-fast: false
@@ -27,17 +27,17 @@ jobs:
         language: ['cpp']
         # Supported version for OpenCV
         opencv: [
-          4.2.0
+          4.10.0
         ]
         compiler: [g++]
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -57,7 +57,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
+      uses: github/codeql-action/autobuild@v3
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -71,4 +71,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v3

.github/workflows/macos.yml

@@ -0,0 +1,30 @@
+name: Macos C/C++ CI
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+jobs:
+  build-macos:
+    runs-on: macos-latest
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Install dependencies
+      run: |
+        brew uninstall cmake
+        brew update
+        brew install opencv cmake
+
+    - name: Configure CMake
+      run: |
+        mkdir -p build
+        cd build
+        cmake ..
+
+    - name: Build
+      working-directory: build
+      run: make
+

.github/workflows/ubuntu.yml

@@ -0,0 +1,29 @@
+name: Ubuntu C/C++ CI
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+jobs:
+  build-linux:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Install dependencies
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y libopencv-dev cmake g++
+
+    - name: Configure CMake
+      run: |
+        mkdir -p build
+        cd build
+        cmake ..
+
+    - name: Build
+      working-directory: build
+      run: make
+

.gitignore

@@ -2,3 +2,8 @@ build
 CMakeLists.txt.user*
 CMakeFiles
 CMakeCache.txt
+*.engine
+*.onnx
+*.weights
+*.pt
+*.pth

CMakeLists.txt

@@ -23,7 +23,7 @@ if (CMAKE_COMPILER_IS_GNUCXX)
     set(CMAKE_CXX_FLAGS_RELEASE "-O3 -g -march=native -mtune=native -funroll-loops -DNDEBUG -DBOOST_DISABLE_ASSERTS" CACHE STRING COMPILE_FLAGS FORCE)
     set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g -march=native -mtune=native -DDEBUG" CACHE STRING COMPILE_FLAGS FORCE)
 elseif (MSVC)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc /W4 -DGTL_STATIC" CACHE STRING COMPILE_FLAGS FORCE)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc /W4 /utf-8" CACHE STRING COMPILE_FLAGS FORCE)
     set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MD /Ox /Ob2 /Oi /Ot /arch:AVX2 /fp:fast /DNDEBUG" CACHE STRING COMPILE_FLAGS FORCE)
     # set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MDd /Od /Ob0 /DDEBUG" CACHE STRING COMPILE_FLAGS FORCE)
 
@@ -44,18 +44,12 @@ endif(SILENT_WORK)
 include(CheckIncludeFileCXX)
 check_include_file_cxx(filesystem HAVE_FILESYSTEM)
 if(HAVE_FILESYSTEM)
-    add_definitions(-DHAVE_FILESYSTEM)
     message("Founded filesystem header")
 else(HAVE_FILESYSTEM)
+    add_definitions(-DHAVE_EXPERIMENTAL_FILESYSTEM)
     message("Do not found filesystem header")
 endif(HAVE_FILESYSTEM)
 
-option(BUILD_ABANDONED_DETECTOR "Should compiled abandoned detector example?" OFF)
-if (BUILD_ABANDONED_DETECTOR)
-    add_definitions(-DBUILD_ABANDONED_DETECTOR)
-    add_subdirectory(combined)
-endif(BUILD_ABANDONED_DETECTOR)
-
 option(BUILD_EXAMPLES "Should compiled examples (motion detection, pedestrians, faces, DNNs etc)?" ON)
 if (BUILD_EXAMPLES)
     add_subdirectory(example)
@@ -77,39 +71,11 @@ if (BUILD_ASYNC_DETECTOR)
     add_subdirectory(async_detector)
 endif(BUILD_ASYNC_DETECTOR)
 
-option(BUILD_YOLO_LIB "Should compiled standalone yolo_lib with original darknet?" OFF)
-if (BUILD_YOLO_LIB)
-    add_subdirectory(src/Detector/darknet)
-    add_definitions(-DBUILD_YOLO_LIB)
-
-if (MSVC)
-    if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "4")
-        set(BIT_SYSTEM x32)
-    else()
-        set(BIT_SYSTEM x64)
-    endif()
-
-    set(LIB_PTHREAD pthreadVC2)
-else()
-    set(LIB_PTHREAD pthread)
-endif()
-
-if (MSVC)
-    file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/src/Detector/darknet/3rdparty/dll/${BIT_SYSTEM}/pthreadVC2.dll DESTINATION ${CMAKE_BINARY_DIR}/Debug)
-    file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/src/Detector/darknet/3rdparty/dll/${BIT_SYSTEM}/pthreadVC2.dll DESTINATION ${CMAKE_BINARY_DIR}/Release)
-
-    file(GLOB CUDNN_DLL ${CUDNN_DIR}/bin/*.dll)
-    file(COPY ${CUDNN_DLL} DESTINATION ${CMAKE_BINARY_DIR}/Release)
-    file(COPY ${CUDNN_DLL} DESTINATION ${CMAKE_BINARY_DIR}/Debug)
-endif()
-
-endif(BUILD_YOLO_LIB)
-
-option(BUILD_YOLO_TENSORRT "Should compiled TensorRT binding for YOLO?" OFF)
-if (BUILD_YOLO_TENSORRT)
-    add_subdirectory(src/Detector/tensorrt_yolo)
-    add_definitions(-DBUILD_YOLO_TENSORRT)
-endif(BUILD_YOLO_TENSORRT)
+option(BUILD_ONNX_TENSORRT "Should compiled TensorRT binding for ONNX models?" OFF)
+if (BUILD_ONNX_TENSORRT)
+    add_subdirectory(src/Detector/tensorrt_onnx)
+    add_definitions(-DBUILD_ONNX_TENSORRT)
+endif(BUILD_ONNX_TENSORRT)
 
 option(MTRACKER_PYTHON "Build mtracking Python bindings?" OFF)
 if(MTRACKER_PYTHON)