Merge branch 'master' of https://github.com/learning-process/parallel_programming_course into an/unite-tests

Author: allnes

.clang-tidy

@@ -13,7 +13,6 @@ Checks: >
   readability-*,
   -bugprone-casting-through-void,
   -bugprone-easily-swappable-parameters,
-  -bugprone-implicit-widening-of-multiplication-result,
   -cppcoreguidelines-avoid-magic-numbers,
   -cppcoreguidelines-non-private-member-variables-in-classes,
   -cppcoreguidelines-owning-memory,

.github/workflows/main.yml

@@ -23,6 +23,7 @@ jobs:
       - uses: DoozyX/clang-format-lint-action@v0.20
         with:
           source: '.'
+          clangFormatVersion: 20
   python-lint:
     runs-on: ubuntu-24.04
     steps:
@@ -1020,6 +1021,9 @@ jobs:
       - name: Run perf count checker
         run: |
           python3 scripts/run_perf_counter.py --required-tests-number=2
+        env:
+          OMP_NUM_THREADS: 2
+          PROC_COUNT: 2
       - name: Run perf tests
         run: |
           bash -e scripts/generate_perf_results.sh

scripts/create_perf_table.py

@@ -2,7 +2,6 @@
 import os
 import re
 import xlsxwriter
-import multiprocessing
 
 parser = argparse.ArgumentParser()
 parser.add_argument('-i', '--input', help='Input file path (logs of perf tests, .txt)', required=True)
@@ -50,7 +49,10 @@
     worksheet.set_column('A:Z', 23)
     right_bold_border = workbook.add_format({'bold': True, 'right': 2, 'bottom': 2})
     bottom_bold_border = workbook.add_format({'bold': True, 'bottom': 2})
-    cpu_num = multiprocessing.cpu_count()
+    cpu_num = os.environ.get("PROC_COUNT")
+    if cpu_num is None:
+        raise EnvironmentError("Required environment variable 'PROC_COUNT' is not set.")
+    cpu_num = int(cpu_num)
     worksheet.write(0, 0, "cpu_num = " + str(cpu_num), right_bold_border)
 
     it = 1

scripts/run_tests.py

@@ -87,11 +87,10 @@ def run_processes(self, additional_mpi_args):
 
     def run_performance(self):
         if not os.environ.get("ASAN_RUN"):
-            mpi_running = ""
-            if platform.system() in ("Linux", "Windows"):
-                mpi_running = f"{self.mpi_exec} -np 4"
-            elif platform.system() == "Darwin":
-                mpi_running = f"{self.mpi_exec} -np 2"
+            proc_count = os.environ.get("PROC_COUNT")
+            if proc_count is None:
+                raise EnvironmentError("Required environment variable 'PROC_COUNT' is not set.")
+            mpi_running = f"{self.mpi_exec} -np {proc_count}"
             self.__run_exec(f"{mpi_running} {self.work_dir / 'all_perf_tests'} {self.__get_gtest_settings(1)}")
             self.__run_exec(f"{mpi_running} {self.work_dir / 'mpi_perf_tests'} {self.__get_gtest_settings(1)}")
 

tasks/all/example/func_tests/main.cpp

@@ -1,5 +1,6 @@
 #include <gtest/gtest.h>
 
+#include <cstddef>
 #include <cstdint>
 #include <stb_library.hpp>
 #include <string>
