Skip to content

Commit 4cbd044

Browse files
aobolenskallnes
aobolensk
and
allnes
authored
Refactor examples (#153)
Co-authored-by: Nesterov Alexander <[email protected]>
1 parent fa242d1 commit 4cbd044

File tree

14 files changed

+72
-81
lines changed

14 files changed

+72
-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: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,23 @@
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+
namespace {
11+
std::vector<int> GetRandomVector(int sz) {
12+
std::random_device dev;
13+
std::mt19937 gen(dev());
14+
std::vector<int> vec(sz);
15+
for (int i = 0; i < sz; i++) {
16+
vec[i] = gen() % 100 - 50;
17+
}
18+
return vec;
19+
}
20+
} // namespace
21+
922
TEST(Parallel_Operations_MPI, Test_Sum) {
1023
boost::mpi::communicator world;
1124
std::vector<int> global_vec;
@@ -15,7 +28,7 @@ TEST(Parallel_Operations_MPI, Test_Sum) {
1528

1629
if (world.rank() == 0) {
1730
const int count_size_vector = 120;
18-
global_vec = nesterov_a_test_task_mpi::getRandomVector(count_size_vector);
31+
global_vec = GetRandomVector(count_size_vector);
1932
taskDataPar->inputs.emplace_back(reinterpret_cast<uint8_t*>(global_vec.data()));
2033
taskDataPar->inputs_count.emplace_back(global_vec.size());
2134
taskDataPar->outputs.emplace_back(reinterpret_cast<uint8_t*>(global_sum.data()));
@@ -59,7 +72,7 @@ TEST(Parallel_Operations_MPI, Test_Diff) {
5972

6073
if (world.rank() == 0) {
6174
const int count_size_vector = 240;
62-
global_vec = nesterov_a_test_task_mpi::getRandomVector(count_size_vector);
75+
global_vec = GetRandomVector(count_size_vector);
6376
taskDataPar->inputs.emplace_back(reinterpret_cast<uint8_t*>(global_vec.data()));
6477
taskDataPar->inputs_count.emplace_back(global_vec.size());
6578
taskDataPar->outputs.emplace_back(reinterpret_cast<uint8_t*>(global_diff.data()));
@@ -103,7 +116,7 @@ TEST(Parallel_Operations_MPI, Test_Diff_2) {
103116

104117
if (world.rank() == 0) {
105118
const int count_size_vector = 120;
106-
global_vec = nesterov_a_test_task_mpi::getRandomVector(count_size_vector);
119+
global_vec = GetRandomVector(count_size_vector);
107120
taskDataPar->inputs.emplace_back(reinterpret_cast<uint8_t*>(global_vec.data()));
108121
taskDataPar->inputs_count.emplace_back(global_vec.size());
109122
taskDataPar->outputs.emplace_back(reinterpret_cast<uint8_t*>(global_diff.data()));
@@ -147,7 +160,7 @@ TEST(Parallel_Operations_MPI, Test_Max) {
147160

148161
if (world.rank() == 0) {
149162
const int count_size_vector = 240;
150-
global_vec = nesterov_a_test_task_mpi::getRandomVector(count_size_vector);
163+
global_vec = GetRandomVector(count_size_vector);
151164
taskDataPar->inputs.emplace_back(reinterpret_cast<uint8_t*>(global_vec.data()));
152165
taskDataPar->inputs_count.emplace_back(global_vec.size());
153166
taskDataPar->outputs.emplace_back(reinterpret_cast<uint8_t*>(global_max.data()));
@@ -191,7 +204,7 @@ TEST(Parallel_Operations_MPI, Test_Max_2) {
191204

192205
if (world.rank() == 0) {
193206
const int count_size_vector = 120;
194-
global_vec = nesterov_a_test_task_mpi::getRandomVector(count_size_vector);
207+
global_vec = GetRandomVector(count_size_vector);
195208
taskDataPar->inputs.emplace_back(reinterpret_cast<uint8_t*>(global_vec.data()));
196209
taskDataPar->inputs_count.emplace_back(global_vec.size());
197210
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: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,24 @@
11
#include <gtest/gtest.h>
22

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

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

8+
namespace {
9+
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+
} // namespace
19+
720
TEST(Parallel_Operations_OpenMP, Test_Sum) {
8-
std::vector<int> vec = nesterov_a_test_task_omp::getRandomVector(100);
21+
std::vector<int> vec = GetRandomVector(100);
922
// Create data
1023
std::vector<int> ref_res(1, 0);
1124

@@ -44,7 +57,7 @@ TEST(Parallel_Operations_OpenMP, Test_Sum) {
4457
}
4558

4659
TEST(Parallel_Operations_OpenMP, Test_Diff) {
47-
std::vector<int> vec = nesterov_a_test_task_omp::getRandomVector(100);
60+
std::vector<int> vec = GetRandomVector(100);
4861
// Create data
4962
std::vector<int> ref_res(1, 0);
5063

@@ -82,7 +95,7 @@ TEST(Parallel_Operations_OpenMP, Test_Diff) {
8295
}
8396

8497
TEST(Parallel_Operations_OpenMP, Test_Diff_2) {
85-
std::vector<int> vec = nesterov_a_test_task_omp::getRandomVector(10);
98+
std::vector<int> vec = GetRandomVector(10);
8699
// Create data
87100
std::vector<int> ref_res(1, 0);
88101

@@ -120,7 +133,7 @@ TEST(Parallel_Operations_OpenMP, Test_Diff_2) {
120133
}
121134

122135
TEST(Parallel_Operations_OpenMP, Test_Mult) {
123-
std::vector<int> vec = nesterov_a_test_task_omp::getRandomVector(10);
136+
std::vector<int> vec = GetRandomVector(10);
124137
// Create data
125138
std::vector<int> ref_res(1, 0);
126139

@@ -158,7 +171,7 @@ TEST(Parallel_Operations_OpenMP, Test_Mult) {
158171
}
159172

160173
TEST(Parallel_Operations_OpenMP, Test_Mult_2) {
161-
std::vector<int> vec = nesterov_a_test_task_omp::getRandomVector(5);
174+
std::vector<int> vec = GetRandomVector(5);
162175
// Create data
163176
std::vector<int> ref_res(1, 0);
164177

‎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: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,26 @@
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+
namespace {
10+
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+
} // namespace
20+
821
TEST(Parallel_Operations_STL_Threads, Test_Sum) {
922
auto nthreads = std::thread::hardware_concurrency() * 10;
10-
std::vector<int> vec = nesterov_a_test_task_stl::getRandomVector(static_cast<int>(nthreads));
23+
std::vector<int> vec = GetRandomVector(static_cast<int>(nthreads));
1124
// Create data
1225
std::vector<int> ref_res(1, 0);
1326

@@ -46,7 +59,7 @@ TEST(Parallel_Operations_STL_Threads, Test_Sum) {
4659

4760
TEST(Parallel_Operations_STL_Threads, Test_Sum_2) {
4861
auto nthreads = std::thread::hardware_concurrency() * 11;
49-
std::vector<int> vec = nesterov_a_test_task_stl::getRandomVector(static_cast<int>(nthreads));
62+
std::vector<int> vec = GetRandomVector(static_cast<int>(nthreads));
5063
// Create data
5164
std::vector<int> ref_res(1, 0);
5265

@@ -85,7 +98,7 @@ TEST(Parallel_Operations_STL_Threads, Test_Sum_2) {
8598

8699
TEST(Parallel_Operations_STL_Threads, Test_Sum_3) {
87100
auto nthreads = std::thread::hardware_concurrency() * 13;
88-
std::vector<int> vec = nesterov_a_test_task_stl::getRandomVector(static_cast<int>(nthreads));
101+
std::vector<int> vec = GetRandomVector(static_cast<int>(nthreads));
89102
// Create data
90103
std::vector<int> ref_res(1, 0);
91104

@@ -124,7 +137,7 @@ TEST(Parallel_Operations_STL_Threads, Test_Sum_3) {
124137

125138
TEST(Parallel_Operations_STL_Threads, Test_Diff) {
126139
auto nthreads = std::thread::hardware_concurrency() * 14;
127-
std::vector<int> vec = nesterov_a_test_task_stl::getRandomVector(static_cast<int>(nthreads));
140+
std::vector<int> vec = GetRandomVector(static_cast<int>(nthreads));
128141
// Create data
129142
std::vector<int> ref_res(1, 0);
130143

@@ -163,7 +176,7 @@ TEST(Parallel_Operations_STL_Threads, Test_Diff) {
163176

164177
TEST(Parallel_Operations_STL_Threads, Test_Diff_2) {
165178
auto nthreads = std::thread::hardware_concurrency() * 15;
166-
std::vector<int> vec = nesterov_a_test_task_stl::getRandomVector(static_cast<int>(nthreads));
179+
std::vector<int> vec = GetRandomVector(static_cast<int>(nthreads));
167180
// Create data
168181
std::vector<int> ref_res(1, 0);
169182

‎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_)

‎tasks/stl/example/src/ops_stl.cpp

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,11 @@
33
#include <future>
44
#include <iostream>
55
#include <numeric>
6-
#include <random>
76
#include <string>
87
#include <thread>
98
#include <utility>
109
#include <vector>
1110

12-
using namespace std::chrono_literals;
13-
14-
std::vector<int> nesterov_a_test_task_stl::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] = static_cast<int>(gen()) % 100;
20-
}
21-
return vec;
22-
}
23-
2411
bool nesterov_a_test_task_stl::TestSTLTaskSequential::pre_processing_impl() {
2512
// Init vectors
2613
input_ = std::vector<int>(taskData->inputs_count[0]);

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

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

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

56
#include "tbb/example/include/ops_tbb.hpp"
67

8+
namespace {
9+
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+
} // namespace
19+
720
TEST(Parallel_Operations_TBB, Test_Sum) {
8-
std::vector<int> vec = nesterov_a_test_task_tbb::getRandomVector(100);
21+
std::vector<int> vec = GetRandomVector(100);
922
// Create data
1023
std::vector<int> ref_res(1, 0);
1124

@@ -43,7 +56,7 @@ TEST(Parallel_Operations_TBB, Test_Sum) {
4356
}
4457

4558
TEST(Parallel_Operations_TBB, Test_Diff) {
46-
std::vector<int> vec = nesterov_a_test_task_tbb::getRandomVector(100);
59+
std::vector<int> vec = GetRandomVector(100);
4760
// Create data
4861
std::vector<int> ref_res(1, 0);
4962

@@ -81,7 +94,7 @@ TEST(Parallel_Operations_TBB, Test_Diff) {
8194
}
8295

8396
TEST(Parallel_Operations_TBB, Test_Diff_2) {
84-
std::vector<int> vec = nesterov_a_test_task_tbb::getRandomVector(50);
97+
std::vector<int> vec = GetRandomVector(50);
8598
// Create data
8699
std::vector<int> ref_res(1, 0);
87100

@@ -119,7 +132,7 @@ TEST(Parallel_Operations_TBB, Test_Diff_2) {
119132
}
120133

121134
TEST(Parallel_Operations_TBB, Test_Mult) {
122-
std::vector<int> vec = nesterov_a_test_task_tbb::getRandomVector(10);
135+
std::vector<int> vec = GetRandomVector(10);
123136
// Create data
124137
std::vector<int> ref_res(1, 0);
125138

@@ -157,7 +170,7 @@ TEST(Parallel_Operations_TBB, Test_Mult) {
157170
}
158171

159172
TEST(Parallel_Operations_TBB, Test_Mult_2) {
160-
std::vector<int> vec = nesterov_a_test_task_tbb::getRandomVector(5);
173+
std::vector<int> vec = GetRandomVector(5);
161174
// Create data
162175
std::vector<int> ref_res(1, 0);
163176

‎tasks/tbb/example/include/ops_tbb.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_tbb {
1010

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

‎tasks/tbb/example/src/ops_tbb.cpp

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

12-
using namespace std::chrono_literals;
13-
14-
std::vector<int> nesterov_a_test_task_tbb::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() % 20 + 1;
20-
}
21-
return vec;
22-
}
23-
2412
bool nesterov_a_test_task_tbb::TestTBBTaskSequential::pre_processing_impl() {
2513
// Init vectors
2614
input_ = std::vector<int>(taskData->inputs_count[0]);

0 commit comments

Comments
 (0)