Skip to content

Commit cab888c

Browse files
aobolenskaobolensk
committed
Refactor examples
1 parent d25e0b7 commit cab888c

File tree

14 files changed

+64
-81
lines changed

14 files changed

+64
-81
lines changed

‎README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@ Navigate to a source code folder.
106106
e.g.
107107
namespace nesterov_a_test_task_seq {
108108
109-
std::vector<int> getRandomVector(int sz);
110109
class TestTaskSequential : public ppc::core::Task {
111110
...
112111
};

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

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,21 @@
22

33
#include <boost/mpi/communicator.hpp>
44
#include <boost/mpi/environment.hpp>
5+
#include <random>
56
#include <vector>
67

78
#include "mpi/example/include/ops_mpi.hpp"
89

10+
static std::vector<int> GetRandomVector(int sz) {
11+
std::random_device dev;
12+
std::mt19937 gen(dev());
13+
std::vector<int> vec(sz);
14+
for (int i = 0; i < sz; i++) {
15+
vec[i] = gen() % 100 - 50;
16+
}
17+
return vec;
18+
}
19+
920
TEST(Parallel_Operations_MPI, Test_Sum) {
1021
boost::mpi::communicator world;
1122
std::vector<int> global_vec;
@@ -15,7 +26,7 @@ TEST(Parallel_Operations_MPI, Test_Sum) {
1526

1627
if (world.rank() == 0) {
1728
const int count_size_vector = 120;
18-
global_vec = nesterov_a_test_task_mpi::getRandomVector(count_size_vector);
29+
global_vec = GetRandomVector(count_size_vector);
1930
taskDataPar->inputs.emplace_back(reinterpret_cast<uint8_t*>(global_vec.data()));
2031
taskDataPar->inputs_count.emplace_back(global_vec.size());
2132
taskDataPar->outputs.emplace_back(reinterpret_cast<uint8_t*>(global_sum.data()));
@@ -59,7 +70,7 @@ TEST(Parallel_Operations_MPI, Test_Diff) {
5970

6071
if (world.rank() == 0) {
6172
const int count_size_vector = 240;
62-
global_vec = nesterov_a_test_task_mpi::getRandomVector(count_size_vector);
73+
global_vec = GetRandomVector(count_size_vector);
6374
taskDataPar->inputs.emplace_back(reinterpret_cast<uint8_t*>(global_vec.data()));
6475
taskDataPar->inputs_count.emplace_back(global_vec.size());
6576
taskDataPar->outputs.emplace_back(reinterpret_cast<uint8_t*>(global_diff.data()));
@@ -103,7 +114,7 @@ TEST(Parallel_Operations_MPI, Test_Diff_2) {
103114

104115
if (world.rank() == 0) {
105116
const int count_size_vector = 120;
106-
global_vec = nesterov_a_test_task_mpi::getRandomVector(count_size_vector);
117+
global_vec = GetRandomVector(count_size_vector);
107118
taskDataPar->inputs.emplace_back(reinterpret_cast<uint8_t*>(global_vec.data()));
108119
taskDataPar->inputs_count.emplace_back(global_vec.size());
109120
taskDataPar->outputs.emplace_back(reinterpret_cast<uint8_t*>(global_diff.data()));
@@ -147,7 +158,7 @@ TEST(Parallel_Operations_MPI, Test_Max) {
147158

148159
if (world.rank() == 0) {
149160
const int count_size_vector = 240;
150-
global_vec = nesterov_a_test_task_mpi::getRandomVector(count_size_vector);
161+
global_vec = GetRandomVector(count_size_vector);
151162
taskDataPar->inputs.emplace_back(reinterpret_cast<uint8_t*>(global_vec.data()));
152163
taskDataPar->inputs_count.emplace_back(global_vec.size());
153164
taskDataPar->outputs.emplace_back(reinterpret_cast<uint8_t*>(global_max.data()));
@@ -191,7 +202,7 @@ TEST(Parallel_Operations_MPI, Test_Max_2) {
191202

192203
if (world.rank() == 0) {
193204
const int count_size_vector = 120;
194-
global_vec = nesterov_a_test_task_mpi::getRandomVector(count_size_vector);
205+
global_vec = GetRandomVector(count_size_vector);
195206
taskDataPar->inputs.emplace_back(reinterpret_cast<uint8_t*>(global_vec.data()));
196207
taskDataPar->inputs_count.emplace_back(global_vec.size());
197208
taskDataPar->outputs.emplace_back(reinterpret_cast<uint8_t*>(global_max.data()));

‎tasks/mpi/example/include/ops_mpi.hpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@
1414

1515
namespace nesterov_a_test_task_mpi {
1616

17-
std::vector<int> getRandomVector(int sz);
18-
1917
class TestMPITaskSequential : public ppc::core::Task {
2018
public:
2119
explicit TestMPITaskSequential(ppc::core::TaskDataPtr taskData_, std::string ops_)

‎tasks/mpi/example/src/ops_mpi.cpp

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,6 @@
77
#include <thread>
88
#include <vector>
99

10-
using namespace std::chrono_literals;
11-
12-
std::vector<int> nesterov_a_test_task_mpi::getRandomVector(int sz) {
13-
std::random_device dev;
14-
std::mt19937 gen(dev());
15-
std::vector<int> vec(sz);
16-
for (int i = 0; i < sz; i++) {
17-
vec[i] = gen() % 100;
18-
}
19-
return vec;
20-
}
21-
2210
bool nesterov_a_test_task_mpi::TestMPITaskSequential::pre_processing_impl() {
2311
// Init vectors
2412
input_ = std::vector<int>(taskData->inputs_count[0]);

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

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,22 @@
11
#include <gtest/gtest.h>
22

3+
#include <random>
34
#include <vector>
45

56
#include "omp/example/include/ops_omp.hpp"
67

8+
static std::vector<int> GetRandomVector(int sz) {
9+
std::random_device dev;
10+
std::mt19937 gen(dev());
11+
std::vector<int> vec(sz);
12+
for (int i = 0; i < sz; i++) {
13+
vec[i] = gen() % 100 - 50;
14+
}
15+
return vec;
16+
}
17+
718
TEST(Parallel_Operations_OpenMP, Test_Sum) {
8-
std::vector<int> vec = nesterov_a_test_task_omp::getRandomVector(100);
19+
std::vector<int> vec = GetRandomVector(100);
920
// Create data
1021
std::vector<int> ref_res(1, 0);
1122

@@ -44,7 +55,7 @@ TEST(Parallel_Operations_OpenMP, Test_Sum) {
4455
}
4556

4657
TEST(Parallel_Operations_OpenMP, Test_Diff) {
47-
std::vector<int> vec = nesterov_a_test_task_omp::getRandomVector(100);
58+
std::vector<int> vec = GetRandomVector(100);
4859
// Create data
4960
std::vector<int> ref_res(1, 0);
5061

@@ -82,7 +93,7 @@ TEST(Parallel_Operations_OpenMP, Test_Diff) {
8293
}
8394

8495
TEST(Parallel_Operations_OpenMP, Test_Diff_2) {
85-
std::vector<int> vec = nesterov_a_test_task_omp::getRandomVector(10);
96+
std::vector<int> vec = GetRandomVector(10);
8697
// Create data
8798
std::vector<int> ref_res(1, 0);
8899

@@ -120,7 +131,7 @@ TEST(Parallel_Operations_OpenMP, Test_Diff_2) {
120131
}
121132

122133
TEST(Parallel_Operations_OpenMP, Test_Mult) {
123-
std::vector<int> vec = nesterov_a_test_task_omp::getRandomVector(10);
134+
std::vector<int> vec = GetRandomVector(10);
124135
// Create data
125136
std::vector<int> ref_res(1, 0);
126137

@@ -158,7 +169,7 @@ TEST(Parallel_Operations_OpenMP, Test_Mult) {
158169
}
159170

160171
TEST(Parallel_Operations_OpenMP, Test_Mult_2) {
161-
std::vector<int> vec = nesterov_a_test_task_omp::getRandomVector(5);
172+
std::vector<int> vec = GetRandomVector(5);
162173
// Create data
163174
std::vector<int> ref_res(1, 0);
164175

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77

88
namespace nesterov_a_test_task_omp {
99

10-
std::vector<int> getRandomVector(int sz);
11-
1210
class TestOMPTaskSequential : public ppc::core::Task {
1311
public:
1412
explicit TestOMPTaskSequential(ppc::core::TaskDataPtr taskData_, std::string ops_)

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

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,10 @@
44

55
#include <iostream>
66
#include <numeric>
7-
#include <random>
87
#include <string>
98
#include <thread>
109
#include <vector>
1110

12-
using namespace std::chrono_literals;
13-
14-
std::vector<int> nesterov_a_test_task_omp::getRandomVector(int sz) {
15-
std::random_device dev;
16-
std::mt19937 gen(dev());
17-
std::vector<int> vec(sz);
18-
for (int i = 0; i < sz; i++) {
19-
vec[i] = gen() % 100 + 1;
20-
}
21-
return vec;
22-
}
23-
2411
bool nesterov_a_test_task_omp::TestOMPTaskSequential::pre_processing_impl() {
2512
// Init vectors
2613
input_ = std::vector<int>(taskData->inputs_count[0]);

‎tasks/seq/example/src/ops_seq.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
#include <thread>
44

5-
using namespace std::chrono_literals;
6-
75
bool nesterov_a_test_task_seq::TestTaskSequential::pre_processing_impl() {
86
// Init value for input and output
97
input_ = reinterpret_cast<int*>(taskData->inputs[0])[0];

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

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,24 @@
11
#include <gtest/gtest.h>
22

3+
#include <random>
34
#include <thread>
45
#include <vector>
56

67
#include "stl/example/include/ops_stl.hpp"
78

9+
static std::vector<int> GetRandomVector(int sz) {
10+
std::random_device dev;
11+
std::mt19937 gen(dev());
12+
std::vector<int> vec(sz);
13+
for (int i = 0; i < sz; i++) {
14+
vec[i] = gen() % 100 - 50;
15+
}
16+
return vec;
17+
}
18+
819
TEST(Parallel_Operations_STL_Threads, Test_Sum) {
920
auto nthreads = std::thread::hardware_concurrency() * 10;
10-
std::vector<int> vec = nesterov_a_test_task_stl::getRandomVector(static_cast<int>(nthreads));
21+
std::vector<int> vec = GetRandomVector(static_cast<int>(nthreads));
1122
// Create data
1223
std::vector<int> ref_res(1, 0);
1324

@@ -46,7 +57,7 @@ TEST(Parallel_Operations_STL_Threads, Test_Sum) {
4657

4758
TEST(Parallel_Operations_STL_Threads, Test_Sum_2) {
4859
auto nthreads = std::thread::hardware_concurrency() * 11;
49-
std::vector<int> vec = nesterov_a_test_task_stl::getRandomVector(static_cast<int>(nthreads));
60+
std::vector<int> vec = GetRandomVector(static_cast<int>(nthreads));
5061
// Create data
5162
std::vector<int> ref_res(1, 0);
5263

@@ -85,7 +96,7 @@ TEST(Parallel_Operations_STL_Threads, Test_Sum_2) {
8596

8697
TEST(Parallel_Operations_STL_Threads, Test_Sum_3) {
8798
auto nthreads = std::thread::hardware_concurrency() * 13;
88-
std::vector<int> vec = nesterov_a_test_task_stl::getRandomVector(static_cast<int>(nthreads));
99+
std::vector<int> vec = GetRandomVector(static_cast<int>(nthreads));
89100
// Create data
90101
std::vector<int> ref_res(1, 0);
91102

@@ -124,7 +135,7 @@ TEST(Parallel_Operations_STL_Threads, Test_Sum_3) {
124135

125136
TEST(Parallel_Operations_STL_Threads, Test_Diff) {
126137
auto nthreads = std::thread::hardware_concurrency() * 14;
127-
std::vector<int> vec = nesterov_a_test_task_stl::getRandomVector(static_cast<int>(nthreads));
138+
std::vector<int> vec = GetRandomVector(static_cast<int>(nthreads));
128139
// Create data
129140
std::vector<int> ref_res(1, 0);
130141

@@ -163,7 +174,7 @@ TEST(Parallel_Operations_STL_Threads, Test_Diff) {
163174

164175
TEST(Parallel_Operations_STL_Threads, Test_Diff_2) {
165176
auto nthreads = std::thread::hardware_concurrency() * 15;
166-
std::vector<int> vec = nesterov_a_test_task_stl::getRandomVector(static_cast<int>(nthreads));
177+
std::vector<int> vec = GetRandomVector(static_cast<int>(nthreads));
167178
// Create data
168179
std::vector<int> ref_res(1, 0);
169180

‎tasks/stl/example/include/ops_stl.hpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88

99
namespace nesterov_a_test_task_stl {
1010

11-
std::vector<int> getRandomVector(int sz);
12-
1311
class TestSTLTaskSequential : public ppc::core::Task {
1412
public:
1513
explicit TestSTLTaskSequential(ppc::core::TaskDataPtr taskData_, std::string ops_)

0 commit comments

Comments
 (0)