Merge branch 'learning-process:master' into master

vadimbelan · Jun 11, 2024 · 4d4d8a9 · 4d4d8a9
2 parents ba1ebbe + 87e2108
commit 4d4d8a9
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 12 deletions.
diff --git a/tasks/omp/derun_a_shell/perf_tests/main.cpp b/tasks/omp/derun_a_shell/perf_tests/main.cpp
@@ -7,7 +7,7 @@
 #include "omp/derun_a_shell/include/shell_omp.hpp"
 
 TEST(derun_andrey_shell_omp, pipeline_run) {
-  const int count = 10000;
+  const int count = 2000000;
 
   // Create data
   std::vector<int> in = ShellOMP::generate_random_vector(count, 1, 100);
@@ -44,10 +44,10 @@ TEST(derun_andrey_shell_omp, pipeline_run) {
 }
 
 TEST(derun_andrey_shell_omp, task_run) {
-  const int count = 10000;
+  const int count = 8000000;
 
   // Create data
-  std::vector<int> in(1, count);
+  std::vector<int> in = ShellOMP::generate_random_vector(count, 1, 100);
   std::vector<int> out(count, 0);
 
   // Create TaskData
@@ -77,5 +77,5 @@ TEST(derun_andrey_shell_omp, task_run) {
   auto perfAnalyzer = std::make_shared<ppc::core::Perf>(testTaskOMP);
   perfAnalyzer->task_run(perfAttr, perfResults);
   ppc::core::Perf::print_perf_statistic(perfResults);
-  ASSERT_EQ(count, out[0]);
+  ASSERT_TRUE(ShellOMP::checkSorted(out));
 }
diff --git a/tasks/seq/derun_a_shell/perf_tests/main.cpp b/tasks/seq/derun_a_shell/perf_tests/main.cpp
@@ -7,7 +7,7 @@
 #include "seq/derun_a_shell/include/shell_seq.hpp"
 
 TEST(derun_andrey_shell_seq, pipeline_run) {
-  const int count = 10000;
+  const int count = 2000000;
 
   // Create data
   std::vector<int> in = ShellSequential::generate_random_vector(count, 1, 100);
@@ -44,10 +44,11 @@ TEST(derun_andrey_shell_seq, pipeline_run) {
 }
 
 TEST(derun_andrey_shell_seq, task_run) {
-  const int count = 10000;
+  const int count = 8000000;
 
   // Create data
-  std::vector<int> in(1, count);
+  // std::vector<int> in(1, count);
+  std::vector<int> in = ShellSequential::generate_random_vector(count, 1, 100);
   std::vector<int> out(count, 0);
 
   // Create TaskData
@@ -77,5 +78,5 @@ TEST(derun_andrey_shell_seq, task_run) {
   auto perfAnalyzer = std::make_shared<ppc::core::Perf>(testTaskSequential);
   perfAnalyzer->task_run(perfAttr, perfResults);
   ppc::core::Perf::print_perf_statistic(perfResults);
-  ASSERT_EQ(count, out[0]);
+  ASSERT_TRUE(ShellSequential::checkSorted(out));
 }
diff --git a/tasks/tbb/derun_a_shell/perf_tests/main.cpp b/tasks/tbb/derun_a_shell/perf_tests/main.cpp
@@ -7,7 +7,7 @@
 #include "tbb/derun_a_shell/include/shell_tbb.hpp"
 
 TEST(derun_andrey_shell_tbb, pipeline_run) {
-  const int count = 10000;
+  const int count = 2000000;
 
   // Create data
   std::vector<int> in = ShellTBB::generate_random_vector(count, 1, 100);
@@ -44,10 +44,10 @@ TEST(derun_andrey_shell_tbb, pipeline_run) {
 }
 
 TEST(derun_andrey_shell_tbb, task_run) {
-  const int count = 10000;
+  const int count = 8000000;
 
   // Create data
-  std::vector<int> in(1, count);
+  std::vector<int> in = ShellTBB::generate_random_vector(count, 1, 100);
   std::vector<int> out(count, 0);
 
   // Create TaskData
@@ -77,5 +77,5 @@ TEST(derun_andrey_shell_tbb, task_run) {
   auto perfAnalyzer = std::make_shared<ppc::core::Perf>(testTaskTBB);
   perfAnalyzer->task_run(perfAttr, perfResults);
   ppc::core::Perf::print_perf_statistic(perfResults);
-  ASSERT_EQ(count, out[0]);
+  ASSERT_TRUE(ShellTBB::checkSorted(out));
 }