Updated tests to run on multiple localities

STEllAR-GROUP · Jun 21, 2017 · 16a3660 · 16a3660
1 parent 80fc2a4
commit 16a3660
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 11 deletions.
diff --git a/tests/unit/parallel/segmented_algorithms/CMakeLists.txt b/tests/unit/parallel/segmented_algorithms/CMakeLists.txt
@@ -21,13 +21,28 @@ set(tests
 
 set(partitioned_vector_copy_FLAGS DEPENDENCIES partitioned_vector_component)
 set(partitioned_vector_for_each_FLAGS DEPENDENCIES partitioned_vector_component)
+set(partitioned_vector_for_each_PARAMETERS
+    LOCALITIES 2
+    THREADS_PER_LOCALITY 4)
 set(partitioned_vector_transform_FLAGS DEPENDENCIES partitioned_vector_component)
+set(partitioned_vector_transform_PARAMETERS
+    LOCALITIES 2
+    THREADS_PER_LOCALITY 4)
 set(partitioned_vector_handle_values_FLAGS DEPENDENCIES partitioned_vector_component)
 set(partitioned_vector_iter_FLAGS DEPENDENCIES partitioned_vector_component)
 set(partitioned_vector_move_FLAGS DEPENDENCIES partitioned_vector_component)
 set(partitioned_vector_transform_reduce_FLAGS DEPENDENCIES partitioned_vector_component)
+set(partitioned_vector_transform_reduce_PARAMETERS
+    LOCALITIES 2
+    THREADS_PER_LOCALITY 4)
 set(partitioned_vector_reduce_FLAGS DEPENDENCIES partitioned_vector_component)
+set(partitioned_vector_inclusive_scan_PARAMETERS
+    LOCALITIES 2
+    THREADS_PER_LOCALITY 4)
 set(partitioned_vector_transform_scan_FLAGS DEPENDENCIES partitioned_vector_component)
+set(partitioned_vector_transform_scan_PARAMETERS
+    LOCALITIES 2
+    THREADS_PER_LOCALITY 4)
 
 set(partitioned_vector_inclusive_scan_FLAGS DEPENDENCIES partitioned_vector_component)
 set(partitioned_vector_inclusive_scan_PARAMETERS

diff --git a/tests/unit/parallel/segmented_algorithms/partitioned_vector_for_each.cpp b/tests/unit/parallel/segmented_algorithms/partitioned_vector_for_each.cpp
@@ -142,12 +142,12 @@ void test_for_each_n_async(ExPolicy && policy, hpx::partitioned_vector<T>& v, T
 
 ///////////////////////////////////////////////////////////////////////////////
 template <typename T>
-void for_each_tests()
+void for_each_tests(std::vector<hpx::id_type> &localities)
 {
     std::size_t const length = 12;
 
     {
-        hpx::partitioned_vector<T> v;
+        hpx::partitioned_vector<T> v(0,hpx::container_layout(localities));
         hpx::parallel::for_each(hpx::parallel::execution::seq,
             v.begin(), v.end(), pfo());
         hpx::parallel::for_each(hpx::parallel::execution::par,
@@ -161,7 +161,7 @@ void for_each_tests()
     }
 
     {
-        hpx::partitioned_vector<T> v(length, T(0));
+        hpx::partitioned_vector<T> v(length, T(0),hpx::container_layout(localities));
         test_for_each(hpx::parallel::execution::seq, v, T(0));
         test_for_each(hpx::parallel::execution::par, v, T(1));
         test_for_each_async(
@@ -177,12 +177,12 @@ void for_each_tests()
 
 ///////////////////////////////////////////////////////////////////////////////
 template <typename T>
-void for_each_n_tests()
+void for_each_n_tests(std::vector<hpx::id_type> &localities)
 {
     std::size_t const length = 12;
 
     {
-        hpx::partitioned_vector<T> v;
+        hpx::partitioned_vector<T> v(0,hpx::container_layout(localities));
         hpx::parallel::for_each_n(hpx::parallel::execution::seq,
             v.begin(), 0, pfo());
         hpx::parallel::for_each_n(hpx::parallel::execution::par,
@@ -196,7 +196,7 @@ void for_each_n_tests()
     }
 
     {
-        hpx::partitioned_vector<T> v;
+        hpx::partitioned_vector<T> v(0,hpx::container_layout(localities));
         hpx::parallel::for_each_n(hpx::parallel::execution::seq,
             v.begin(), -1, pfo());
         hpx::parallel::for_each_n(hpx::parallel::execution::par,
@@ -210,7 +210,7 @@ void for_each_n_tests()
     }
 
     {
-        hpx::partitioned_vector<T> v(length, T(0));
+        hpx::partitioned_vector<T> v(length, T(0), hpx::container_layout(localities));
         test_for_each_n(hpx::parallel::execution::seq, v, T(0));
         test_for_each_n(hpx::parallel::execution::par, v, T(1));
         test_for_each_n_async(
@@ -225,9 +225,10 @@ void for_each_n_tests()
 ///////////////////////////////////////////////////////////////////////////////
 int main()
 {
-    for_each_tests<int>();
-    for_each_tests<double>();
-    for_each_n_tests<int>();
-    for_each_n_tests<double>();
+    std::vector<hpx::id_type> localities = hpx::find_all_localities();
+    for_each_tests<int>(localities);
+    for_each_tests<double>(localities);
+    for_each_n_tests<int>(localities);
+    for_each_n_tests<double>(localities);
     return 0;
 }