Merge branch 'master' into an/convert_scripts

Author: allnes

.github/workflows/main.yml

@@ -714,8 +714,11 @@ jobs:
         with:
           mpi: msmpi
       - name: Download dependencies
-        run: |
-          choco install openssl --execution-timeout 6000
+        uses: nick-fields/retry@v3
+        with:
+          timeout_minutes: 60
+          max_attempts: 3
+          command: choco install openssl --execution-timeout 3600
       - name: Setup ccache
         uses: Chocobo1/setup-ccache-action@v1
         with:
@@ -772,8 +775,11 @@ jobs:
         with:
           mpi: msmpi
       - name: Download dependencies
-        run: |
-          choco install openssl --execution-timeout 6000
+        uses: nick-fields/retry@v3
+        with:
+          timeout_minutes: 60
+          max_attempts: 3
+          command: choco install openssl --execution-timeout 3600
       - name: Setup ccache
         uses: Chocobo1/setup-ccache-action@v1
         with:

.github/workflows/nightly.yml

@@ -3,6 +3,7 @@ name: Nightly routine
 on:
   schedule:
     - cron: '0 0 * * *'
+  workflow_dispatch:
 
 permissions:
   issues: write
@@ -17,7 +18,7 @@ jobs:
           stale-pr-message: 'This pull request is stale for 2 weeks and is going to be closed'
           days-before-pr-stale: 14
           days-before-issue-stale: -1
-          days-before-pr-close: 14
+          days-before-pr-close: 0
           days-before-issue-close: -1
           stale-pr-label: 'stale'
           operations-per-run: 100

.github/workflows/pages.yml

@@ -51,14 +51,17 @@ jobs:
       - name: Install dependencies
         run: |
           python3 -m pip install -r requirements.txt
-      - name: Build scoreboard
+      - name: CMake configure
         run: |
-          python3 scoreboard/main.py
+          cmake -S . -B build -DUSE_SCOREBOARD=ON
+      - name: CMake build
+        run: |
+          cmake --build build --parallel
       - name: Upload artifact
         uses: actions/upload-artifact@v4
         with:
           name: scoreboard
-          path: ./scoreboard/
+          path: ./build/scoreboard/html/
   deploy-pages:
     if: github.ref == 'refs/heads/master'
     needs:

CMakeLists.txt

@@ -24,6 +24,12 @@ message( STATUS "PPC step: Setup external projects" )
 include(cmake/opencv.cmake)
 include(cmake/gtest.cmake)
 
+############################ Scoreboard #############################
+
+message( STATUS "PPC step: Setup scoreboard generator" )
+include(cmake/scoreboard.cmake)
+add_subdirectory(scoreboard)
+
 ############################## Headers ##############################
 
 message( STATUS "PPC step: Setup headers" )

cmake/boost.cmake

@@ -1,4 +1,9 @@
 # Build Core Boost components
+
+if(NOT USE_SEQ AND NOT USE_MPI AND NOT USE_OMP AND NOT USE_TBB AND NOT USE_STL)
+    return()
+endif()
+
 SUBDIRLIST(subdirs ${CMAKE_SOURCE_DIR}/3rdparty/boost/libs)
 foreach(subd ${subdirs})
         include_directories(${CMAKE_SOURCE_DIR}/3rdparty/boost/libs/${subd}/include)

cmake/configure.cmake

@@ -36,13 +36,15 @@ if( UNIX )
             -Wwrite-strings                  \
             -Wswitch-enum                    \
             -Wnull-dereference               \
-            -Wold-style-definition           \
             -Wswitch-enum                    \
             -Wformat=2                       \
-            -Wmissing-prototypes             \
             -Wmissing-declarations           \
             -Wno-c11-extensions")
     endif (NOT APPLE)
+    set(CMAKE_C_FLAGS
+        "${CMAKE_C_FLAGS}                    \
+        -Wold-style-definition               \
+        -Wmissing-prototypes")
     set (COMMON_LANGUAGE_RUNTIME "${COMMON_COMPILER_FLAGS} -Werror")
 
     set(CMAKE_C_FLAGS  "${CMAKE_C_FLAGS} ${COMMON_COMPILER_FLAGS}")

cmake/gtest.cmake

@@ -1,4 +1,8 @@
 # Build googletest components
+if(NOT USE_SEQ AND NOT USE_MPI AND NOT USE_OMP AND NOT USE_TBB AND NOT USE_STL)
+    return()
+endif()
+
 include_directories(${CMAKE_SOURCE_DIR}/3rdparty/googletest/googletest/include)
 include(ExternalProject)
 ExternalProject_Add(ppc_googletest

cmake/opencv.cmake

@@ -1,5 +1,10 @@
 # Build OpenCV components
 # core highgui imgcodecs imgproc videoio
+
+if(NOT USE_SEQ AND NOT USE_MPI AND NOT USE_OMP AND NOT USE_TBB AND NOT USE_STL)
+    return()
+endif()
+
 include(ExternalProject)
 include_directories(${CMAKE_SOURCE_DIR}/3rdparty/opencv/include)
 if(WIN32)
@@ -14,7 +19,8 @@ if(WIN32)
             -DBUILD_EXAMPLES=OFF -DBUILD_DOCS=OFF -DWITH_CUDA=OFF -DWITH_OPENCL=OFF -DBUILD_LIST="core,highgui,imgcodecs,imgproc,videoio,"
             BUILD_COMMAND     "${CMAKE_COMMAND}" --build "${CMAKE_CURRENT_BINARY_DIR}/ppc_opencv/build" --config ${CMAKE_BUILD_TYPE} --parallel
             INSTALL_COMMAND   "${CMAKE_COMMAND}" --install "${CMAKE_CURRENT_BINARY_DIR}/ppc_opencv/build" --prefix "${CMAKE_CURRENT_BINARY_DIR}/ppc_opencv/install"
-            TEST_COMMAND      "${CMAKE_COMMAND}" -E copy_directory "${CMAKE_CURRENT_BINARY_DIR}/ppc_opencv/build/bin" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}")
+            TEST_COMMAND      "${CMAKE_COMMAND}" -E copy_directory "${CMAKE_CURRENT_BINARY_DIR}/ppc_opencv/build/bin" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" &&
+                              "${CMAKE_COMMAND}" -E copy_directory "${CMAKE_CURRENT_BINARY_DIR}/ppc_opencv/build/bin" "${CMAKE_CURRENT_BINARY_DIR}/ppc_opencv/install/bin")
 else()
     ExternalProject_Add(ppc_opencv
             SOURCE_DIR        "${CMAKE_SOURCE_DIR}/3rdparty/opencv"

cmake/scoreboard.cmake

@@ -0,0 +1,5 @@
+option(USE_SCOREBOARD OFF)
+if( USE_SCOREBOARD )
+    find_package(Python REQUIRED
+        COMPONENTS Interpreter)
+endif( USE_SCOREBOARD )

modules/CMakeLists.txt

@@ -1,3 +1,7 @@
+if(NOT USE_SEQ AND NOT USE_MPI AND NOT USE_OMP AND NOT USE_TBB AND NOT USE_STL)
+  return()
+endif()
+
 message(STATUS "Modules")
 
 SUBDIRLIST(subdirs ${CMAKE_CURRENT_SOURCE_DIR})