Refactor example tasks to example_threads and streamline task/test macros

allnes · allnes · commit 76a13a409b08 · 2025-06-08T02:18:24.000+02:00
Reorganized the directory structure by renaming `example` tasks to `example_threads`. Updated include paths, CMakeLists, and JSON settings accordingly. Simplified task and test macro structure by consolidating redundant definitions and improving generator logic.
diff --git a/modules/core/util/include/func_test_util.hpp b/modules/core/util/include/func_test_util.hpp
@@ -83,7 +83,7 @@ auto ExpandToValues(const Tuple& t) {
   return ExpandToValuesImpl(t, std::make_index_sequence<kN>{});
 }
 
-#define INIT_TASK_GENERATOR(InTypeParam, SizesParam, SettingsPath)                                   \
+#define INIT_FUNC_TASK_GENERATOR(InTypeParam, SizesParam, SettingsPath)                              \
   template <typename Task, std::size_t... Is>                                                        \
   auto GenTaskTuplesImpl(std::index_sequence<Is...>) {                                               \
     return std::make_tuple(                                                                          \
@@ -98,12 +98,10 @@ auto ExpandToValues(const Tuple& t) {
     return GenTaskTuplesImpl<Task>(std::make_index_sequence<SizesParam.size()>{});                   \
   }
 
-#define ADD_FUNC_TASK_THREADS(TASK) TaskListGenerator<TASK>()
-
 #if 1
-#define ADD_FUNC_TASK_PROCESS(TASK) TaskListGenerator<TASK>()
+#define ADD_FUNC_TASK(TASK) TaskListGenerator<TASK>()
 #else
-#define ADD_FUNC_TASK_PROCESS(TASK) std::tuple<>()
+#define ADD_FUNC_TASK(TASK) std::tuple<>()
 #endif
 
 }  // namespace ppc::util
diff --git a/modules/core/util/include/perf_test_util.hpp b/modules/core/util/include/perf_test_util.hpp
@@ -93,7 +93,8 @@ class BaseRunPerfTests : public ::testing::TestWithParam<PerfTestParam<InType, O
   ppc::core::TaskPtr<InType, OutType> task_;
 };
 
-#define ADD_PERF_TASK_THREADS(TaskType, InputTypeParam, SettingsPath)                                         \
+#if 1
+#define ADD_PERF_TASK(TaskType, InputTypeParam, SettingsPath)                                                 \
   std::tuple(std::make_tuple(ppc::core::TaskGetter<TaskType, InputTypeParam>,                                 \
                              std::string(ppc::util::GetNamespace<TaskType>()) + "_" +                         \
                                  ppc::core::GetStringTaskType(TaskType::GetStaticTypeOfTask(), SettingsPath), \
@@ -102,6 +103,9 @@ class BaseRunPerfTests : public ::testing::TestWithParam<PerfTestParam<InType, O
                              std::string(ppc::util::GetNamespace<TaskType>()) + "_" +                         \
                                  ppc::core::GetStringTaskType(TaskType::GetStaticTypeOfTask(), SettingsPath), \
                              ppc::core::PerfResults::TypeOfRunning::kTaskRun))
