Skip to content

Commit 8552406

Browse files
allnesallnes
committed
change omp dir
1 parent 1666311 commit 8552406

4 files changed

Lines changed: 20 additions & 61 deletions

File tree

‎tasks/omp/example/func_tests/main.cpp‎

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -16,26 +16,18 @@ TEST(nesterov_a_test_task_omp, test_matmul_50) {
1616

1717
// Create data
1818
std::vector<int> in(kCount * kCount, 0);
19-
std::vector<int> out(kCount * kCount, 0);
2019

2120
for (size_t i = 0; i < kCount; i++) {
2221
in[(i * kCount) + i] = 1;
2322
}
2423

25-
// Create task_data
26-
auto task_data_omp = std::make_shared<ppc::core::TaskData>();
27-
task_data_omp->inputs.emplace_back(reinterpret_cast<uint8_t *>(in.data()));
28-
task_data_omp->inputs_count.emplace_back(in.size());
29-
task_data_omp->outputs.emplace_back(reinterpret_cast<uint8_t *>(out.data()));
30-
task_data_omp->outputs_count.emplace_back(out.size());
31-
3224
// Create Task
33-
nesterov_a_test_task_omp::TestTaskOpenMP test_task_omp(task_data_omp);
25+
nesterov_a_test_task_omp::TestTaskOpenMP test_task_omp(in);
3426
ASSERT_EQ(test_task_omp.Validation(), true);
3527
test_task_omp.PreProcessing();
3628
test_task_omp.Run();
3729
test_task_omp.PostProcessing();
38-
EXPECT_EQ(in, out);
30+
EXPECT_EQ(in, test_task_omp.Get());
3931
}
4032

