Merge #6226

6226: Re-enable dependency on segmented algorithms on CircleCI r=hkaiser a=hkaiser Co-authored-by: Hartmut Kaiser <[email protected]> Co-authored-by: Panos Syskakis <[email protected]>
STEllAR-GROUP · Jul 16, 2023 · acc763d · acc763d
2 parents 1d49cec + dcb5415
commit acc763d
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 11 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -969,9 +969,7 @@ workflows:
             - tests.examples
             - tests.unit.algorithms
             - tests.unit.container_algorithms
-            # disable the dependency on the segmented algorithms
-            # temporarily to enable install to proceed
-            # - tests.unit.segmented_algorithms
+            - tests.unit.segmented_algorithms
             - tests.unit1
             - tests.unit2
             - tests.regressions

diff --git a/libs/full/segmented_algorithms/tests/unit/partitioned_vector_exclusive_scan.cpp b/libs/full/segmented_algorithms/tests/unit/partitioned_vector_exclusive_scan.cpp
@@ -361,9 +361,9 @@ template <typename T>
 void exclusive_scan_tests(std::vector<hpx::id_type>& localities)
 {
 #if defined(HPX_DEBUG)
-    std::size_t const length = 10000;
+    std::size_t const length = 1000;
 #else
-    std::size_t const length = 100000;
+    std::size_t const length = 10000;
 #endif
 
     exclusive_scan_tests_with_policy<T>(length, hpx::container_layout);

diff --git a/libs/full/segmented_algorithms/tests/unit/partitioned_vector_exclusive_scan2.cpp b/libs/full/segmented_algorithms/tests/unit/partitioned_vector_exclusive_scan2.cpp
@@ -328,9 +328,9 @@ template <typename T>
 void exclusive_scan_tests(std::vector<hpx::id_type>& localities)
 {
 #if defined(HPX_DEBUG)
-    std::size_t const length = 10000;
+    std::size_t const length = 1000;
 #else
-    std::size_t const length = 100000;
+    std::size_t const length = 10000;
 #endif
 
     exclusive_scan_tests_with_policy<T>(length, hpx::container_layout);

diff --git a/libs/full/segmented_algorithms/tests/unit/partitioned_vector_inclusive_scan.cpp b/libs/full/segmented_algorithms/tests/unit/partitioned_vector_inclusive_scan.cpp
@@ -321,9 +321,9 @@ template <typename T>
 void inclusive_scan_tests(std::vector<hpx::id_type>& localities)
 {
 #if defined(HPX_DEBUG)
-    std::size_t const length = 10000;
+    std::size_t const length = 1000;
 #else
-    std::size_t const length = 100000;
+    std::size_t const length = 10000;
 #endif
 
     inclusive_scan_tests_with_policy<T>(length, hpx::container_layout);

diff --git a/libs/full/segmented_algorithms/tests/unit/partitioned_vector_inclusive_scan2.cpp b/libs/full/segmented_algorithms/tests/unit/partitioned_vector_inclusive_scan2.cpp
@@ -321,9 +321,9 @@ template <typename T>
 void inclusive_scan_tests(std::vector<hpx::id_type>& localities)
 {
 #if defined(HPX_DEBUG)
-    std::size_t const length = 10000;
+    std::size_t const length = 1000;
 #else
-    std::size_t const length = 100000;
+    std::size_t const length = 10000;
 #endif
 
     inclusive_scan_tests_with_policy<T>(length, hpx::container_layout);