Merge branch 'master' into acc-perf

Author: allnes

.clang-tidy

@@ -88,4 +88,4 @@ CheckOptions:
   - key:             readability-identifier-length.MinimumParameterNameLength
     value:           1
   - key: misc-include-cleaner.IgnoreHeaders
-    value: '(__chrono/.*|stdlib\.h)'
+    value: '(__chrono/.*|stdlib\.h|3rdparty/.*)'

.github/workflows/pre-commit.yml

@@ -21,7 +21,10 @@ jobs:
         run: |
           sudo apt-get update
           sudo apt-get install --no-install-recommends -y \
-            gcc-14 g++-14 ninja-build python3-pip clang-format-16
+            gcc-14 g++-14 ninja-build python3-pip
+          wget https://apt.llvm.org/llvm.sh
+          chmod u+x llvm.sh
+          sudo ./llvm.sh 20 all
           python3 -m pip install -r requirements.txt
       - name: Run pre-commit checks
         run: |

3rdparty/stb_image_wrapper.cpp

@@ -1,4 +1,3 @@
 #define STB_IMAGE_IMPLEMENTATION
 
-// NOLINTNEXTLINE(misc-include-cleaner)
 #include "stb_library.hpp"

cmake/configure.cmake

@@ -39,52 +39,37 @@ set(CMAKE_INSTALL_RPATH_USE_LINK_PATH ON)
 set(CMAKE_SKIP_BUILD_RPATH OFF)
 
 if(UNIX)
-  set(COMMON_COMPILER_FLAGS
-      "${COMMON_COMPILER_FLAGS}            \
-        -Wall -Wextra                      \
-        -Wsign-compare")
+  add_compile_options(-Wall -Wextra -Wsign-compare)
+
   if(NOT APPLE)
-    set(COMMON_COMPILER_FLAGS
-        "${COMMON_COMPILER_FLAGS}        \
-            -Wpedantic                   \
-            -Wpointer-arith              \
-            -Wcast-align                 \
-            -Wwrite-strings              \
-            -Wswitch-enum                \
-            -Wnull-dereference           \
-            -Wswitch-enum                \
-            -Wformat=2                   \
-            -Wmissing-declarations       \
-            -Wno-c11-extensions")
+    add_compile_options(
+      -Wpedantic
+      -Wpointer-arith
+      -Wcast-align
+      -Wwrite-strings
+      -Wswitch-enum
+      -Wnull-dereference
+      -Wformat=2
+      -Wmissing-declarations
+      -Wno-c11-extensions)
   endif(NOT APPLE)
-  set(CMAKE_C_FLAGS
-      "${CMAKE_C_FLAGS}                    \
-        -Wold-style-definition             \
-        -Wmissing-prototypes")
+  add_compile_options($<$<COMPILE_LANGUAGE:C>:-Wold-style-definition>)
+  add_compile_options($<$<COMPILE_LANGUAGE:C>:-Wmissing-prototypes>)
 
   if("${ENABLE_ADDRESS_SANITIZER}"
      OR "${ENABLE_UB_SANITIZER}"
      OR "${ENABLE_LEAK_SANITIZER}")
-    set(COMMON_COMPILER_FLAGS
-        "${COMMON_COMPILER_FLAGS} -Wno-cast-align -Wno-cast-function-type")
+    add_compile_options(-Wno-cast-align -Wno-cast-function-type)
   endif()
 
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${COMMON_COMPILER_FLAGS}")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${COMMON_COMPILER_FLAGS}")
   if(USE_COVERAGE)
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --coverage")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --coverage")
+    add_compile_options(--coverage)
+    add_link_options(--coverage)
   endif(USE_COVERAGE)
 endif()
 
 if(MSVC)
-  set(COMMON_FLAGS "/W4 /wd4267 /wd4244")
-  set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} ${COMMON_FLAGS}")
-  set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${COMMON_FLAGS}")
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${COMMON_FLAGS}")
-  set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${COMMON_FLAGS}")
-  set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${COMMON_FLAGS}")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${COMMON_FLAGS}")
+  add_compile_options(/W4 /wd4267 /wd4244)
 endif(MSVC)
 
 find_package(Threads REQUIRED)

docs/user_guide/environment_variables.rst

@@ -5,6 +5,7 @@ The following environment variables can be used to configure the project's runti
 
 - ``PPC_NUM_PROC``: Specifies the number of processes to launch.
   Default: ``1``
+  Can be queried from C++ with ``ppc::util::GetNumProc()``.
 
 - ``PPC_NUM_THREADS``: Specifies the number of threads to use.
   Default: ``1``

modules/util/include/util.hpp

@@ -52,6 +52,7 @@ enum GTestParamIndex : uint8_t { kTaskGetter, kNameTest, kTestParams };
 
 std::string GetAbsoluteTaskPath(const std::string& id_path, const std::string& relative_path);
 int GetNumThreads();
+int GetNumProc();
 double GetTaskMaxTime();
 double GetPerfMaxTime();
 

modules/util/src/util.cpp

@@ -28,6 +28,14 @@ int ppc::util::GetNumThreads() {
   return 1;
 }
 
+int ppc::util::GetNumProc() {
+  const auto num_proc = env::get<int>("PPC_NUM_PROC");
+  if (num_proc.has_value()) {
+    return num_proc.value();
+  }
+  return 1;
+}
+
 double ppc::util::GetTaskMaxTime() {
   const auto val = env::get<double>("PPC_TASK_MAX_TIME");
   if (val.has_value()) {

modules/util/tests/util.cpp

@@ -108,3 +108,19 @@ TEST(GetPerfMaxTime, ReadsFromEnvironment) {
   env::detail::set_scoped_environment_variable scoped("PPC_PERF_MAX_TIME", "12.5");
   EXPECT_DOUBLE_EQ(ppc::util::GetPerfMaxTime(), 12.5);
 }
+
+TEST(GetNumProc, ReturnsDefaultWhenUnset) {
+  const auto old = env::get<int>("PPC_NUM_PROC");
+  if (old.has_value()) {
+    env::detail::delete_environment_variable("PPC_NUM_PROC");
+  }
+  EXPECT_EQ(ppc::util::GetNumProc(), 1);
+  if (old.has_value()) {
+    env::detail::set_environment_variable("PPC_NUM_PROC", std::to_string(*old));
+  }
+}
+
+TEST(GetNumProc, ReadsFromEnvironment) {
+  env::detail::set_scoped_environment_variable scoped("PPC_NUM_PROC", "4");
+  EXPECT_EQ(ppc::util::GetNumProc(), 4);
+}