From be4e8de910c3e684de309252213ce97a0fa87bd7 Mon Sep 17 00:00:00 2001 From: Arseniy Obolenskiy Date: Tue, 4 Feb 2025 09:21:58 +0100 Subject: [PATCH 1/3] Apply and enable misc-include-cleaner clang-tidy remark --- .clang-tidy | 1 - modules/core/perf/func_tests/perf_tests.cpp | 4 ++++ modules/core/perf/src/perf.cpp | 6 ++++++ modules/core/task/func_tests/task_tests.cpp | 3 +++ modules/core/task/include/task.hpp | 1 - modules/core/task/src/task.cpp | 4 ++++ modules/core/util/util.hpp | 1 + .../average_of_vector_elements/func_tests/ref_tests.cpp | 2 ++ .../ref/average_of_vector_elements/include/ref_task.hpp | 1 - .../ref/max_of_vector_elements/func_tests/ref_tests.cpp | 2 ++ modules/ref/max_of_vector_elements/include/ref_task.hpp | 2 -- .../ref/min_of_vector_elements/func_tests/ref_tests.cpp | 2 ++ modules/ref/min_of_vector_elements/include/ref_task.hpp | 2 -- .../func_tests/ref_tests.cpp | 4 +++- .../most_different_neighbor_elements/include/ref_task.hpp | 3 --- .../ref/nearest_neighbor_elements/func_tests/ref_tests.cpp | 4 +++- modules/ref/nearest_neighbor_elements/include/ref_task.hpp | 3 --- .../ref/num_of_alternations_signs/func_tests/ref_tests.cpp | 4 +++- modules/ref/num_of_alternations_signs/include/ref_task.hpp | 2 -- .../ref/num_of_orderly_violations/func_tests/ref_tests.cpp | 4 +++- modules/ref/num_of_orderly_violations/include/ref_task.hpp | 3 --- .../ref/sum_of_vector_elements/func_tests/ref_tests.cpp | 2 ++ modules/ref/sum_of_vector_elements/include/ref_task.hpp | 1 - .../ref/sum_values_by_rows_matrix/func_tests/ref_tests.cpp | 3 +++ modules/ref/sum_values_by_rows_matrix/include/ref_task.hpp | 2 +- modules/ref/vector_dot_product/func_tests/ref_tests.cpp | 3 +++ modules/ref/vector_dot_product/include/ref_task.hpp | 2 +- tasks/all/example/func_tests/func_all.cpp | 7 ++++++- tasks/all/example/include/ops_all.hpp | 2 +- tasks/all/example/perf_tests/perf_all.cpp | 6 ++++++ tasks/all/example/src/ops_all.cpp | 5 +++++ tasks/all/runner.cpp | 5 +++++ tasks/mpi/example/func_tests/main.cpp | 5 +++++ tasks/mpi/example/include/ops_mpi.hpp | 2 -- tasks/mpi/example/perf_tests/main.cpp | 6 ++++++ tasks/mpi/example/src/ops_mpi.cpp | 1 + tasks/mpi/runner.cpp | 4 ++++ tasks/omp/example/func_tests/main.cpp | 5 +++++ tasks/omp/example/include/ops_omp.hpp | 1 + tasks/omp/example/perf_tests/main.cpp | 5 +++++ tasks/omp/example/src/ops_omp.cpp | 1 + tasks/seq/example/func_tests/main.cpp | 5 +++++ tasks/seq/example/include/ops_seq.hpp | 1 + tasks/seq/example/perf_tests/main.cpp | 5 +++++ tasks/seq/example/src/ops_seq.cpp | 3 ++- tasks/seq/example_disabled/func_tests/main.cpp | 5 +++++ tasks/seq/example_disabled/include/ops_seq.hpp | 1 + tasks/seq/example_disabled/perf_tests/main.cpp | 5 +++++ tasks/seq/example_disabled/src/ops_seq.cpp | 3 ++- tasks/stl/example/func_tests/main.cpp | 6 +++++- tasks/stl/example/include/ops_stl.hpp | 1 + tasks/stl/example/perf_tests/main.cpp | 5 +++++ tasks/stl/example/src/ops_stl.cpp | 3 ++- tasks/tbb/example/func_tests/main.cpp | 6 +++++- tasks/tbb/example/include/ops_tbb.hpp | 1 + tasks/tbb/example/perf_tests/main.cpp | 5 +++++ tasks/tbb/example/src/ops_tbb.cpp | 3 +++ tasks/tbb/runner.cpp | 1 + 58 files changed, 151 insertions(+), 34 deletions(-) diff --git a/.clang-tidy b/.clang-tidy index 52724cdbf..5244d88c1 100644 --- a/.clang-tidy +++ b/.clang-tidy @@ -15,7 +15,6 @@ Checks: > -clang-analyzer-optin.cplusplus.UninitializedObject, -misc-const-correctness, -misc-header-include-cycle, - -misc-include-cleaner, -misc-no-recursion, -misc-non-private-member-variables-in-classes, -misc-unused-parameters, diff --git a/modules/core/perf/func_tests/perf_tests.cpp b/modules/core/perf/func_tests/perf_tests.cpp index a5e184b9c..fd93b60a5 100644 --- a/modules/core/perf/func_tests/perf_tests.cpp +++ b/modules/core/perf/func_tests/perf_tests.cpp @@ -1,9 +1,13 @@ #include +#include +#include +#include #include #include "core/perf/func_tests/test_task.hpp" #include "core/perf/include/perf.hpp" +#include "core/task/include/task.hpp" TEST(perf_tests, check_perf_pipeline) { // Create data diff --git a/modules/core/perf/src/perf.cpp b/modules/core/perf/src/perf.cpp index c91fbc96d..1c3ea1b38 100644 --- a/modules/core/perf/src/perf.cpp +++ b/modules/core/perf/src/perf.cpp @@ -2,9 +2,15 @@ #include +#include "core/task/include/task.hpp" +#include +#include #include #include +#include #include +#include +#include ppc::core::Perf::Perf(const std::shared_ptr& task_ptr) { SetTask(task_ptr); } diff --git a/modules/core/task/func_tests/task_tests.cpp b/modules/core/task/func_tests/task_tests.cpp index f610661fd..6f8065908 100644 --- a/modules/core/task/func_tests/task_tests.cpp +++ b/modules/core/task/func_tests/task_tests.cpp @@ -1,5 +1,8 @@ #include +#include +#include +#include #include #include "core/task/func_tests/test_task.hpp" diff --git a/modules/core/task/include/task.hpp b/modules/core/task/include/task.hpp index 412042d5e..e6122a4d3 100644 --- a/modules/core/task/include/task.hpp +++ b/modules/core/task/include/task.hpp @@ -2,7 +2,6 @@ #include #include -#include #include #include #include diff --git a/modules/core/task/src/task.cpp b/modules/core/task/src/task.cpp index 0a5719239..ff0689d6d 100644 --- a/modules/core/task/src/task.cpp +++ b/modules/core/task/src/task.cpp @@ -2,7 +2,11 @@ #include +#include +#include +#include #include +#include #include void ppc::core::Task::SetData(TaskDataPtr task_data_ptr) { diff --git a/modules/core/util/util.hpp b/modules/core/util/util.hpp index db04df1ae..4d0ed4e3a 100644 --- a/modules/core/util/util.hpp +++ b/modules/core/util/util.hpp @@ -1,5 +1,6 @@ #pragma once +#include #ifdef _WIN32 #include #include diff --git a/modules/ref/average_of_vector_elements/func_tests/ref_tests.cpp b/modules/ref/average_of_vector_elements/func_tests/ref_tests.cpp index b4db44b27..73ed0f7d3 100644 --- a/modules/ref/average_of_vector_elements/func_tests/ref_tests.cpp +++ b/modules/ref/average_of_vector_elements/func_tests/ref_tests.cpp @@ -1,5 +1,7 @@ #include +#include +#include #include #include "core/task/include/task.hpp" diff --git a/modules/ref/average_of_vector_elements/include/ref_task.hpp b/modules/ref/average_of_vector_elements/include/ref_task.hpp index 65195a78f..2e7dabdd4 100644 --- a/modules/ref/average_of_vector_elements/include/ref_task.hpp +++ b/modules/ref/average_of_vector_elements/include/ref_task.hpp @@ -1,7 +1,6 @@ #ifndef MODULES_REFERENCE_AVERAGE_OF_VECTOR_ELEMENTS_REF_TASK_HPP_ #define MODULES_REFERENCE_AVERAGE_OF_VECTOR_ELEMENTS_REF_TASK_HPP_ -#include #include #include diff --git a/modules/ref/max_of_vector_elements/func_tests/ref_tests.cpp b/modules/ref/max_of_vector_elements/func_tests/ref_tests.cpp index c01525951..06f34dc50 100644 --- a/modules/ref/max_of_vector_elements/func_tests/ref_tests.cpp +++ b/modules/ref/max_of_vector_elements/func_tests/ref_tests.cpp @@ -1,5 +1,7 @@ #include +#include +#include #include #include "core/task/include/task.hpp" diff --git a/modules/ref/max_of_vector_elements/include/ref_task.hpp b/modules/ref/max_of_vector_elements/include/ref_task.hpp index 2529667cc..cf62df78e 100644 --- a/modules/ref/max_of_vector_elements/include/ref_task.hpp +++ b/modules/ref/max_of_vector_elements/include/ref_task.hpp @@ -1,11 +1,9 @@ #ifndef MODULES_REFERENCE_MAX_OF_VECTOR_ELEMENTS_REF_TASK_HPP_ #define MODULES_REFERENCE_MAX_OF_VECTOR_ELEMENTS_REF_TASK_HPP_ -#include #include #include -#include #include #include "core/task/include/task.hpp" diff --git a/modules/ref/min_of_vector_elements/func_tests/ref_tests.cpp b/modules/ref/min_of_vector_elements/func_tests/ref_tests.cpp index d8014d550..ec884943c 100644 --- a/modules/ref/min_of_vector_elements/func_tests/ref_tests.cpp +++ b/modules/ref/min_of_vector_elements/func_tests/ref_tests.cpp @@ -1,5 +1,7 @@ #include +#include +#include #include #include "core/task/include/task.hpp" diff --git a/modules/ref/min_of_vector_elements/include/ref_task.hpp b/modules/ref/min_of_vector_elements/include/ref_task.hpp index a787498a9..60c1aff08 100644 --- a/modules/ref/min_of_vector_elements/include/ref_task.hpp +++ b/modules/ref/min_of_vector_elements/include/ref_task.hpp @@ -1,11 +1,9 @@ #ifndef MODULES_REFERENCE_MIN_OF_VECTOR_ELEMENTS_REF_TASK_HPP_ #define MODULES_REFERENCE_MIN_OF_VECTOR_ELEMENTS_REF_TASK_HPP_ -#include #include #include -#include #include #include "core/task/include/task.hpp" diff --git a/modules/ref/most_different_neighbor_elements/func_tests/ref_tests.cpp b/modules/ref/most_different_neighbor_elements/func_tests/ref_tests.cpp index d0dba0364..2fc75f7b4 100644 --- a/modules/ref/most_different_neighbor_elements/func_tests/ref_tests.cpp +++ b/modules/ref/most_different_neighbor_elements/func_tests/ref_tests.cpp @@ -1,6 +1,8 @@ #include -#include +#include +#include +#include #include #include "core/task/include/task.hpp" diff --git a/modules/ref/most_different_neighbor_elements/include/ref_task.hpp b/modules/ref/most_different_neighbor_elements/include/ref_task.hpp index e7e0c9a28..ff9ce3a5f 100644 --- a/modules/ref/most_different_neighbor_elements/include/ref_task.hpp +++ b/modules/ref/most_different_neighbor_elements/include/ref_task.hpp @@ -1,12 +1,9 @@ #ifndef MODULES_REFERENCE_MOST_DIFFERENT_NEIGHBOR_ELEMENTS_REF_TASK_HPP_ #define MODULES_REFERENCE_MOST_DIFFERENT_NEIGHBOR_ELEMENTS_REF_TASK_HPP_ -#include #include -#include #include -#include #include #include "core/task/include/task.hpp" diff --git a/modules/ref/nearest_neighbor_elements/func_tests/ref_tests.cpp b/modules/ref/nearest_neighbor_elements/func_tests/ref_tests.cpp index 27e8566a9..aa4e8afeb 100644 --- a/modules/ref/nearest_neighbor_elements/func_tests/ref_tests.cpp +++ b/modules/ref/nearest_neighbor_elements/func_tests/ref_tests.cpp @@ -1,6 +1,8 @@ #include -#include +#include +#include +#include #include #include "core/task/include/task.hpp" diff --git a/modules/ref/nearest_neighbor_elements/include/ref_task.hpp b/modules/ref/nearest_neighbor_elements/include/ref_task.hpp index c095569e7..0c155598c 100644 --- a/modules/ref/nearest_neighbor_elements/include/ref_task.hpp +++ b/modules/ref/nearest_neighbor_elements/include/ref_task.hpp @@ -1,12 +1,9 @@ #ifndef MODULES_REFERENCE_NEAREST_NEIGHBOR_ELEMENTS_REF_TASK_HPP_ #define MODULES_REFERENCE_NEAREST_NEIGHBOR_ELEMENTS_REF_TASK_HPP_ -#include #include -#include #include -#include #include #include "core/task/include/task.hpp" diff --git a/modules/ref/num_of_alternations_signs/func_tests/ref_tests.cpp b/modules/ref/num_of_alternations_signs/func_tests/ref_tests.cpp index 5fea9bce1..4fdd5c87b 100644 --- a/modules/ref/num_of_alternations_signs/func_tests/ref_tests.cpp +++ b/modules/ref/num_of_alternations_signs/func_tests/ref_tests.cpp @@ -1,6 +1,8 @@ #include -#include +#include +#include +#include #include #include "core/task/include/task.hpp" diff --git a/modules/ref/num_of_alternations_signs/include/ref_task.hpp b/modules/ref/num_of_alternations_signs/include/ref_task.hpp index e749ef86b..937944fed 100644 --- a/modules/ref/num_of_alternations_signs/include/ref_task.hpp +++ b/modules/ref/num_of_alternations_signs/include/ref_task.hpp @@ -1,12 +1,10 @@ #ifndef MODULES_REFERENCE_NUM_OF_ALTERNATIONS_SIGNS_REF_TASK_HPP_ #define MODULES_REFERENCE_NUM_OF_ALTERNATIONS_SIGNS_REF_TASK_HPP_ -#include #include #include #include -#include #include #include "core/task/include/task.hpp" diff --git a/modules/ref/num_of_orderly_violations/func_tests/ref_tests.cpp b/modules/ref/num_of_orderly_violations/func_tests/ref_tests.cpp index 340df9ec4..bf9591959 100644 --- a/modules/ref/num_of_orderly_violations/func_tests/ref_tests.cpp +++ b/modules/ref/num_of_orderly_violations/func_tests/ref_tests.cpp @@ -1,6 +1,8 @@ #include -#include +#include +#include +#include #include #include "core/task/include/task.hpp" diff --git a/modules/ref/num_of_orderly_violations/include/ref_task.hpp b/modules/ref/num_of_orderly_violations/include/ref_task.hpp index b3a94d4f3..0adfaa4db 100644 --- a/modules/ref/num_of_orderly_violations/include/ref_task.hpp +++ b/modules/ref/num_of_orderly_violations/include/ref_task.hpp @@ -1,12 +1,9 @@ #ifndef MODULES_REFERENCE_NUM_OF_ORDERLY_VIOLATIONS_REF_TASK_HPP_ #define MODULES_REFERENCE_NUM_OF_ORDERLY_VIOLATIONS_REF_TASK_HPP_ -#include #include -#include #include -#include #include #include "core/task/include/task.hpp" diff --git a/modules/ref/sum_of_vector_elements/func_tests/ref_tests.cpp b/modules/ref/sum_of_vector_elements/func_tests/ref_tests.cpp index 106d8655e..fa24db952 100644 --- a/modules/ref/sum_of_vector_elements/func_tests/ref_tests.cpp +++ b/modules/ref/sum_of_vector_elements/func_tests/ref_tests.cpp @@ -1,5 +1,7 @@ #include +#include +#include #include #include "core/task/include/task.hpp" diff --git a/modules/ref/sum_of_vector_elements/include/ref_task.hpp b/modules/ref/sum_of_vector_elements/include/ref_task.hpp index 3a09cd99c..71a8d38dc 100644 --- a/modules/ref/sum_of_vector_elements/include/ref_task.hpp +++ b/modules/ref/sum_of_vector_elements/include/ref_task.hpp @@ -1,6 +1,5 @@ #pragma once -#include #include #include diff --git a/modules/ref/sum_values_by_rows_matrix/func_tests/ref_tests.cpp b/modules/ref/sum_values_by_rows_matrix/func_tests/ref_tests.cpp index 54456eaef..a6af378f6 100644 --- a/modules/ref/sum_values_by_rows_matrix/func_tests/ref_tests.cpp +++ b/modules/ref/sum_values_by_rows_matrix/func_tests/ref_tests.cpp @@ -1,5 +1,8 @@ #include +#include +#include +#include #include #include "core/task/include/task.hpp" diff --git a/modules/ref/sum_values_by_rows_matrix/include/ref_task.hpp b/modules/ref/sum_values_by_rows_matrix/include/ref_task.hpp index c07a58270..c1ac7eaf9 100644 --- a/modules/ref/sum_values_by_rows_matrix/include/ref_task.hpp +++ b/modules/ref/sum_values_by_rows_matrix/include/ref_task.hpp @@ -1,8 +1,8 @@ #ifndef MODULES_REFERENCE_SUM_VALUES_BY_ROWS_MATRIX_REF_TASK_HPP_ #define MODULES_REFERENCE_SUM_VALUES_BY_ROWS_MATRIX_REF_TASK_HPP_ -#include +#include #include #include #include diff --git a/modules/ref/vector_dot_product/func_tests/ref_tests.cpp b/modules/ref/vector_dot_product/func_tests/ref_tests.cpp index 3e727b833..a1f987e52 100644 --- a/modules/ref/vector_dot_product/func_tests/ref_tests.cpp +++ b/modules/ref/vector_dot_product/func_tests/ref_tests.cpp @@ -1,5 +1,8 @@ #include +#include +#include +#include #include #include "core/task/include/task.hpp" diff --git a/modules/ref/vector_dot_product/include/ref_task.hpp b/modules/ref/vector_dot_product/include/ref_task.hpp index 7929726c5..921a3c986 100644 --- a/modules/ref/vector_dot_product/include/ref_task.hpp +++ b/modules/ref/vector_dot_product/include/ref_task.hpp @@ -1,8 +1,8 @@ #ifndef MODULES_REFERENCE_VECTOR_DOT_PRODUCT_REF_TASK_HPP_ #define MODULES_REFERENCE_VECTOR_DOT_PRODUCT_REF_TASK_HPP_ -#include +#include #include #include #include diff --git a/tasks/all/example/func_tests/func_all.cpp b/tasks/all/example/func_tests/func_all.cpp index 072c347e4..8ef41aa9f 100644 --- a/tasks/all/example/func_tests/func_all.cpp +++ b/tasks/all/example/func_tests/func_all.cpp @@ -1,10 +1,15 @@ #include -#include +#include +#include +#include #include #include "all/example/include/ops_all.hpp" +#include "core/task/include/task.hpp" #include "core/util/util.hpp" +#include "opencv2/core/mat.hpp" +#include "opencv2/imgcodecs.hpp" TEST(nesterov_a_test_task_all, test_matmul_50) { constexpr size_t kCount = 50; diff --git a/tasks/all/example/include/ops_all.hpp b/tasks/all/example/include/ops_all.hpp index a919d81db..a91c555f9 100644 --- a/tasks/all/example/include/ops_all.hpp +++ b/tasks/all/example/include/ops_all.hpp @@ -1,9 +1,9 @@ #pragma once -#include #include #include +#include #include #include "core/task/include/task.hpp" diff --git a/tasks/all/example/perf_tests/perf_all.cpp b/tasks/all/example/perf_tests/perf_all.cpp index 7e664ba8b..820a24263 100644 --- a/tasks/all/example/perf_tests/perf_all.cpp +++ b/tasks/all/example/perf_tests/perf_all.cpp @@ -1,9 +1,15 @@ #include +#include +#include +#include +#include #include #include "all/example/include/ops_all.hpp" +#include "boost/mpi/communicator.hpp" #include "core/perf/include/perf.hpp" +#include "core/task/include/task.hpp" TEST(nesterov_a_test_task_all, test_pipeline_run) { constexpr int kCount = 400; diff --git a/tasks/all/example/src/ops_all.cpp b/tasks/all/example/src/ops_all.cpp index 2a9a1698e..673559ada 100644 --- a/tasks/all/example/src/ops_all.cpp +++ b/tasks/all/example/src/ops_all.cpp @@ -1,9 +1,14 @@ #include "all/example/include/ops_all.hpp" #include +#include +#include #include +#include #include "core/util/util.hpp" +#include "oneapi/tbb/task_arena.h" +#include "oneapi/tbb/task_group.h" namespace { void MatMul(const std::vector &in_vec, int rc_size, std::vector &out_vec) { diff --git a/tasks/all/runner.cpp b/tasks/all/runner.cpp index 3a6b34b62..62ef6e77b 100644 --- a/tasks/all/runner.cpp +++ b/tasks/all/runner.cpp @@ -1,9 +1,14 @@ #include #include +#include "oneapi/tbb/global_control.h" #include #include +#include +#include #include +#include +#include class UnreadMessagesDetector : public ::testing::EmptyTestEventListener { public: diff --git a/tasks/mpi/example/func_tests/main.cpp b/tasks/mpi/example/func_tests/main.cpp index cd3ad6ffa..44d41ef32 100644 --- a/tasks/mpi/example/func_tests/main.cpp +++ b/tasks/mpi/example/func_tests/main.cpp @@ -1,8 +1,13 @@ #include +#include +#include #include +#include +#include #include +#include "core/task/include/task.hpp" #include "core/util/util.hpp" #include "mpi/example/include/ops_mpi.hpp" diff --git a/tasks/mpi/example/include/ops_mpi.hpp b/tasks/mpi/example/include/ops_mpi.hpp index 43a88592b..df4eebd14 100644 --- a/tasks/mpi/example/include/ops_mpi.hpp +++ b/tasks/mpi/example/include/ops_mpi.hpp @@ -1,10 +1,8 @@ #pragma once -#include #include #include -#include #include #include diff --git a/tasks/mpi/example/perf_tests/main.cpp b/tasks/mpi/example/perf_tests/main.cpp index 7402e7328..2b52c4c67 100644 --- a/tasks/mpi/example/perf_tests/main.cpp +++ b/tasks/mpi/example/perf_tests/main.cpp @@ -1,8 +1,14 @@ #include +#include +#include +#include +#include #include +#include "boost/mpi/communicator.hpp" #include "core/perf/include/perf.hpp" +#include "core/task/include/task.hpp" #include "mpi/example/include/ops_mpi.hpp" TEST(nesterov_a_test_task_mpi, test_pipeline_run) { diff --git a/tasks/mpi/example/src/ops_mpi.cpp b/tasks/mpi/example/src/ops_mpi.cpp index 1fa585bed..5f5d281ce 100644 --- a/tasks/mpi/example/src/ops_mpi.cpp +++ b/tasks/mpi/example/src/ops_mpi.cpp @@ -1,6 +1,7 @@ #include "mpi/example/include/ops_mpi.hpp" #include +#include #include bool nesterov_a_test_task_mpi::TestTaskMPI::PreProcessingImpl() { diff --git a/tasks/mpi/runner.cpp b/tasks/mpi/runner.cpp index dc5256667..202dcb6a7 100644 --- a/tasks/mpi/runner.cpp +++ b/tasks/mpi/runner.cpp @@ -2,7 +2,11 @@ #include #include +#include +#include #include +#include +#include class UnreadMessagesDetector : public ::testing::EmptyTestEventListener { public: diff --git a/tasks/omp/example/func_tests/main.cpp b/tasks/omp/example/func_tests/main.cpp index 2b32f8db4..fbc7a5811 100644 --- a/tasks/omp/example/func_tests/main.cpp +++ b/tasks/omp/example/func_tests/main.cpp @@ -1,8 +1,13 @@ #include +#include +#include #include +#include +#include #include +#include "core/task/include/task.hpp" #include "core/util/util.hpp" #include "omp/example/include/ops_omp.hpp" diff --git a/tasks/omp/example/include/ops_omp.hpp b/tasks/omp/example/include/ops_omp.hpp index 039919d62..fef03e988 100644 --- a/tasks/omp/example/include/ops_omp.hpp +++ b/tasks/omp/example/include/ops_omp.hpp @@ -1,5 +1,6 @@ #pragma once +#include #include #include "core/task/include/task.hpp" diff --git a/tasks/omp/example/perf_tests/main.cpp b/tasks/omp/example/perf_tests/main.cpp index 7d28c3e97..a53cb7511 100644 --- a/tasks/omp/example/perf_tests/main.cpp +++ b/tasks/omp/example/perf_tests/main.cpp @@ -1,8 +1,13 @@ #include +#include +#include +#include +#include #include #include "core/perf/include/perf.hpp" +#include "core/task/include/task.hpp" #include "omp/example/include/ops_omp.hpp" TEST(nesterov_a_test_task_omp, test_pipeline_run) { diff --git a/tasks/omp/example/src/ops_omp.cpp b/tasks/omp/example/src/ops_omp.cpp index 214b97294..7db50f2d5 100644 --- a/tasks/omp/example/src/ops_omp.cpp +++ b/tasks/omp/example/src/ops_omp.cpp @@ -1,6 +1,7 @@ #include "omp/example/include/ops_omp.hpp" #include +#include #include bool nesterov_a_test_task_omp::TestTaskOpenMP::PreProcessingImpl() { diff --git a/tasks/seq/example/func_tests/main.cpp b/tasks/seq/example/func_tests/main.cpp index 40dc0a3ce..5390089db 100644 --- a/tasks/seq/example/func_tests/main.cpp +++ b/tasks/seq/example/func_tests/main.cpp @@ -1,8 +1,13 @@ #include +#include +#include #include +#include +#include #include +#include "core/task/include/task.hpp" #include "core/util/util.hpp" #include "seq/example/include/ops_seq.hpp" diff --git a/tasks/seq/example/include/ops_seq.hpp b/tasks/seq/example/include/ops_seq.hpp index 6bd579b75..728bde58d 100644 --- a/tasks/seq/example/include/ops_seq.hpp +++ b/tasks/seq/example/include/ops_seq.hpp @@ -1,5 +1,6 @@ #pragma once +#include #include #include "core/task/include/task.hpp" diff --git a/tasks/seq/example/perf_tests/main.cpp b/tasks/seq/example/perf_tests/main.cpp index 34de94f62..3dfe18048 100644 --- a/tasks/seq/example/perf_tests/main.cpp +++ b/tasks/seq/example/perf_tests/main.cpp @@ -1,8 +1,13 @@ #include +#include +#include +#include +#include #include #include "core/perf/include/perf.hpp" +#include "core/task/include/task.hpp" #include "seq/example/include/ops_seq.hpp" TEST(nesterov_a_test_task_seq, test_pipeline_run) { diff --git a/tasks/seq/example/src/ops_seq.cpp b/tasks/seq/example/src/ops_seq.cpp index d58193713..23639db05 100644 --- a/tasks/seq/example/src/ops_seq.cpp +++ b/tasks/seq/example/src/ops_seq.cpp @@ -1,7 +1,8 @@ #include "seq/example/include/ops_seq.hpp" #include -#include +#include +#include bool nesterov_a_test_task_seq::TestTaskSequential::PreProcessingImpl() { // Init value for input and output diff --git a/tasks/seq/example_disabled/func_tests/main.cpp b/tasks/seq/example_disabled/func_tests/main.cpp index 40dc0a3ce..5390089db 100644 --- a/tasks/seq/example_disabled/func_tests/main.cpp +++ b/tasks/seq/example_disabled/func_tests/main.cpp @@ -1,8 +1,13 @@ #include +#include +#include #include +#include +#include #include +#include "core/task/include/task.hpp" #include "core/util/util.hpp" #include "seq/example/include/ops_seq.hpp" diff --git a/tasks/seq/example_disabled/include/ops_seq.hpp b/tasks/seq/example_disabled/include/ops_seq.hpp index 6bd579b75..728bde58d 100644 --- a/tasks/seq/example_disabled/include/ops_seq.hpp +++ b/tasks/seq/example_disabled/include/ops_seq.hpp @@ -1,5 +1,6 @@ #pragma once +#include #include #include "core/task/include/task.hpp" diff --git a/tasks/seq/example_disabled/perf_tests/main.cpp b/tasks/seq/example_disabled/perf_tests/main.cpp index 34de94f62..3dfe18048 100644 --- a/tasks/seq/example_disabled/perf_tests/main.cpp +++ b/tasks/seq/example_disabled/perf_tests/main.cpp @@ -1,8 +1,13 @@ #include +#include +#include +#include +#include #include #include "core/perf/include/perf.hpp" +#include "core/task/include/task.hpp" #include "seq/example/include/ops_seq.hpp" TEST(nesterov_a_test_task_seq, test_pipeline_run) { diff --git a/tasks/seq/example_disabled/src/ops_seq.cpp b/tasks/seq/example_disabled/src/ops_seq.cpp index d58193713..23639db05 100644 --- a/tasks/seq/example_disabled/src/ops_seq.cpp +++ b/tasks/seq/example_disabled/src/ops_seq.cpp @@ -1,7 +1,8 @@ #include "seq/example/include/ops_seq.hpp" #include -#include +#include +#include bool nesterov_a_test_task_seq::TestTaskSequential::PreProcessingImpl() { // Init value for input and output diff --git a/tasks/stl/example/func_tests/main.cpp b/tasks/stl/example/func_tests/main.cpp index bcc096b9e..b706364ed 100644 --- a/tasks/stl/example/func_tests/main.cpp +++ b/tasks/stl/example/func_tests/main.cpp @@ -1,9 +1,13 @@ #include +#include +#include #include -#include +#include +#include #include +#include "core/task/include/task.hpp" #include "core/util/util.hpp" #include "stl/example/include/ops_stl.hpp" diff --git a/tasks/stl/example/include/ops_stl.hpp b/tasks/stl/example/include/ops_stl.hpp index 3e56f9de9..05b6b6dbf 100644 --- a/tasks/stl/example/include/ops_stl.hpp +++ b/tasks/stl/example/include/ops_stl.hpp @@ -1,5 +1,6 @@ #pragma once +#include #include #include "core/task/include/task.hpp" diff --git a/tasks/stl/example/perf_tests/main.cpp b/tasks/stl/example/perf_tests/main.cpp index 3106beef8..7d5065dfe 100644 --- a/tasks/stl/example/perf_tests/main.cpp +++ b/tasks/stl/example/perf_tests/main.cpp @@ -1,8 +1,13 @@ #include +#include +#include +#include +#include #include #include "core/perf/include/perf.hpp" +#include "core/task/include/task.hpp" #include "stl/example/include/ops_stl.hpp" TEST(nesterov_a_test_task_stl, test_pipeline_run) { diff --git a/tasks/stl/example/src/ops_stl.cpp b/tasks/stl/example/src/ops_stl.cpp index d656391bb..61f1302e9 100644 --- a/tasks/stl/example/src/ops_stl.cpp +++ b/tasks/stl/example/src/ops_stl.cpp @@ -1,7 +1,8 @@ #include "stl/example/include/ops_stl.hpp" #include -#include +#include +#include #include #include diff --git a/tasks/tbb/example/func_tests/main.cpp b/tasks/tbb/example/func_tests/main.cpp index 20b732bad..f0aa3868d 100644 --- a/tasks/tbb/example/func_tests/main.cpp +++ b/tasks/tbb/example/func_tests/main.cpp @@ -1,9 +1,13 @@ #include +#include +#include #include -#include +#include +#include #include +#include "core/task/include/task.hpp" #include "core/util/util.hpp" #include "tbb/example/include/ops_tbb.hpp" diff --git a/tasks/tbb/example/include/ops_tbb.hpp b/tasks/tbb/example/include/ops_tbb.hpp index 0fe668d73..4e6286bd5 100644 --- a/tasks/tbb/example/include/ops_tbb.hpp +++ b/tasks/tbb/example/include/ops_tbb.hpp @@ -1,5 +1,6 @@ #pragma once +#include #include #include "core/task/include/task.hpp" diff --git a/tasks/tbb/example/perf_tests/main.cpp b/tasks/tbb/example/perf_tests/main.cpp index 4e59cf13a..b6e4fedae 100644 --- a/tasks/tbb/example/perf_tests/main.cpp +++ b/tasks/tbb/example/perf_tests/main.cpp @@ -1,8 +1,13 @@ #include +#include +#include +#include +#include #include #include "core/perf/include/perf.hpp" +#include "core/task/include/task.hpp" #include "tbb/example/include/ops_tbb.hpp" TEST(nesterov_a_test_task_tbb, test_pipeline_run) { diff --git a/tasks/tbb/example/src/ops_tbb.cpp b/tasks/tbb/example/src/ops_tbb.cpp index 4f36ec169..b6c0c6e98 100644 --- a/tasks/tbb/example/src/ops_tbb.cpp +++ b/tasks/tbb/example/src/ops_tbb.cpp @@ -2,8 +2,11 @@ #include +#include "oneapi/tbb/task_arena.h" +#include "oneapi/tbb/task_group.h" #include #include +#include #include namespace { diff --git a/tasks/tbb/runner.cpp b/tasks/tbb/runner.cpp index 02a1bf0c0..eb71d7ece 100644 --- a/tasks/tbb/runner.cpp +++ b/tasks/tbb/runner.cpp @@ -2,6 +2,7 @@ #include #include "core/util/util.hpp" +#include "oneapi/tbb/global_control.h" int main(int argc, char** argv) { // Limit the number of threads in TBB From 6e74e9f2de29880510723c59f24076119a4d8b59 Mon Sep 17 00:00:00 2001 From: Arseniy Obolenskiy Date: Tue, 4 Feb 2025 09:25:07 +0100 Subject: [PATCH 2/3] Apply clang-format remarks --- modules/core/perf/src/perf.cpp | 3 ++- modules/ref/average_of_vector_elements/include/ref_task.hpp | 1 - modules/ref/max_of_vector_elements/include/ref_task.hpp | 1 - modules/ref/min_of_vector_elements/include/ref_task.hpp | 1 - .../most_different_neighbor_elements/include/ref_task.hpp | 1 - modules/ref/nearest_neighbor_elements/include/ref_task.hpp | 1 - modules/ref/num_of_alternations_signs/include/ref_task.hpp | 1 - modules/ref/num_of_orderly_violations/include/ref_task.hpp | 1 - modules/ref/sum_of_vector_elements/include/ref_task.hpp | 1 - modules/ref/sum_values_by_rows_matrix/include/ref_task.hpp | 1 - modules/ref/vector_dot_product/include/ref_task.hpp | 1 - tasks/all/example/include/ops_all.hpp | 1 - tasks/all/runner.cpp | 3 ++- tasks/mpi/example/include/ops_mpi.hpp | 1 - tasks/tbb/example/src/ops_tbb.cpp | 5 +++-- 15 files changed, 7 insertions(+), 16 deletions(-) diff --git a/modules/core/perf/src/perf.cpp b/modules/core/perf/src/perf.cpp index 1c3ea1b38..4f1f3c490 100644 --- a/modules/core/perf/src/perf.cpp +++ b/modules/core/perf/src/perf.cpp @@ -2,7 +2,6 @@ #include -#include "core/task/include/task.hpp" #include #include #include @@ -12,6 +11,8 @@ #include #include +#include "core/task/include/task.hpp" + ppc::core::Perf::Perf(const std::shared_ptr& task_ptr) { SetTask(task_ptr); } void ppc::core::Perf::SetTask(const std::shared_ptr& task_ptr) { diff --git a/modules/ref/average_of_vector_elements/include/ref_task.hpp b/modules/ref/average_of_vector_elements/include/ref_task.hpp index 2e7dabdd4..40e2282da 100644 --- a/modules/ref/average_of_vector_elements/include/ref_task.hpp +++ b/modules/ref/average_of_vector_elements/include/ref_task.hpp @@ -1,7 +1,6 @@ #ifndef MODULES_REFERENCE_AVERAGE_OF_VECTOR_ELEMENTS_REF_TASK_HPP_ #define MODULES_REFERENCE_AVERAGE_OF_VECTOR_ELEMENTS_REF_TASK_HPP_ - #include #include #include diff --git a/modules/ref/max_of_vector_elements/include/ref_task.hpp b/modules/ref/max_of_vector_elements/include/ref_task.hpp index cf62df78e..80fdafeb9 100644 --- a/modules/ref/max_of_vector_elements/include/ref_task.hpp +++ b/modules/ref/max_of_vector_elements/include/ref_task.hpp @@ -1,7 +1,6 @@ #ifndef MODULES_REFERENCE_MAX_OF_VECTOR_ELEMENTS_REF_TASK_HPP_ #define MODULES_REFERENCE_MAX_OF_VECTOR_ELEMENTS_REF_TASK_HPP_ - #include #include #include diff --git a/modules/ref/min_of_vector_elements/include/ref_task.hpp b/modules/ref/min_of_vector_elements/include/ref_task.hpp index 60c1aff08..860f80508 100644 --- a/modules/ref/min_of_vector_elements/include/ref_task.hpp +++ b/modules/ref/min_of_vector_elements/include/ref_task.hpp @@ -1,7 +1,6 @@ #ifndef MODULES_REFERENCE_MIN_OF_VECTOR_ELEMENTS_REF_TASK_HPP_ #define MODULES_REFERENCE_MIN_OF_VECTOR_ELEMENTS_REF_TASK_HPP_ - #include #include #include diff --git a/modules/ref/most_different_neighbor_elements/include/ref_task.hpp b/modules/ref/most_different_neighbor_elements/include/ref_task.hpp index ff9ce3a5f..350fb84a9 100644 --- a/modules/ref/most_different_neighbor_elements/include/ref_task.hpp +++ b/modules/ref/most_different_neighbor_elements/include/ref_task.hpp @@ -1,7 +1,6 @@ #ifndef MODULES_REFERENCE_MOST_DIFFERENT_NEIGHBOR_ELEMENTS_REF_TASK_HPP_ #define MODULES_REFERENCE_MOST_DIFFERENT_NEIGHBOR_ELEMENTS_REF_TASK_HPP_ - #include #include #include diff --git a/modules/ref/nearest_neighbor_elements/include/ref_task.hpp b/modules/ref/nearest_neighbor_elements/include/ref_task.hpp index 0c155598c..566bf5233 100644 --- a/modules/ref/nearest_neighbor_elements/include/ref_task.hpp +++ b/modules/ref/nearest_neighbor_elements/include/ref_task.hpp @@ -1,7 +1,6 @@ #ifndef MODULES_REFERENCE_NEAREST_NEIGHBOR_ELEMENTS_REF_TASK_HPP_ #define MODULES_REFERENCE_NEAREST_NEIGHBOR_ELEMENTS_REF_TASK_HPP_ - #include #include #include diff --git a/modules/ref/num_of_alternations_signs/include/ref_task.hpp b/modules/ref/num_of_alternations_signs/include/ref_task.hpp index 937944fed..85c7b7077 100644 --- a/modules/ref/num_of_alternations_signs/include/ref_task.hpp +++ b/modules/ref/num_of_alternations_signs/include/ref_task.hpp @@ -1,7 +1,6 @@ #ifndef MODULES_REFERENCE_NUM_OF_ALTERNATIONS_SIGNS_REF_TASK_HPP_ #define MODULES_REFERENCE_NUM_OF_ALTERNATIONS_SIGNS_REF_TASK_HPP_ - #include #include #include diff --git a/modules/ref/num_of_orderly_violations/include/ref_task.hpp b/modules/ref/num_of_orderly_violations/include/ref_task.hpp index 0adfaa4db..6301c5d4e 100644 --- a/modules/ref/num_of_orderly_violations/include/ref_task.hpp +++ b/modules/ref/num_of_orderly_violations/include/ref_task.hpp @@ -1,7 +1,6 @@ #ifndef MODULES_REFERENCE_NUM_OF_ORDERLY_VIOLATIONS_REF_TASK_HPP_ #define MODULES_REFERENCE_NUM_OF_ORDERLY_VIOLATIONS_REF_TASK_HPP_ - #include #include #include diff --git a/modules/ref/sum_of_vector_elements/include/ref_task.hpp b/modules/ref/sum_of_vector_elements/include/ref_task.hpp index 71a8d38dc..de612dda1 100644 --- a/modules/ref/sum_of_vector_elements/include/ref_task.hpp +++ b/modules/ref/sum_of_vector_elements/include/ref_task.hpp @@ -1,6 +1,5 @@ #pragma once - #include #include #include diff --git a/modules/ref/sum_values_by_rows_matrix/include/ref_task.hpp b/modules/ref/sum_values_by_rows_matrix/include/ref_task.hpp index c1ac7eaf9..5175e66b5 100644 --- a/modules/ref/sum_values_by_rows_matrix/include/ref_task.hpp +++ b/modules/ref/sum_values_by_rows_matrix/include/ref_task.hpp @@ -1,7 +1,6 @@ #ifndef MODULES_REFERENCE_SUM_VALUES_BY_ROWS_MATRIX_REF_TASK_HPP_ #define MODULES_REFERENCE_SUM_VALUES_BY_ROWS_MATRIX_REF_TASK_HPP_ - #include #include #include diff --git a/modules/ref/vector_dot_product/include/ref_task.hpp b/modules/ref/vector_dot_product/include/ref_task.hpp index 921a3c986..03a69d9e2 100644 --- a/modules/ref/vector_dot_product/include/ref_task.hpp +++ b/modules/ref/vector_dot_product/include/ref_task.hpp @@ -1,7 +1,6 @@ #ifndef MODULES_REFERENCE_VECTOR_DOT_PRODUCT_REF_TASK_HPP_ #define MODULES_REFERENCE_VECTOR_DOT_PRODUCT_REF_TASK_HPP_ - #include #include #include diff --git a/tasks/all/example/include/ops_all.hpp b/tasks/all/example/include/ops_all.hpp index a91c555f9..c1cb268cc 100644 --- a/tasks/all/example/include/ops_all.hpp +++ b/tasks/all/example/include/ops_all.hpp @@ -1,6 +1,5 @@ #pragma once - #include #include #include diff --git a/tasks/all/runner.cpp b/tasks/all/runner.cpp index 62ef6e77b..86c2de286 100644 --- a/tasks/all/runner.cpp +++ b/tasks/all/runner.cpp @@ -1,7 +1,6 @@ #include #include -#include "oneapi/tbb/global_control.h" #include #include #include @@ -10,6 +9,8 @@ #include #include +#include "oneapi/tbb/global_control.h" + class UnreadMessagesDetector : public ::testing::EmptyTestEventListener { public: UnreadMessagesDetector(boost::mpi::communicator com) : com_(std::move(com)) {} diff --git a/tasks/mpi/example/include/ops_mpi.hpp b/tasks/mpi/example/include/ops_mpi.hpp index df4eebd14..758631967 100644 --- a/tasks/mpi/example/include/ops_mpi.hpp +++ b/tasks/mpi/example/include/ops_mpi.hpp @@ -1,6 +1,5 @@ #pragma once - #include #include #include diff --git a/tasks/tbb/example/src/ops_tbb.cpp b/tasks/tbb/example/src/ops_tbb.cpp index b6c0c6e98..f82673a2d 100644 --- a/tasks/tbb/example/src/ops_tbb.cpp +++ b/tasks/tbb/example/src/ops_tbb.cpp @@ -2,13 +2,14 @@ #include -#include "oneapi/tbb/task_arena.h" -#include "oneapi/tbb/task_group.h" #include #include #include #include +#include "oneapi/tbb/task_arena.h" +#include "oneapi/tbb/task_group.h" + namespace { void MatMul(const std::vector &in_vec, int rc_size, std::vector &out_vec) { for (int i = 0; i < rc_size; ++i) { From 561600eddbc56d0ef52ccd12ec5224fcf2f9ba3a Mon Sep 17 00:00:00 2001 From: Arseniy Obolenskiy Date: Tue, 4 Feb 2025 10:14:42 +0100 Subject: [PATCH 3/3] opencv fix --- .clang-tidy | 1 + tasks/all/example/func_tests/func_all.cpp | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.clang-tidy b/.clang-tidy index 5244d88c1..84d708dd4 100644 --- a/.clang-tidy +++ b/.clang-tidy @@ -27,6 +27,7 @@ Checks: > -readability-named-parameter WarningsAsErrors: "*" +HeaderFilterRegex: '^(?!.*opencv2).*' CheckOptions: - key: readability-identifier-naming.ClassCase diff --git a/tasks/all/example/func_tests/func_all.cpp b/tasks/all/example/func_tests/func_all.cpp index 8ef41aa9f..da7389c0c 100644 --- a/tasks/all/example/func_tests/func_all.cpp +++ b/tasks/all/example/func_tests/func_all.cpp @@ -3,13 +3,12 @@ #include #include #include +#include #include #include "all/example/include/ops_all.hpp" #include "core/task/include/task.hpp" #include "core/util/util.hpp" -#include "opencv2/core/mat.hpp" -#include "opencv2/imgcodecs.hpp" TEST(nesterov_a_test_task_all, test_matmul_50) { constexpr size_t kCount = 50;