Skip to content

Commit 01769ea

Browse files
authored
Merge branch 'master' into log-mpi-worker-failures
2 parents 8b7c999 + 987a6a5 commit 01769ea

File tree

5 files changed

+21
-19
lines changed

5 files changed

+21
-19
lines changed

Diff for: .clang-tidy

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ Checks: >
2020
-misc-unused-parameters,
2121
-misc-use-anonymous-namespace,
2222
-modernize-avoid-c-arrays,
23+
-modernize-loop-convert,
2324
-modernize-use-nodiscard,
2425
-modernize-use-trailing-return-type,
2526
-readability-function-cognitive-complexity,

Diff for: modules/core/perf/include/perf.hpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@ struct PerfResults {
2727
class Perf {
2828
public:
2929
// Init performance analysis with initialized task and initialized data
30-
explicit Perf(const std::shared_ptr<Task> &task);
30+
explicit Perf(const std::shared_ptr<Task>& task_ptr);
3131
// Set task with initialized task and initialized data for performance
3232
// analysis c
33-
void SetTask(const std::shared_ptr<Task> &task);
33+
void SetTask(const std::shared_ptr<Task>& task_ptr);
3434
// Check performance of full task's pipeline: pre_processing() ->
3535
// validation() -> run() -> post_processing()
3636
void PipelineRun(const std::shared_ptr<PerfAttr>& perf_attr,
37-
const std::shared_ptr<ppc::core::PerfResults>& perf_results);
37+
const std::shared_ptr<ppc::core::PerfResults>& perf_results);
3838
// Check performance of task's run() function
3939
void TaskRun(const std::shared_ptr<PerfAttr>& perf_attr, const std::shared_ptr<ppc::core::PerfResults>& perf_results);
4040
// Pint results for automation checkers
@@ -43,7 +43,7 @@ class Perf {
4343
private:
4444
std::shared_ptr<Task> task;
4545
static void CommonRun(const std::shared_ptr<PerfAttr>& perf_attr, const std::function<void()>& pipeline,
46-
const std::shared_ptr<ppc::core::PerfResults>& perf_results);
46+
const std::shared_ptr<ppc::core::PerfResults>& perf_results);
4747
};
4848

4949
} // namespace core

Diff for: modules/core/perf/src/perf.cpp

+7-7
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77
#include <sstream>
88
#include <utility>
99

10-
ppc::core::Perf::Perf(const std::shared_ptr<Task> &task) { SetTask(task); }
10+
ppc::core::Perf::Perf(const std::shared_ptr<Task>& task_ptr) { SetTask(task_ptr); }
1111

12-
void ppc::core::Perf::SetTask(const std::shared_ptr<Task> &task) {
13-
task->get_data()->state_of_testing = TaskData::StateOfTesting::PERF;
14-
this->task = task;
12+
void ppc::core::Perf::SetTask(const std::shared_ptr<Task>& task_ptr) {
13+
task_ptr->get_data()->state_of_testing = TaskData::StateOfTesting::PERF;
14+
this->task = task_ptr;
1515
}
1616

1717
void ppc::core::Perf::PipelineRun(const std::shared_ptr<PerfAttr>& perf_attr,
18-
const std::shared_ptr<ppc::core::PerfResults>& perf_results) {
18+
const std::shared_ptr<ppc::core::PerfResults>& perf_results) {
1919
perf_results->type_of_running = PerfResults::TypeOfRunning::PIPELINE;
2020

2121
CommonRun(
@@ -30,7 +30,7 @@ void ppc::core::Perf::PipelineRun(const std::shared_ptr<PerfAttr>& perf_attr,
3030
}
3131

3232
void ppc::core::Perf::TaskRun(const std::shared_ptr<PerfAttr>& perf_attr,
33-
const std::shared_ptr<ppc::core::PerfResults>& perf_results) {
33+
const std::shared_ptr<ppc::core::PerfResults>& perf_results) {
3434
perf_results->type_of_running = PerfResults::TypeOfRunning::TASK_RUN;
3535

3636
task->validation();
@@ -45,7 +45,7 @@ void ppc::core::Perf::TaskRun(const std::shared_ptr<PerfAttr>& perf_attr,
4545
}
4646

4747
void ppc::core::Perf::CommonRun(const std::shared_ptr<PerfAttr>& perf_attr, const std::function<void()>& pipeline,
48-
const std::shared_ptr<ppc::core::PerfResults>& perf_results) {
48+
const std::shared_ptr<ppc::core::PerfResults>& perf_results) {
4949
auto begin = perf_attr->current_timer();
5050
for (uint64_t i = 0; i < perf_attr->num_running; i++) {
5151
pipeline();

Diff for: modules/core/task/src/task.cpp

+3-2
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,9 @@ bool ppc::core::Task::post_processing() {
3636
}
3737

3838
void ppc::core::Task::internal_order_test(const std::string& str) {
39-
if (!functions_order.empty() && str == functions_order.back() && str == "run") { return;
40-
}
39+
if (!functions_order.empty() && str == functions_order.back() && str == "run") {
40+
return;
41+
}
4142

4243
functions_order.push_back(str);
4344

Diff for: tasks/omp/example/src/ops_omp.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -63,18 +63,18 @@ bool nesterov_a_test_task_omp::TestOMPTaskParallel::run_impl() {
6363
auto temp_res = res;
6464
if (ops == "+") {
6565
#pragma omp parallel for reduction(+ : temp_res)
66-
for (int i : input_) {
67-
temp_res += i;
66+
for (int i = 0; i < static_cast<int>(input_.size()); i++) {
67+
temp_res += input_[i];
6868
}
6969
} else if (ops == "-") {
7070
#pragma omp parallel for reduction(- : temp_res)
71-
for (int i : input_) {
72-
temp_res -= i;
71+
for (int i = 0; i < static_cast<int>(input_.size()); i++) {
72+
temp_res -= input_[i];
7373
}
7474
} else if (ops == "*") {
7575
#pragma omp parallel for reduction(* : temp_res)
76-
for (int i : input_) {
77-
temp_res *= i;
76+
for (int i = 0; i < static_cast<int>(input_.size()); i++) {
77+
temp_res *= input_[i];
7878
}
7979
}
8080
res = temp_res;

0 commit comments

Comments
 (0)