+#else
+#define ADD_PERF_TASK(TaskType, InputTypeParam, SettingsPath) std::make_tuple()
+#endif
 
 template <typename Tuple, std::size_t... I>
 auto TupleToGTestValuesImpl(Tuple&& tup, std::index_sequence<I...>) {
@@ -114,18 +118,12 @@ auto TupleToGTestValues(Tuple&& tup) {
   return TupleToGTestValuesImpl(std::forward<Tuple>(tup), std::make_index_sequence<size>{});
 }
 
-#if 1
-#define ADD_PERF_TASK_PROCESS(TaskType, InputTypeParam, SettingsPath)                                         \
-  std::tuple(std::make_tuple(ppc::core::TaskGetter<TaskType, InputTypeParam>,                                 \
-                             std::string(ppc::util::GetNamespace<TaskType>()) + "_" +                         \
-                                 ppc::core::GetStringTaskType(TaskType::GetStaticTypeOfTask(), SettingsPath), \
-                             ppc::core::PerfResults::TypeOfRunning::kPipeline),                               \
-             std::make_tuple(ppc::core::TaskGetter<TaskType, InputTypeParam>,                                 \
-                             std::string(ppc::util::GetNamespace<TaskType>()) + "_" +                         \
-                                 ppc::core::GetStringTaskType(TaskType::GetStaticTypeOfTask(), SettingsPath), \
-                             ppc::core::PerfResults::TypeOfRunning::kTaskRun))
-#else
-#define ADD_PERF_TASK_PROCESS(TaskType, InputTypeParam, SettingsPath) std::make_tuple()
-#endif
+#define INIT_PERF_TASK_GENERATOR(InType, EnvVarSettingsPath)                 \
+  template <typename... Ts>                                                  \
+  struct perf_tasks_type_list {};                                            \
+  template <typename... Ts>                                                  \
+  auto MakeTask(perf_tasks_type_list<Ts...>) {                               \
+    return std::tuple_cat(ADD_PERF_TASK(Ts, InType, EnvVarSettingsPath)...); \
+  }
 
 }  // namespace ppc::util
diff --git a/tasks/example/tests/performance/main.cpp b/tasks/example/tests/performance/main.cpp
diff --git a/tasks/example_threads/CMakeLists.txt b/tasks/example_threads/CMakeLists.txt
diff --git a/tasks/example_threads/all/include/ops_all.hpp b/tasks/example_threads/all/include/ops_all.hpp
@@ -2,7 +2,7 @@
 
 #include <vector>
 
