Skip to content

Commit beda560

Browse files
aobolenskaobolensk
authored
Apply clang-tidy on both headers and sources (#206)
* Apply clang-tidy on both headers and sources * 2 * 3 * fmt * fix tests * task data ptr
1 parent 0ae5b4c commit beda560

File tree

49 files changed

+1106
-1125
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+1106
-1125
lines changed

Diff for: ‎.clang-tidy

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ Checks: >
1414
-bugprone-narrowing-conversions,
1515
-clang-analyzer-optin.cplusplus.UninitializedObject,
1616
-misc-const-correctness,
17+
-misc-header-include-cycle,
1718
-misc-include-cleaner,
1819
-misc-no-recursion,
1920
-misc-non-private-member-variables-in-classes,

Diff for: ‎modules/core/perf/func_tests/perf_tests.cpp

+12-12
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ TEST(perf_tests, check_perf_pipeline) {
1010
std::vector<uint32_t> in(2000, 1);
1111
std::vector<uint32_t> out(1, 0);
1212

13-
// Create TaskData
13+
// Create task_data
1414
auto task_data = std::make_shared<ppc::core::TaskData>();
1515
task_data->inputs.emplace_back(reinterpret_cast<uint8_t *>(in.data()));
1616
task_data->inputs_count.emplace_back(in.size());
@@ -33,7 +33,7 @@ TEST(perf_tests, check_perf_pipeline) {
3333

3434
// Get perf statistic
3535
ppc::core::Perf::PrintPerfStatistic(perf_results);
36-
ASSERT_LE(perf_results->time_sec, ppc::core::PerfResults::MAX_TIME);
36+
ASSERT_LE(perf_results->time_sec, ppc::core::PerfResults::kMaxTime);
3737
EXPECT_EQ(out[0], in.size());
3838
}
3939

@@ -42,7 +42,7 @@ TEST(perf_tests, check_perf_pipeline_float) {
4242
std::vector<float> in(2000, 1);
4343
std::vector<float> out(1, 0);
4444

45-
// Create TaskData
45+
// Create task_data
4646
auto task_data = std::make_shared<ppc::core::TaskData>();
4747
task_data->inputs.emplace_back(reinterpret_cast<uint8_t *>(in.data()));
4848
task_data->inputs_count.emplace_back(in.size());
@@ -65,7 +65,7 @@ TEST(perf_tests, check_perf_pipeline_float) {
6565

6666
// Get perf statistic
6767
ppc::core::Perf::PrintPerfStatistic(perf_results);
68-
ASSERT_LE(perf_results->time_sec, ppc::core::PerfResults::MAX_TIME);
68+
ASSERT_LE(perf_results->time_sec, ppc::core::PerfResults::kMaxTime);
6969
EXPECT_EQ(out[0], in.size());
7070
}
7171

@@ -74,7 +74,7 @@ TEST(perf_tests, check_perf_pipeline_uint8_t_slow_test) {
7474
std::vector<uint8_t> in(128, 1);
7575
std::vector<uint8_t> out(1, 0);
7676

77-
// Create TaskData
77+
// Create task_data
7878
auto task_data = std::make_shared<ppc::core::TaskData>();
7979
task_data->inputs.emplace_back(reinterpret_cast<uint8_t *>(in.data()));
8080
task_data->inputs_count.emplace_back(in.size());
@@ -102,7 +102,7 @@ TEST(perf_tests, check_perf_pipeline_uint8_t_slow_test) {
102102

103103
// Get perf statistic
104104
ASSERT_ANY_THROW(ppc::core::Perf::PrintPerfStatistic(perf_results));
105-
ASSERT_GE(perf_results->time_sec, ppc::core::PerfResults::MAX_TIME);
105+
ASSERT_GE(perf_results->time_sec, ppc::core::PerfResults::kMaxTime);
106106
EXPECT_EQ(out[0], in.size());
107107
}
108108

@@ -111,7 +111,7 @@ TEST(perf_tests, check_perf_task) {
111111
std::vector<uint32_t> in(2000, 1);
112112
std::vector<uint32_t> out(1, 0);
113113

114-
// Create TaskData
114+
// Create task_data
115115
auto task_data = std::make_shared<ppc::core::TaskData>();
116116
task_data->inputs.emplace_back(reinterpret_cast<uint8_t *>(in.data()));
117117
task_data->inputs_count.emplace_back(in.size());
@@ -133,9 +133,9 @@ TEST(perf_tests, check_perf_task) {
133133
perf_analyzer.TaskRun(perf_attr, perf_results);
134134

135135
// Get perf statistic
136-
perf_results->type_of_running = ppc::core::PerfResults::NONE;
136+
perf_results->type_of_running = ppc::core::PerfResults::kNone;
137137
ppc::core::Perf::PrintPerfStatistic(perf_results);
138-
ASSERT_LE(perf_results->time_sec, ppc::core::PerfResults::MAX_TIME);
138+
ASSERT_LE(perf_results->time_sec, ppc::core::PerfResults::kMaxTime);
139139
EXPECT_EQ(out[0], in.size());
140140
}
141141

@@ -144,7 +144,7 @@ TEST(perf_tests, check_perf_task_float) {
144144
std::vector<float> in(2000, 1);
145145
std::vector<float> out(1, 0);
146146

147-
// Create TaskData
147+
// Create task_data
148148
auto task_data = std::make_shared<ppc::core::TaskData>();
149149
task_data->inputs.emplace_back(reinterpret_cast<uint8_t *>(in.data()));
150150
task_data->inputs_count.emplace_back(in.size());
@@ -166,8 +166,8 @@ TEST(perf_tests, check_perf_task_float) {
166166
perf_analyzer.TaskRun(perf_attr, perf_results);
167167

168168
// Get perf statistic
169-
perf_results->type_of_running = ppc::core::PerfResults::PIPELINE;
169+
perf_results->type_of_running = ppc::core::PerfResults::kPipeline;
170170
ppc::core::Perf::PrintPerfStatistic(perf_results);
171-
ASSERT_LE(perf_results->time_sec, ppc::core::PerfResults::MAX_TIME);
171+
ASSERT_LE(perf_results->time_sec, ppc::core::PerfResults::kMaxTime);
172172
EXPECT_EQ(out[0], in.size());
173173
}

Diff for: ‎modules/core/perf/func_tests/test_task.hpp

+11-11
Original file line numberDiff line numberDiff line change
@@ -16,25 +16,25 @@ namespace ppc::test::perf {
1616
template <class T>
1717
class TestTask : public ppc::core::Task {
1818
public:
19-
explicit TestTask(ppc::core::TaskDataPtr taskData_) : Task(taskData_) {}
19+
explicit TestTask(ppc::core::TaskDataPtr task_data) : Task(task_data) {}
2020

21-
bool pre_processing_impl() override {
22-
input_ = reinterpret_cast<T *>(taskData->inputs[0]);
23-
output_ = reinterpret_cast<T *>(taskData->outputs[0]);
21+
bool PreProcessingImpl() override {
22+
input_ = reinterpret_cast<T *>(task_data->inputs[0]);
23+
output_ = reinterpret_cast<T *>(task_data->outputs[0]);
2424
output_[0] = 0;
2525
return true;
2626
}
2727

28-
bool validation_impl() override { return taskData->outputs_count[0] == 1; }
28+
bool ValidationImpl() override { return task_data->outputs_count[0] == 1; }
2929

30-
bool run_impl() override {
31-
for (unsigned i = 0; i < taskData->inputs_count[0]; i++) {
30+
bool RunImpl() override {
31+
for (unsigned i = 0; i < task_data->inputs_count[0]; i++) {
3232
output_[0] += input_[i];
3333
}
3434
return true;
3535
}
3636

37-
bool post_processing_impl() override { return true; }
37+
bool PostProcessingImpl() override { return true; }
3838

3939
private:
4040
T *input_{};
@@ -44,11 +44,11 @@ class TestTask : public ppc::core::Task {
4444
template <class T>
4545
class FakePerfTask : public TestTask<T> {
4646
public:
47-
explicit FakePerfTask(ppc::core::TaskDataPtr perfTaskData_) : TestTask<T>(perfTaskData_) {}
47+
explicit FakePerfTask(ppc::core::TaskDataPtr perf_task_data) : TestTask<T>(perf_task_data) {}
4848

49-
bool run_impl() override {
49+
bool RunImpl() override {
5050
std::this_thread::sleep_for(20000ms);
51-
return TestTask<T>::run_impl();
51+
return TestTask<T>::RunImpl();
5252
}
5353
};
5454

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

+8-10
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@
88

99
#include "core/task/include/task.hpp"
1010

11-
namespace ppc {
12-
namespace core {
11+
namespace ppc::core {
1312

1413
struct PerfAttr {
1514
// count of task's running
@@ -20,8 +19,8 @@ struct PerfAttr {
2019
struct PerfResults {
2120
// measurement of task's time (in seconds)
2221
double time_sec = 0.0;
23-
enum TypeOfRunning { PIPELINE, TASK_RUN, NONE } type_of_running = NONE;
24-
constexpr const static double MAX_TIME = 10.0;
22+
enum TypeOfRunning : uint8_t { kPipeline, kTaskRun, kNone } type_of_running = kNone;
23+
constexpr const static double kMaxTime = 10.0;
2524
};
2625

2726
class Perf {
@@ -31,22 +30,21 @@ class Perf {
3130
// Set task with initialized task and initialized data for performance
3231
// analysis c
3332
void SetTask(const std::shared_ptr<Task>& task_ptr);
34-
// Check performance of full task's pipeline: pre_processing() ->
35-
// validation() -> run() -> post_processing()
33+
// Check performance of full task's pipeline: PreProcessing() ->
34+
// Validation() -> Run() -> PostProcessing()
3635
void PipelineRun(const std::shared_ptr<PerfAttr>& perf_attr,
3736
const std::shared_ptr<ppc::core::PerfResults>& perf_results);
38-
// Check performance of task's run() function
37+
// Check performance of task's Run() function
3938
void TaskRun(const std::shared_ptr<PerfAttr>& perf_attr, const std::shared_ptr<ppc::core::PerfResults>& perf_results);
4039
// Pint results for automation checkers
4140
static void PrintPerfStatistic(const std::shared_ptr<PerfResults>& perf_results);
4241

4342
private:
44-
std::shared_ptr<Task> task;
43+
std::shared_ptr<Task> task_;
4544
static void CommonRun(const std::shared_ptr<PerfAttr>& perf_attr, const std::function<void()>& pipeline,
4645
const std::shared_ptr<ppc::core::PerfResults>& perf_results);
4746
};
4847

49-
} // namespace core
50-
} // namespace ppc
48+
} // namespace ppc::core
5149

5250
#endif // MODULES_CORE_INCLUDE_PERF_HPP_

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

+21-21
Original file line numberDiff line numberDiff line change
@@ -10,38 +10,38 @@
1010
ppc::core::Perf::Perf(const std::shared_ptr<Task>& task_ptr) { SetTask(task_ptr); }
1111

1212
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;
13+
task_ptr->GetData()->state_of_testing = TaskData::StateOfTesting::kPerf;
14+
this->task_ = task_ptr;
1515
}
1616

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

2121
CommonRun(
2222
perf_attr,
2323
[&]() {
24-
task->validation();
25-
task->pre_processing();
26-
task->run();
27-
task->post_processing();
24+
task_->Validation();
25+
task_->PreProcessing();
26+
task_->Run();
27+
task_->PostProcessing();
2828
},
2929
perf_results);
3030
}
3131

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

36-
task->validation();
37-
task->pre_processing();
38-
CommonRun(perf_attr, [&]() { task->run(); }, perf_results);
39-
task->post_processing();
36+
task_->Validation();
37+
task_->PreProcessing();
38+
CommonRun(perf_attr, [&]() { task_->Run(); }, perf_results);
39+
task_->PostProcessing();
4040

41-
task->validation();
42-
task->pre_processing();
43-
task->run();
44-
task->post_processing();
41+
task_->Validation();
42+
task_->PreProcessing();
43+
task_->Run();
44+
task_->PostProcessing();
4545
}
4646

4747
void ppc::core::Perf::CommonRun(const std::shared_ptr<PerfAttr>& perf_attr, const std::function<void()>& pipeline,
@@ -62,11 +62,11 @@ void ppc::core::Perf::PrintPerfStatistic(const std::shared_ptr<PerfResults>& per
6262

6363
auto time_secs = perf_results->time_sec;
6464

65-
if (perf_results->type_of_running == PerfResults::TypeOfRunning::TASK_RUN) {
65+
if (perf_results->type_of_running == PerfResults::TypeOfRunning::kTaskRun) {
6666
type_test_name = "task_run";
67-
} else if (perf_results->type_of_running == PerfResults::TypeOfRunning::PIPELINE) {
67+
} else if (perf_results->type_of_running == PerfResults::TypeOfRunning::kPipeline) {
6868
type_test_name = "pipeline";
69-
} else if (perf_results->type_of_running == PerfResults::TypeOfRunning::NONE) {
69+
} else if (perf_results->type_of_running == PerfResults::TypeOfRunning::kNone) {
7070
type_test_name = "none";
7171
}
7272

@@ -77,13 +77,13 @@ void ppc::core::Perf::PrintPerfStatistic(const std::shared_ptr<PerfResults>& per
7777
relative_path.erase(last_found_position, relative_path.length() - 1);
7878

7979
std::stringstream perf_res_str;
80-
if (time_secs < PerfResults::MAX_TIME) {
80+
if (time_secs < PerfResults::kMaxTime) {
8181
perf_res_str << std::fixed << std::setprecision(10) << time_secs;
8282
std::cout << relative_path << ":" << type_test_name << ":" << perf_res_str.str() << '\n';
8383
} else {
8484
std::stringstream err_msg;
8585
err_msg << '\n' << "Task execute time need to be: ";
86-
err_msg << "time < " << PerfResults::MAX_TIME << " secs." << '\n';
86+
err_msg << "time < " << PerfResults::kMaxTime << " secs." << '\n';
8787
err_msg << "Original time in secs: " << time_secs << '\n';
8888
perf_res_str << std::fixed << std::setprecision(10) << -1.0;
8989
std::cout << relative_path << ":" << type_test_name << ":" << perf_res_str.str() << '\n';

0 commit comments

Comments
 (0)