4133
TEST(nesterov_a_test_task_omp, test_matmul_100_from_file) {
@@ -50,24 +42,16 @@ TEST(nesterov_a_test_task_omp, test_matmul_100_from_file) {
5042

5143
// Create data
5244
std::vector<int> in(count * count, 0);
53-
std::vector<int> out(count * count, 0);
5445

5546
for (size_t i = 0; i < count; i++) {
5647
in[(i * count) + i] = 1;
5748
}
5849

59-
// Create task_data
60-
auto task_data_omp = std::make_shared<ppc::core::TaskData>();
61-
task_data_omp->inputs.emplace_back(reinterpret_cast<uint8_t *>(in.data()));
62-
task_data_omp->inputs_count.emplace_back(in.size());
63-
task_data_omp->outputs.emplace_back(reinterpret_cast<uint8_t *>(out.data()));
64-
task_data_omp->outputs_count.emplace_back(out.size());
65-
6650
// Create Task
67-
nesterov_a_test_task_omp::TestTaskOpenMP test_task_omp(task_data_omp);
51+
nesterov_a_test_task_omp::TestTaskOpenMP test_task_omp(in);
6852
ASSERT_EQ(test_task_omp.Validation(), true);
6953
test_task_omp.PreProcessing();
7054
test_task_omp.Run();
7155
test_task_omp.PostProcessing();
72-
EXPECT_EQ(in, out);
56+
EXPECT_EQ(in, test_task_omp.Get());
7357
}

‎tasks/omp/example/include/ops_omp.hpp‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,14 @@ namespace nesterov_a_test_task_omp {
99

1010
class TestTaskOpenMP : public ppc::core::Task {
1111
public:
12-
explicit TestTaskOpenMP(ppc::core::TaskDataPtr task_data) : Task(std::move(task_data)) {}
13-
bool PreProcessingImpl() override;
12+
explicit TestTaskOpenMP(const std::vector<int>& in) : input_(in) {}
1413
bool ValidationImpl() override;
14+
bool PreProcessingImpl() override;
1515
bool RunImpl() override;
1616
bool PostProcessingImpl() override;
17+
std::vector<int> Get() {
18+
return output_;
19+
}
1720

1821
private:
1922
std::vector<int> input_, output_;

‎tasks/omp/example/perf_tests/main.cpp‎

Lines changed: 4 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -15,25 +15,16 @@ TEST(nesterov_a_test_task_omp, test_pipeline_run) {
1515

1616
// Create data
1717
std::vector<int> in(kCount * kCount, 0);
18-
std::vector<int> out(kCount * kCount, 0);
1918

2019
for (size_t i = 0; i < kCount; i++) {
2120
in[(i * kCount) + i] = 1;
2221
}
2322

24-
// Create task_data
25-
auto task_data_omp = std::make_shared<ppc::core::TaskData>();
26-
task_data_omp->inputs.emplace_back(reinterpret_cast<uint8_t *>(in.data()));
27-
task_data_omp->inputs_count.emplace_back(in.size());
28-
task_data_omp->outputs.emplace_back(reinterpret_cast<uint8_t *>(out.data()));
29-
task_data_omp->outputs_count.emplace_back(out.size());
30-
3123
// Create Task
32-
auto test_task_omp = std::make_shared<nesterov_a_test_task_omp::TestTaskOpenMP>(task_data_omp);
24+
auto test_task_omp = std::make_shared<nesterov_a_test_task_omp::TestTaskOpenMP>(in);
3325

3426
// Create Perf attributes
3527
auto perf_attr = std::make_shared<ppc::core::PerfAttr>();
36-
perf_attr->num_running = 10;
3728
const auto t0 = std::chrono::high_resolution_clock::now();
3829
perf_attr->current_timer = [&] {
3930
auto current_time_point = std::chrono::high_resolution_clock::now();
@@ -48,33 +39,24 @@ TEST(nesterov_a_test_task_omp, test_pipeline_run) {
4839
auto perf_analyzer = std::make_shared<ppc::core::Perf>(test_task_omp);
4940
perf_analyzer->PipelineRun(perf_attr, perf_results);
5041
ppc::core::Perf::PrintPerfStatistic(perf_results);
51-
ASSERT_EQ(in, out);
42+
ASSERT_EQ(in, test_task_omp->Get());
5243
}
5344

5445
TEST(nesterov_a_test_task_omp, test_task_run) {
5546
constexpr int kCount = 300;
5647

5748
// Create data
5849
std::vector<int> in(kCount * kCount, 0);
59-
std::vector<int> out(kCount * kCount, 0);
6050

6151
for (size_t i = 0; i < kCount; i++) {
6252
in[(i * kCount) + i] = 1;
6353
}
6454

65-
// Create task_data
66-
auto task_data_omp = std::make_shared<ppc::core::TaskData>();
67-
task_data_omp->inputs.emplace_back(reinterpret_cast<uint8_t *>(in.data()));
68-
task_data_omp->inputs_count.emplace_back(in.size());
69-
task_data_omp->outputs.emplace_back(reinterpret_cast<uint8_t *>(out.data()));
70-
task_data_omp->outputs_count.emplace_back(out.size());
71-
7255
// Create Task
73-
auto test_task_omp = std::make_shared<nesterov_a_test_task_omp::TestTaskOpenMP>(task_data_omp);
56+
auto test_task_omp = std::make_shared<nesterov_a_test_task_omp::TestTaskOpenMP>(in);
7457

7558
// Create Perf attributes
7659
auto perf_attr = std::make_shared<ppc::core::PerfAttr>();
77-
perf_attr->num_running = 10;
7860
const auto t0 = std::chrono::high_resolution_clock::now();
7961
perf_attr->current_timer = [&] {
8062
auto current_time_point = std::chrono::high_resolution_clock::now();
@@ -89,5 +71,5 @@ TEST(nesterov_a_test_task_omp, test_task_run) {
8971
auto perf_analyzer = std::make_shared<ppc::core::Perf>(test_task_omp);
9072
perf_analyzer->TaskRun(perf_attr, perf_results);
9173
ppc::core::Perf::PrintPerfStatistic(perf_results);
92-
ASSERT_EQ(in, out);
74+
ASSERT_EQ(in, test_task_omp->Get());
9375
}

‎tasks/omp/example/src/ops_omp.cpp‎

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,15 @@
44
#include <cstddef>
55
#include <vector>
66

7-
bool nesterov_a_test_task_omp::TestTaskOpenMP::PreProcessingImpl() {
8-
// Init value for input and output
9-
unsigned int input_size = task_data->inputs_count[0];
10-
auto *in_ptr = reinterpret_cast<int *>(task_data->inputs[0]);
11-
input_ = std::vector<int>(in_ptr, in_ptr + input_size);
12-
13-
unsigned int output_size = task_data->outputs_count[0];
14-
output_ = std::vector<int>(output_size, 0);
15-
16-
rc_size_ = static_cast<int>(std::sqrt(input_size));
17-
return true;
7+
bool nesterov_a_test_task_omp::TestTaskOpenMP::ValidationImpl() {
8+
auto sqrt_size = static_cast<int>(std::sqrt(input_.size()));
9+
return sqrt_size * sqrt_size == static_cast<int>(input_.size());
1810
}
1911

20-
bool nesterov_a_test_task_omp::TestTaskOpenMP::ValidationImpl() {
21-
// Check equality of counts elements
22-
return task_data->inputs_count[0] == task_data->outputs_count[0];
12+
bool nesterov_a_test_task_omp::TestTaskOpenMP::PreProcessingImpl() {
13+
rc_size_ = static_cast<int>(std::sqrt(input_.size()));
14+
output_ = std::vector<int>(input_.size(), 0);
15+
return true;
2316
}
2417

2518
bool nesterov_a_test_task_omp::TestTaskOpenMP::RunImpl() {
@@ -42,8 +35,5 @@ bool nesterov_a_test_task_omp::TestTaskOpenMP::RunImpl() {
4235
}
4336

4437
bool nesterov_a_test_task_omp::TestTaskOpenMP::PostProcessingImpl() {
45-
for (size_t i = 0; i < output_.size(); i++) {
46-
reinterpret_cast<int *>(task_data->outputs[0])[i] = output_[i];
47-
}
4838
return true;
4939
}

0 commit comments

Comments
 (0)