Skip to content

Commit eea042e

Browse files
allnesallnes
committed
change tbb dir
1 parent a7ec897 commit eea042e

4 files changed

Lines changed: 20 additions & 62 deletions

File tree

‎tasks/tbb/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_tbb, 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_tbb = std::make_shared<ppc::core::TaskData>();
27-
task_data_tbb->inputs.emplace_back(reinterpret_cast<uint8_t *>(in.data()));
28-
task_data_tbb->inputs_count.emplace_back(in.size());
29-
task_data_tbb->outputs.emplace_back(reinterpret_cast<uint8_t *>(out.data()));
30-
task_data_tbb->outputs_count.emplace_back(out.size());
31-
3224
// Create Task
33-
nesterov_a_test_task_tbb::TestTaskTBB test_task_tbb(task_data_tbb);
25+
nesterov_a_test_task_tbb::TestTaskTBB test_task_tbb(in);
3426
ASSERT_EQ(test_task_tbb.Validation(), true);
3527
test_task_tbb.PreProcessing();
3628
test_task_tbb.Run();
3729
test_task_tbb.PostProcessing();
38-
EXPECT_EQ(in, out);
30+
EXPECT_EQ(in, test_task_tbb.Get());
3931
}
4032

4133
TEST(nesterov_a_test_task_tbb, test_matmul_100_from_file) {
@@ -50,24 +42,16 @@ TEST(nesterov_a_test_task_tbb, 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_tbb = std::make_shared<ppc::core::TaskData>();
61-
task_data_tbb->inputs.emplace_back(reinterpret_cast<uint8_t *>(in.data()));
62-
task_data_tbb->inputs_count.emplace_back(in.size());
63-
task_data_tbb->outputs.emplace_back(reinterpret_cast<uint8_t *>(out.data()));
64-
task_data_tbb->outputs_count.emplace_back(out.size());
65-
6650
// Create Task
67-
nesterov_a_test_task_tbb::TestTaskTBB test_task_tbb(task_data_tbb);
51+
nesterov_a_test_task_tbb::TestTaskTBB test_task_tbb(in);
6852
ASSERT_EQ(test_task_tbb.Validation(), true);
6953
test_task_tbb.PreProcessing();
7054
test_task_tbb.Run();
7155
test_task_tbb.PostProcessing();
72-
EXPECT_EQ(in, out);
56+
EXPECT_EQ(in, test_task_tbb.Get());
7357
}

‎tasks/tbb/example/include/ops_tbb.hpp‎

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

1010
class TestTaskTBB : public ppc::core::Task {
1111
public:
12-
explicit TestTaskTBB(ppc::core::TaskDataPtr task_data) : Task(std::move(task_data)) {}
13-
bool PreProcessingImpl() override;
12+
explicit TestTaskTBB(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/tbb/example/perf_tests/main.cpp‎

Lines changed: 4 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -15,25 +15,16 @@ TEST(nesterov_a_test_task_tbb, 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_tbb = std::make_shared<ppc::core::TaskData>();
26-
task_data_tbb->inputs.emplace_back(reinterpret_cast<uint8_t *>(in.data()));
27-
task_data_tbb->inputs_count.emplace_back(in.size());
28-
task_data_tbb->outputs.emplace_back(reinterpret_cast<uint8_t *>(out.data()));
29-
task_data_tbb->outputs_count.emplace_back(out.size());
30-
3123
// Create Task
32-
auto test_task_tbb = std::make_shared<nesterov_a_test_task_tbb::TestTaskTBB>(task_data_tbb);
24+
auto test_task_tbb = std::make_shared<nesterov_a_test_task_tbb::TestTaskTBB>(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,23 @@ TEST(nesterov_a_test_task_tbb, test_pipeline_run) {
4839
auto perf_analyzer = std::make_shared<ppc::core::Perf>(test_task_tbb);
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_tbb->Get());
5243
}
5344

5445
TEST(nesterov_a_test_task_tbb, test_task_run) {
5546
constexpr int kCount = 450;
5647

5748
// Create data
5849
std::vector<int> in(kCount * kCount, 0);
59-
std::vector<int> out(kCount * kCount, 0);
60-
6150
for (size_t i = 0; i < kCount; i++) {
6251
in[(i * kCount) + i] = 1;
6352
}
6453

65-
// Create task_data
66-
auto task_data_tbb = std::make_shared<ppc::core::TaskData>();
67-
task_data_tbb->inputs.emplace_back(reinterpret_cast<uint8_t *>(in.data()));
68-
task_data_tbb->inputs_count.emplace_back(in.size());
69-
task_data_tbb->outputs.emplace_back(reinterpret_cast<uint8_t *>(out.data()));
70-
task_data_tbb->outputs_count.emplace_back(out.size());
71-
7254
// Create Task
73-
auto test_task_tbb = std::make_shared<nesterov_a_test_task_tbb::TestTaskTBB>(task_data_tbb);
55+
auto test_task_tbb = std::make_shared<nesterov_a_test_task_tbb::TestTaskTBB>(in);
7456

7557
// Create Perf attributes
7658
auto perf_attr = std::make_shared<ppc::core::PerfAttr>();
77-
perf_attr->num_running = 10;
7859
const auto t0 = std::chrono::high_resolution_clock::now();
7960
perf_attr->current_timer = [&] {
8061
auto current_time_point = std::chrono::high_resolution_clock::now();
@@ -89,5 +70,5 @@ TEST(nesterov_a_test_task_tbb, test_task_run) {
8970
auto perf_analyzer = std::make_shared<ppc::core::Perf>(test_task_tbb);
9071
perf_analyzer->TaskRun(perf_attr, perf_results);
9172
ppc::core::Perf::PrintPerfStatistic(perf_results);
92-
ASSERT_EQ(in, out);
73+
ASSERT_EQ(in, test_task_tbb->Get());
9374
}

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

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -23,22 +23,15 @@ void MatMul(const std::vector<int> &in_vec, int rc_size, std::vector<int> &out_v
2323
}
2424
} // namespace
2525

26-
bool nesterov_a_test_task_tbb::TestTaskTBB::PreProcessingImpl() {
27-
// Init value for input and output
28-
unsigned int input_size = task_data->inputs_count[0];
29-
auto *in_ptr = reinterpret_cast<int *>(task_data->inputs[0]);
30-
input_ = std::vector<int>(in_ptr, in_ptr + input_size);
31-
32-
unsigned int output_size = task_data->outputs_count[0];
33-
output_ = std::vector<int>(output_size, 0);
34-
35-
rc_size_ = static_cast<int>(std::sqrt(input_size));
36-
return true;
26+
bool nesterov_a_test_task_tbb::TestTaskTBB::ValidationImpl() {
27+
auto sqrt_size = static_cast<int>(std::sqrt(input_.size()));
28+
return sqrt_size * sqrt_size == static_cast<int>(input_.size());
3729
}
3830

39-
bool nesterov_a_test_task_tbb::TestTaskTBB::ValidationImpl() {
40-
// Check equality of counts elements
41-
return task_data->inputs_count[0] == task_data->outputs_count[0];
31+
bool nesterov_a_test_task_tbb::TestTaskTBB::PreProcessingImpl() {
32+
rc_size_ = static_cast<int>(std::sqrt(input_.size()));
33+
output_ = std::vector<int>(input_.size(), 0);
34+
return true;
4235
}
4336

4437
bool nesterov_a_test_task_tbb::TestTaskTBB::RunImpl() {
@@ -54,8 +47,5 @@ bool nesterov_a_test_task_tbb::TestTaskTBB::RunImpl() {
5447
}
5548

5649
bool nesterov_a_test_task_tbb::TestTaskTBB::PostProcessingImpl() {
57-
for (size_t i = 0; i < output_.size(); i++) {
58-
reinterpret_cast<int *>(task_data->outputs[0])[i] = output_[i];
59-
}
6050
return true;
6151
}

0 commit comments

Comments
 (0)