-#include "example/common/include/common.hpp"
+#include "example_threads/common/include/common.hpp"
 
 namespace nesterov_a_test_task {
 
diff --git a/tasks/example_threads/all/src/ops_all.cpp b/tasks/example_threads/all/src/ops_all.cpp
@@ -1,4 +1,4 @@
-#include "example/all/include/ops_all.hpp"
+#include "example_threads/all/include/ops_all.hpp"
 
 #include <mpi.h>
 
diff --git a/tasks/example_threads/common/include/common.hpp b/tasks/example_threads/common/include/common.hpp
diff --git a/tasks/example_threads/data/pic.jpg b/tasks/example_threads/data/pic.jpg
diff --git a/tasks/example_threads/info.json b/tasks/example_threads/info.json
diff --git a/tasks/example_threads/mpi/include/ops_mpi.hpp b/tasks/example_threads/mpi/include/ops_mpi.hpp
@@ -3,7 +3,7 @@
 #include <vector>
 
 #include "core/task/include/task.hpp"
-#include "example/common/include/common.hpp"
+#include "example_threads/common/include/common.hpp"
 
 namespace nesterov_a_test_task {
 
diff --git a/tasks/example_threads/mpi/src/ops_mpi.cpp b/tasks/example_threads/mpi/src/ops_mpi.cpp
@@ -1,4 +1,4 @@
-#include "example/mpi/include/ops_mpi.hpp"
+#include "example_threads/mpi/include/ops_mpi.hpp"
 
 #include <mpi.h>
 
diff --git a/tasks/example_threads/omp/include/ops_omp.hpp b/tasks/example_threads/omp/include/ops_omp.hpp
@@ -4,7 +4,7 @@
 #include <vector>
 
 #include "core/task/include/task.hpp"
-#include "example/common/include/common.hpp"
+#include "example_threads/common/include/common.hpp"
 
 namespace nesterov_a_test_task {
 
diff --git a/tasks/example_threads/omp/src/ops_omp.cpp b/tasks/example_threads/omp/src/ops_omp.cpp
@@ -1,4 +1,4 @@
-#include "example/omp/include/ops_omp.hpp"
+#include "example_threads/omp/include/ops_omp.hpp"
 
 #include <atomic>
 #include <cmath>
diff --git a/tasks/example_threads/seq/include/ops_seq.hpp b/tasks/example_threads/seq/include/ops_seq.hpp
@@ -4,7 +4,7 @@
 #include <vector>
 
 #include "core/task/include/task.hpp"
-#include "example/common/include/common.hpp"
+#include "example_threads/common/include/common.hpp"
 
 namespace nesterov_a_test_task {
 
diff --git a/tasks/example_threads/seq/src/ops_seq.cpp b/tasks/example_threads/seq/src/ops_seq.cpp
@@ -1,4 +1,4 @@
-#include "example/seq/include/ops_seq.hpp"
+#include "example_threads/seq/include/ops_seq.hpp"
 
 #include <cmath>
 #include <cstddef>
diff --git a/tasks/example_threads/settings.json b/tasks/example_threads/settings.json
diff --git a/tasks/example_threads/stl/include/ops_stl.hpp b/tasks/example_threads/stl/include/ops_stl.hpp
@@ -4,7 +4,7 @@
 #include <vector>
 
 #include "core/task/include/task.hpp"
-#include "example/common/include/common.hpp"
+#include "example_threads/common/include/common.hpp"
 
 namespace nesterov_a_test_task {
 
diff --git a/tasks/example_threads/stl/src/ops_stl.cpp b/tasks/example_threads/stl/src/ops_stl.cpp
@@ -1,4 +1,4 @@
-#include "example/stl/include/ops_stl.hpp"
+#include "example_threads/stl/include/ops_stl.hpp"
 
 #include <atomic>
 #include <cmath>
diff --git a/tasks/example_threads/tbb/include/ops_tbb.hpp b/tasks/example_threads/tbb/include/ops_tbb.hpp
@@ -4,7 +4,7 @@
 #include <vector>
 
 #include "core/task/include/task.hpp"
-#include "example/common/include/common.hpp"
+#include "example_threads/common/include/common.hpp"
 
 namespace nesterov_a_test_task {
 
diff --git a/tasks/example_threads/tbb/src/ops_tbb.cpp b/tasks/example_threads/tbb/src/ops_tbb.cpp
@@ -1,4 +1,4 @@
-#include "example/tbb/include/ops_tbb.hpp"
+#include "example_threads/tbb/include/ops_tbb.hpp"
 
 #include <tbb/tbb.h>
 
diff --git a/tasks/example_threads/tests/functional/main.cpp b/tasks/example_threads/tests/functional/main.cpp
@@ -10,12 +10,12 @@
 
 #include "core/util/include/func_test_util.hpp"
 #include "core/util/include/util.hpp"
-#include "example/all/include/ops_all.hpp"
-#include "example/mpi/include/ops_mpi.hpp"
-#include "example/omp/include/ops_omp.hpp"
-#include "example/seq/include/ops_seq.hpp"
-#include "example/stl/include/ops_stl.hpp"
-#include "example/tbb/include/ops_tbb.hpp"
+#include "example_threads/all/include/ops_all.hpp"
+#include "example_threads/mpi/include/ops_mpi.hpp"
+#include "example_threads/omp/include/ops_omp.hpp"
+#include "example_threads/seq/include/ops_seq.hpp"
+#include "example_threads/stl/include/ops_stl.hpp"
+#include "example_threads/tbb/include/ops_tbb.hpp"
 
 namespace nesterov_a_test_task {
 
@@ -33,7 +33,7 @@ class NesterovARunFuncTests : public ppc::util::BaseRunFuncTests<InType, OutType
     std::vector<uint8_t> img;
     // Read image
     {
-      std::string abs_path = ppc::util::GetAbsolutePath("example/data/pic.jpg");
+      std::string abs_path = ppc::util::GetAbsolutePath("example_threads/data/pic.jpg");
       auto *data = stbi_load(abs_path.c_str(), &width, &height, &channels, 0);
       if (data == nullptr) {
         throw std::runtime_error("Failed to load image: " + std::string(stbi_failure_reason()));
@@ -63,12 +63,11 @@ TEST_P(NesterovARunFuncTests, MatmulFromPic) { ExecuteTest(GetParam()); }
 
 const std::array<TestType, 3> kTestParam = {std::make_tuple(3, "3"), std::make_tuple(5, "5"), std::make_tuple(7, "7")};
 
-INIT_TASK_GENERATOR(InType, kTestParam, PPC_SETTINGS_example)
+INIT_FUNC_TASK_GENERATOR(InType, kTestParam, PPC_SETTINGS_example_threads)
 
-const auto kTestTasksList =
-    std::tuple_cat(ADD_FUNC_TASK_PROCESS(NesterovATestTaskALL), ADD_FUNC_TASK_PROCESS(NesterovATestTaskMPI),
-                   ADD_FUNC_TASK_THREADS(NesterovATestTaskOMP), ADD_FUNC_TASK_THREADS(NesterovATestTaskSEQ),
-                   ADD_FUNC_TASK_THREADS(NesterovATestTaskSTL), ADD_FUNC_TASK_THREADS(NesterovATestTaskTBB));
+const auto kTestTasksList = std::tuple_cat(ADD_FUNC_TASK(NesterovATestTaskALL), ADD_FUNC_TASK(NesterovATestTaskMPI),
+                                           ADD_FUNC_TASK(NesterovATestTaskOMP), ADD_FUNC_TASK(NesterovATestTaskSEQ),
+                                           ADD_FUNC_TASK(NesterovATestTaskSTL), ADD_FUNC_TASK(NesterovATestTaskTBB));
 
 INSTANTIATE_TEST_SUITE_P_NOLINT(PicMatrixTests, NesterovARunFuncTests, ppc::util::ExpandToValues(kTestTasksList),
                                 NesterovARunFuncTests::PrintFuncTestName<NesterovARunFuncTests>);
diff --git a/tasks/example_threads/tests/performance/main.cpp b/tasks/example_threads/tests/performance/main.cpp
@@ -0,0 +1,45 @@
+#include <gtest/gtest.h>
+#include <mpi.h>
+
+#include <chrono>
+#include <cstddef>
+#include <memory>
+#include <tuple>
+#include <vector>
+
+#include "core/perf/include/perf.hpp"
+#include "core/util/include/perf_test_util.hpp"
+#include "core/util/include/util.hpp"
+#include "example_threads/all/include/ops_all.hpp"
+#include "example_threads/mpi/include/ops_mpi.hpp"
+#include "example_threads/omp/include/ops_omp.hpp"
+#include "example_threads/seq/include/ops_seq.hpp"
+#include "example_threads/stl/include/ops_stl.hpp"
+#include "example_threads/tbb/include/ops_tbb.hpp"
+
+namespace nesterov_a_test_task {
+
+class ExampleRunPerfTest : public ppc::util::BaseRunPerfTests<InType, OutType> {
+  const int kCount_ = 111;
+  InType input_data_{};
+
+  void SetUp() override { input_data_ = kCount_; }
+
+  bool CheckTestOutputData(OutType& output_data) final { return input_data_ == output_data; }
+
+  InType GetTestInputData() final { return input_data_; }
+};
+
+INIT_PERF_TASK_GENERATOR(InType, PPC_SETTINGS_example_threads)
+
+using PerfTasks = perf_tasks_type_list<NesterovATestTaskALL, NesterovATestTaskMPI, NesterovATestTaskOMP,
+                                       NesterovATestTaskSEQ, NesterovATestTaskSTL, NesterovATestTaskTBB>;
+
+const auto kAllPerfTasks = std::tuple_cat(MakeTask(PerfTasks{}));
+
+TEST_P(ExampleRunPerfTest, RunPerfModes) { ExecuteTest(GetParam()); }
+
+INSTANTIATE_TEST_SUITE_P_NOLINT(RunModeTests, ExampleRunPerfTest, ppc::util::TupleToGTestValues(kAllPerfTasks),
+                                ExampleRunPerfTest::CustomPerfTestName);
+
+}  // namespace nesterov_a_test_task

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#include "example/all/include/ops_all.hpp"`
	`1`	`+#include "example_threads/all/include/ops_all.hpp"`
`2`	`2`
`3`	`3`	`#include <mpi.h>`
`4`	`4`