@@ -15,7 +16,7 @@ class NesterovATestTaskAll : public ::testing::TestWithParam<int> {
     std::string abs_path = ppc::util::GetAbsolutePath("all/example/data/pic_all.jpg");
     data = stbi_load(abs_path.c_str(), &width, &height, &channels, 0);
     ASSERT_TRUE(data != nullptr) << "Failed to load image: " << stbi_failure_reason();
-    img = std::vector<uint8_t>(data, data + (width * height * channels));
+    img = std::vector<uint8_t>(data, data + (static_cast<size_t>(width) * height * channels));
     stbi_image_free(data);
 
     ASSERT_EQ(width, height);
@@ -28,10 +29,10 @@ class NesterovATestTaskAll : public ::testing::TestWithParam<int> {
 
 TEST_P(NesterovATestTaskAll, MatmulFromPic) {
   int divider = GetParam();
-  const int k_count = (width + height) / divider;
+  const size_t k_count = (width + height) / divider;
 
   std::vector<int> in(k_count * k_count, 0);
-  for (int i = 0; i < k_count; i++) {
+  for (size_t i = 0; i < k_count; i++) {
     in[(i * k_count) + i] = 1;
   }
 
@@ -45,10 +46,10 @@ TEST_P(NesterovATestTaskAll, MatmulFromPic) {
 
 TEST_P(NesterovATestTaskAll, MatMulUtilFromPic) {
   int divider = GetParam();
-  const int k_count = (width + height) / divider;
+  const size_t k_count = (width + height) / divider;
 
   std::vector<int> in(k_count * k_count, 0);
-  for (int i = 0; i < k_count; i++) {
+  for (size_t i = 0; i < k_count; i++) {
     in[(i * k_count) + i] = 1;
   }
   std::vector<int> out(k_count * k_count, 0);
@@ -59,10 +60,10 @@ TEST_P(NesterovATestTaskAll, MatMulUtilFromPic) {
 
 TEST_P(NesterovATestTaskAll, MatMulTBBUtilFromPic) {
   int divider = GetParam();
-  const int k_count = (width + height) / divider;
+  const size_t k_count = (width + height) / divider;
 
   std::vector<int> in(k_count * k_count, 0);
-  for (int i = 0; i < k_count; i++) {
+  for (size_t i = 0; i < k_count; i++) {
     in[(i * k_count) + i] = 1;
   }
   std::vector<int> out(k_count * k_count, 0);

tasks/all/example/perf_tests/main.cpp

@@ -2,6 +2,7 @@
 #include <mpi.h>
 
 #include <chrono>
+#include <cstddef>
 #include <memory>
 #include <vector>
 
@@ -11,12 +12,12 @@
 
 class NesterovAllRunTest : public ::testing::TestWithParam<ppc::core::PerfResults::TypeOfRunning> {
  protected:
-  static constexpr int kCount = 400;
+  static constexpr size_t kCount = 400;
   std::vector<int> input_data;
 
   void SetUp() override {
     input_data.assign(kCount * kCount, 0);
-    for (int i = 0; i < kCount; ++i) {
+    for (size_t i = 0; i < kCount; ++i) {
       input_data[(i * kCount) + i] = 1;
     }
   }

tasks/mpi/example/perf_tests/main.cpp

@@ -14,7 +14,7 @@
 class NesterovATaskMPITest : public ::testing::TestWithParam<ppc::core::PerfResults::TypeOfRunning> {
  protected:
   static void RunTest(ppc::core::PerfResults::TypeOfRunning mode) {
-    constexpr int kCount = 500;
+    constexpr size_t kCount = 500;
 
     // Create data
     std::vector<int> in(kCount * kCount, 0);

tasks/omp/example/perf_tests/main.cpp

@@ -13,7 +13,7 @@
 class NesterovTaskOMPTest : public ::testing::TestWithParam<ppc::core::PerfResults::TypeOfRunning> {
  protected:
   static void RunTest(ppc::core::PerfResults::TypeOfRunning mode) {
-    constexpr int kCount = 300;
+    constexpr size_t kCount = 300;
 
     // Create data
     std::vector<int> in(kCount * kCount, 0);

tasks/seq/example/perf_tests/main.cpp

@@ -13,7 +13,7 @@
 class NesterovTaskSeqTest : public ::testing::TestWithParam<ppc::core::PerfResults::TypeOfRunning> {
  protected:
   static void RunTest(ppc::core::PerfResults::TypeOfRunning mode) {
-    constexpr int kCount = 500;
+    constexpr size_t kCount = 500;
 
     // Create data
     std::vector<int> in(kCount * kCount, 0);

tasks/stl/example/perf_tests/main.cpp

@@ -13,7 +13,7 @@
 class NesterovTaskSTLTest : public ::testing::TestWithParam<ppc::core::PerfResults::TypeOfRunning> {
  protected:
   static void RunTest(ppc::core::PerfResults::TypeOfRunning mode) {
-    constexpr int kCount = 450;
+    constexpr size_t kCount = 450;
 
     // Create data
     std::vector<int> in(kCount * kCount, 0);