Increase coverage (#321)

Part of #178

Author: allnes

.github/workflows/static-analysis-pr.yml

@@ -21,7 +21,7 @@ jobs:
         id: review
         with:
           build_dir: build
-          apt_packages: mpich,libmpich*,mpi*,openmpi-bin,ninja-build,libomp-19-dev,valgrind
+          apt_packages: mpich,libmpich*,mpi*,openmpi-bin,ninja-build,libomp-19-dev,valgrind,libopencv-dev
           cmake_command: >
             cmake -S . -B build
             -D CMAKE_C_COMPILER_LAUNCHER=ccache -D CMAKE_CXX_COMPILER_LAUNCHER=ccache
@@ -30,6 +30,7 @@ jobs:
             -D USE_SEQ=ON -D USE_MPI=ON
             -D USE_OMP=ON -D USE_TBB=ON -D USE_STL=ON
             -D CMAKE_BUILD_TYPE=RELEASE -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
+            -D USE_SYSTEM_OPENCV=ON
           config_file: .clang-tidy
           exclude: 3rdparty
           split_workflow: true
@@ -56,7 +57,7 @@ jobs:
         id: review
         with:
           build_dir: build
-          apt_packages: mpich,libmpich*,mpi*,openmpi-bin,ninja-build,libomp-19-dev,valgrind
+          apt_packages: mpich,libmpich*,mpi*,openmpi-bin,ninja-build,libomp-19-dev,valgrind,libopencv-dev
           cmake_command: >
             cmake -S . -B build
             -D CMAKE_C_COMPILER_LAUNCHER=ccache -D CMAKE_CXX_COMPILER_LAUNCHER=ccache
@@ -65,6 +66,7 @@ jobs:
             -D USE_SEQ=ON -D USE_MPI=ON
             -D USE_OMP=ON -D USE_TBB=ON -D USE_STL=ON
             -D CMAKE_BUILD_TYPE=RELEASE -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
+            -D USE_SYSTEM_OPENCV=ON
           config_file: .clang-tidy
           exclude: 3rdparty
           split_workflow: true

cmake/opencv.cmake

@@ -6,7 +6,14 @@ if(NOT USE_SEQ AND NOT USE_MPI AND NOT USE_OMP AND NOT USE_TBB AND NOT USE_STL)
 endif()
 
 include(ExternalProject)
-include_directories(${CMAKE_SOURCE_DIR}/3rdparty/opencv/include)
+option(USE_SYSTEM_OPENCV OFF)
+if( USE_SYSTEM_OPENCV )
+    find_package(OpenCV REQUIRED)
+    include_directories(${OpenCV_INCLUDE_DIRS})
+else ()
+    include_directories(${CMAKE_SOURCE_DIR}/3rdparty/opencv/include)
+endif ()
+
 if(WIN32)
     ExternalProject_Add(ppc_opencv
             SOURCE_DIR        "${CMAKE_SOURCE_DIR}/3rdparty/opencv"

modules/core/util/func_tests/util_tests.cpp

@@ -0,0 +1,36 @@
+#include <gtest/gtest.h>
+
+#include <cstdlib>
+#include <string>
+#include <thread>
+
+#include "core/util/include/util.hpp"
+
+TEST(util_tests, check_unset_env) {
+#ifndef _WIN32
+  int save_var = ppc::util::GetPPCNumThreads();
+
+  unsetenv("OMP_NUM_THREADS");  // NOLINT(misc-include-cleaner)
+
+  EXPECT_EQ(ppc::util::GetPPCNumThreads(), 1);
+
+  setenv("OMP_NUM_THREADS", std::to_string(save_var).c_str(), 1);  // NOLINT(misc-include-cleaner)
+#else
+  GTEST_SKIP();
+#endif
+}
+
+TEST(util_tests, check_set_env) {
+#ifndef _WIN32
+  int save_var = ppc::util::GetPPCNumThreads();
+
+  const int num_threads = static_cast<int>(std::thread::hardware_concurrency());
+  setenv("OMP_NUM_THREADS", std::to_string(num_threads).c_str(), 1);  // NOLINT(misc-include-cleaner)
+
+  EXPECT_EQ(ppc::util::GetPPCNumThreads(), num_threads);
+
+  setenv("OMP_NUM_THREADS", std::to_string(save_var).c_str(), 1);  // NOLINT(misc-include-cleaner)
+#else
+  GTEST_SKIP();
+#endif
+}

modules/core/util/include/util.hpp

@@ -0,0 +1,9 @@
+#pragma once
+#include <string>
+
+namespace ppc::util {
+
+std::string GetAbsolutePath(const std::string &relative_path);
+int GetPPCNumThreads();
+
+}  // namespace ppc::util

modules/core/util/util.hpp modules/core/util/src/util.cpp

@@ -1,4 +1,4 @@
-#pragma once
+#include "core/util/include/util.hpp"
 
 #include <cstdlib>
 #ifdef _WIN32
@@ -11,14 +11,12 @@
 #include <filesystem>
 #include <string>
 
-namespace ppc::util {
-
-inline std::string GetAbsolutePath(const std::string &relative_path) {
+std::string ppc::util::GetAbsolutePath(const std::string &relative_path) {
   const std::filesystem::path path = std::string(PPC_PATH_TO_PROJECT) + "/tasks/" + relative_path;
   return path.string();
 }
 
-inline int GetPPCNumThreads() {
+int ppc::util::GetPPCNumThreads() {
 #ifdef _WIN32
   size_t len;
   char omp_env[100];
@@ -32,5 +30,3 @@ inline int GetPPCNumThreads() {
   int num_threads = (omp_env != nullptr) ? std::atoi(omp_env) : 1;
   return num_threads;
 }
-
-}  // namespace ppc::util

tasks/CMakeLists.txt

@@ -90,7 +90,7 @@ foreach(TASK_TYPE ${LIST_OF_TASKS})
     endif (USE_PERF_TESTS)
 
     foreach (EXEC_FUNC ${LIST_OF_EXEC_TESTS})
-      target_link_libraries(${EXEC_FUNC} PUBLIC core_module_lib ${exec_func_lib})
+      target_link_libraries(${EXEC_FUNC} PUBLIC ${exec_func_lib} core_module_lib)
 
       if ("${MODULE_NAME}" STREQUAL "stl")
           target_link_libraries(${EXEC_FUNC} PUBLIC Threads::Threads)

tasks/all/example/func_tests/func_all.cpp

@@ -8,7 +8,7 @@
 
 #include "all/example/include/ops_all.hpp"
 #include "core/task/include/task.hpp"
-#include "core/util/util.hpp"
+#include "core/util/include/util.hpp"
 
 TEST(nesterov_a_test_task_all, test_matmul_50) {
   constexpr size_t kCount = 50;

tasks/all/example/src/ops_all.cpp

@@ -6,7 +6,7 @@
 #include <thread>
 #include <vector>
 
-#include "core/util/util.hpp"
+#include "core/util/include/util.hpp"
 #include "oneapi/tbb/task_arena.h"
 #include "oneapi/tbb/task_group.h"
 

tasks/all/runner.cpp

@@ -9,7 +9,7 @@
 #include <string>
 #include <utility>
 
-#include "core/util/util.hpp"
+#include "core/util/include/util.hpp"
 #include "oneapi/tbb/global_control.h"
 
 class UnreadMessagesDetector : public ::testing::EmptyTestEventListener {

tasks/mpi/example/func_tests/main.cpp

@@ -8,7 +8,7 @@
 #include <vector>
 
 #include "core/task/include/task.hpp"
-#include "core/util/util.hpp"
+#include "core/util/include/util.hpp"
 #include "mpi/example/include/ops_mpi.hpp"
 
 TEST(nesterov_a_test_task_mpi, test_matmul_50) {

tasks/omp/example/func_tests/main.cpp

@@ -8,7 +8,7 @@
 #include <vector>
 
 #include "core/task/include/task.hpp"
-#include "core/util/util.hpp"
+#include "core/util/include/util.hpp"
 #include "omp/example/include/ops_omp.hpp"
 
 TEST(nesterov_a_test_task_omp, test_matmul_50) {

tasks/seq/broken_example_disabled/func_tests/main.cpp

@@ -8,7 +8,7 @@
 #include <vector>
 
 #include "core/task/include/task.hpp"
-#include "core/util/util.hpp"
+#include "core/util/include/util.hpp"
 #include "seq/example/include/ops_seq.hpp"
 
 TEST(nesterov_a_test_task_seq, test_matmul_50) {

tasks/seq/example/func_tests/main.cpp

@@ -8,7 +8,7 @@
 #include <vector>
 
 #include "core/task/include/task.hpp"
-#include "core/util/util.hpp"
+#include "core/util/include/util.hpp"
 #include "seq/example/include/ops_seq.hpp"
 
 TEST(nesterov_a_test_task_seq, test_matmul_50) {

tasks/stl/example/func_tests/main.cpp

@@ -8,7 +8,7 @@
 #include <vector>
 
 #include "core/task/include/task.hpp"
-#include "core/util/util.hpp"
+#include "core/util/include/util.hpp"
 #include "stl/example/include/ops_stl.hpp"
 
 TEST(nesterov_a_test_task_stl, test_matmul_50) {

tasks/stl/example/src/ops_stl.cpp

@@ -2,11 +2,10 @@
 
 #include <cmath>
 #include <cstddef>
-#include <functional>
 #include <thread>
 #include <vector>
 
-#include "core/util/util.hpp"
+#include "core/util/include/util.hpp"
 
 namespace {
 void MatMul(const std::vector<int> &in_vec, int rc_size, std::vector<int> &out_vec) {

tasks/tbb/example/func_tests/main.cpp

@@ -8,7 +8,7 @@
 #include <vector>
 
 #include "core/task/include/task.hpp"
-#include "core/util/util.hpp"
+#include "core/util/include/util.hpp"
 #include "tbb/example/include/ops_tbb.hpp"
 
 TEST(nesterov_a_test_task_tbb, test_matmul_50) {

tasks/tbb/example/src/ops_tbb.cpp

@@ -3,7 +3,7 @@
 #include <tbb/tbb.h>
 
 #include <cmath>
-#include <core/util/util.hpp>
+#include <core/util/include/util.hpp>
 #include <cstddef>
 #include <vector>
 

tasks/tbb/runner.cpp

@@ -1,7 +1,7 @@
 #include <gtest/gtest.h>
 #include <tbb/global_control.h>
 
-#include "core/util/util.hpp"
+#include "core/util/include/util.hpp"
 #include "oneapi/tbb/global_control.h"
 
 int main(int argc, char** argv) {