Skip to content

Commit da3b37f

Browse files
allnesallnes
committed
change all dir
1 parent bbedfed commit da3b37f

8 files changed

Lines changed: 18 additions & 60 deletions

File tree

‎modules/core/perf/func_tests/perf_tests.cpp‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,6 @@ TEST(perf_tests, check_perf_pipeline_uint8_t_slow_test) {
8282

8383
// Get perf statistic
8484
ASSERT_ANY_THROW(ppc::core::Perf::PrintPerfStatistic(perf_results));
85-
ASSERT_GE(perf_results->time_sec, ppc::core::PerfResults::kMaxTime);
86-
EXPECT_EQ(test_task->Get(), in.size());
8785
}
8886

8987
TEST(perf_tests, check_perf_task) {

‎modules/core/perf/func_tests/test_task.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ namespace ppc::test::perf {
1212
template <class T>
1313
class TestTask : public ppc::core::Task {
1414
public:
15-
explicit TestTask(const std::vector<T>& in) : ppc::core::Task(StateOfTesting::kFunc), input_(in) {}
15+
explicit TestTask(const std::vector<T>& in) : input_(in) {}
1616

1717
bool ValidationImpl() override {
1818
return !input_.empty();

‎modules/core/task/func_tests/test_task.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ namespace ppc::test::task {
1111
template <class T>
1212
class TestTask : public ppc::core::Task {
1313
public:
14-
explicit TestTask(const std::vector<T>& in) : ppc::core::Task(StateOfTesting::kFunc), input_(in) {}
14+
explicit TestTask(const std::vector<T>& in) : input_(in) {}
1515

1616
bool ValidationImpl() override {
1717
return !input_.empty();

‎modules/core/task/include/task.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class Task {
1414
public:
1515
enum StateOfTesting : uint8_t { kFunc, kPerf };
1616

17-
explicit Task(StateOfTesting state_of_testing);
17+
explicit Task(StateOfTesting state_of_testing = StateOfTesting::kFunc);
1818

1919
// validation of data and validation of task attributes before running
2020
virtual bool Validation() final;

‎tasks/all/example/func_tests/func_all.cpp‎

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -16,26 +16,18 @@ TEST(nesterov_a_test_task_all, 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_all = std::make_shared<ppc::core::TaskData>();
27-
task_data_all->inputs.emplace_back(reinterpret_cast<uint8_t *>(in.data()));
28-
task_data_all->inputs_count.emplace_back(in.size());
29-
task_data_all->outputs.emplace_back(reinterpret_cast<uint8_t *>(out.data()));
30-
task_data_all->outputs_count.emplace_back(out.size());
31-
3224
// Create Task
33-
nesterov_a_test_task_all::TestTaskALL test_task_all(task_data_all);
25+
nesterov_a_test_task_all::TestTaskALL test_task_all(in);
3426
ASSERT_EQ(test_task_all.Validation(), true);
3527
test_task_all.PreProcessing();
3628
test_task_all.Run();
3729
test_task_all.PostProcessing();
38-
EXPECT_EQ(in, out);
30+
EXPECT_EQ(in, test_task_all.Get());
3931
}
4032

4133
TEST(nesterov_a_test_task_all, test_matmul_from_pic) {
@@ -53,24 +45,16 @@ TEST(nesterov_a_test_task_all, test_matmul_from_pic) {
5345

5446
// Create data
5547
std::vector<int> in(count * count, 0);
56-
std::vector<int> out(count * count, 0);
5748

5849
for (int i = 0; i < count; i++) {
5950
in[(i * count) + i] = 1;
6051
}
6152

62-
// Create task_data
63-
auto task_data_all = std::make_shared<ppc::core::TaskData>();
64-
task_data_all->inputs.emplace_back(reinterpret_cast<uint8_t *>(in.data()));
65-
task_data_all->inputs_count.emplace_back(in.size());
66-
task_data_all->outputs.emplace_back(reinterpret_cast<uint8_t *>(out.data()));
67-
task_data_all->outputs_count.emplace_back(out.size());
68-
6953
// Create Task
70-
nesterov_a_test_task_all::TestTaskALL test_task_all(task_data_all);
54+
nesterov_a_test_task_all::TestTaskALL test_task_all(in);
7155
ASSERT_EQ(test_task_all.Validation(), true);
7256
test_task_all.PreProcessing();
7357
test_task_all.Run();
7458
test_task_all.PostProcessing();
75-
EXPECT_EQ(in, out);
59+
EXPECT_EQ(in, test_task_all.Get());
7660
}

‎tasks/all/example/include/ops_all.hpp‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,14 @@ namespace nesterov_a_test_task_all {
99

1010
class TestTaskALL : public ppc::core::Task {
1111
public:
12-
explicit TestTaskALL(ppc::core::TaskDataPtr task_data) : Task(std::move(task_data)) {}
12+
explicit TestTaskALL(const std::vector<int>& in) : input_(in) {}
1313
bool PreProcessingImpl() override;
1414
bool ValidationImpl() 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/all/example/perf_tests/perf_all.cpp‎

Lines changed: 4 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -16,25 +16,16 @@ TEST(nesterov_a_test_task_all, test_pipeline_run) {
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_all = std::make_shared<ppc::core::TaskData>();
27-
task_data_all->inputs.emplace_back(reinterpret_cast<uint8_t *>(in.data()));
28-
task_data_all->inputs_count.emplace_back(in.size());
29-
task_data_all->outputs.emplace_back(reinterpret_cast<uint8_t *>(out.data()));
30-
task_data_all->outputs_count.emplace_back(out.size());
31-
3224
// Create Task
33-
auto test_task_all = std::make_shared<nesterov_a_test_task_all::TestTaskALL>(task_data_all);
25+
auto test_task_all = std::make_shared<nesterov_a_test_task_all::TestTaskALL>(in);
3426

3527
// Create Perf attributes
3628
auto perf_attr = std::make_shared<ppc::core::PerfAttr>();
37-
perf_attr->num_running = 10;
3829
const auto t0 = std::chrono::high_resolution_clock::now();
3930
perf_attr->current_timer = [&] {
4031
auto current_time_point = std::chrono::high_resolution_clock::now();
@@ -54,33 +45,24 @@ TEST(nesterov_a_test_task_all, test_pipeline_run) {
5445
ppc::core::Perf::PrintPerfStatistic(perf_results);
5546
}
5647

57-
ASSERT_EQ(in, out);
48+
ASSERT_EQ(in, test_task_all->Get());
5849
}
5950

6051
TEST(nesterov_a_test_task_all, test_task_run) {
6152
constexpr int kCount = 400;
6253

6354
// Create data
6455
std::vector<int> in(kCount * kCount, 0);
65-
std::vector<int> out(kCount * kCount, 0);
6656

6757
for (size_t i = 0; i < kCount; i++) {
6858
in[(i * kCount) + i] = 1;
6959
}
7060

71-
// Create task_data
72-
auto task_data_all = std::make_shared<ppc::core::TaskData>();
73-
task_data_all->inputs.emplace_back(reinterpret_cast<uint8_t *>(in.data()));
74-
task_data_all->inputs_count.emplace_back(in.size());
75-
task_data_all->outputs.emplace_back(reinterpret_cast<uint8_t *>(out.data()));
76-
task_data_all->outputs_count.emplace_back(out.size());
77-
7861
// Create Task
79-
auto test_task_all = std::make_shared<nesterov_a_test_task_all::TestTaskALL>(task_data_all);
62+
auto test_task_all = std::make_shared<nesterov_a_test_task_all::TestTaskALL>(in);
8063

8164
// Create Perf attributes
8265
auto perf_attr = std::make_shared<ppc::core::PerfAttr>();
83-
perf_attr->num_running = 10;
8466
const auto t0 = std::chrono::high_resolution_clock::now();
8567
perf_attr->current_timer = [&] {
8668
auto current_time_point = std::chrono::high_resolution_clock::now();
@@ -101,5 +83,5 @@ TEST(nesterov_a_test_task_all, test_task_run) {
10183
ppc::core::Perf::PrintPerfStatistic(perf_results);
10284
}
10385

104-
ASSERT_EQ(in, out);
86+
ASSERT_EQ(in, test_task_all->Get());
10587
}

‎tasks/all/example/src/ops_all.cpp‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,20 +27,14 @@ void MatMul(const std::vector<int> &in_vec, int rc_size, std::vector<int> &out_v
2727

2828
bool nesterov_a_test_task_all::TestTaskALL::PreProcessingImpl() {
2929
// Init value for input and output
30-
unsigned int input_size = task_data->inputs_count[0];
31-
auto *in_ptr = reinterpret_cast<int *>(task_data->inputs[0]);
32-
input_ = std::vector<int>(in_ptr, in_ptr + input_size);
33-
34-
unsigned int output_size = task_data->outputs_count[0];
35-
output_ = std::vector<int>(output_size, 0);
36-
37-
rc_size_ = static_cast<int>(std::sqrt(input_size));
30+
rc_size_ = static_cast<int>(std::sqrt(input_.size()));
31+
output_ = std::vector<int>(rc_size_, 0);
3832
return true;
3933
}
4034

4135
bool nesterov_a_test_task_all::TestTaskALL::ValidationImpl() {
4236
// Check equality of counts elements
43-
return task_data->inputs_count[0] == task_data->outputs_count[0];
37+
return input_.size() == output_.size();
4438
}
4539

4640
bool nesterov_a_test_task_all::TestTaskALL::RunImpl() {
@@ -75,8 +69,5 @@ bool nesterov_a_test_task_all::TestTaskALL::RunImpl() {
7569
}
7670

7771
bool nesterov_a_test_task_all::TestTaskALL::PostProcessingImpl() {
78-
for (size_t i = 0; i < output_.size(); i++) {
79-
reinterpret_cast<int *>(task_data->outputs[0])[i] = output_[i];
80-
}
8172
return true;
8273
}

0 commit comments

Comments
 (0)