Merge pull request #6582 from STEllAR-GROUP/circleci_fix

Accommodate for CircleCI reduce available number of cores to two
STEllAR-GROUP · Dec 12, 2024 · 74ff9db · 74ff9db
2 parents ed3a00b + d905f4b
commit 74ff9db
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 10 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -249,7 +249,8 @@ jobs:
                 -DCMAKE_EXPORT_COMPILE_COMMANDS=On \
                 -DHPX_WITH_DOCUMENTATION=On \
                 -DHPX_WITH_DOCUMENTATION_OUTPUT_FORMATS="${DOCUMENTATION_OUTPUT_FORMATS}" \
-                -DHPX_WITH_TESTS_COMMAND_LINE=--hpx:queuing=local-workrequesting-fifo
+                -DHPX_WITH_TESTS_COMMAND_LINE=--hpx:queuing=local-workrequesting-fifo \
+                -DHPX_WITH_TESTS_MAX_THREADS_PER_LOCALITY=2
       - persist_to_workspace:
           root: /hpx
           paths:

diff --git a/.jenkins/lsu/env-clang-17.sh b/.jenkins/lsu/env-clang-17.sh
@@ -15,7 +15,7 @@ module load openmpi
 export HPXRUN_RUNWRAPPER=srun
 export CXX_STD="20"
 export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH
-export CXXFLAGS="-fopenmp -Wno-pass-failed ${CXXFLAGS}"
+export CXXFLAGS="-fopenmp -Wno-pass-failed ${CXXFLAGS:-}"
 
 configure_extra_options+=" -DCMAKE_BUILD_TYPE=${build_type}"
 configure_extra_options+=" -DHPX_WITH_CXX_STANDARD=${CXX_STD}"

diff --git a/.jenkins/lsu/env-gcc-13.sh b/.jenkins/lsu/env-gcc-13.sh
@@ -15,7 +15,7 @@ module load openmpi
 export HPXRUN_RUNWRAPPER=srun
 export CXX_STD="20"
 export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH
-export CXXFLAGS="-fopenmp ${CXXFLAGS}"
+export CXXFLAGS="-fopenmp ${CXXFLAGS:-}"
 
 configure_extra_options+=" -DHPX_WITH_CXX_STANDARD=${CXX_STD}"
 configure_extra_options+=" -DHPX_WITH_MALLOC=system"

diff --git a/libs/core/compute_local/tests/regressions/parallel_fill_4132.cpp b/libs/core/compute_local/tests/regressions/parallel_fill_4132.cpp
@@ -17,7 +17,7 @@
 int hpx_main()
 {
     std::size_t const max_targets =
-        (std::min)(hpx::get_num_worker_threads(), std::size_t(10));
+        (std::min)(2 * hpx::get_num_worker_threads(), std::size_t(10));
     ;
     auto targets = hpx::compute::host::get_local_targets();
 

diff --git a/libs/core/concurrency/tests/unit/contiguous_index_queue.cpp b/libs/core/concurrency/tests/unit/contiguous_index_queue.cpp
@@ -143,9 +143,11 @@ void test_concurrent(pop_mode m)
     std::uint32_t last = 732100;
     hpx::concurrency::detail::contiguous_index_queue<> q{first, last};
 
-    std::size_t const num_threads = hpx::get_num_worker_threads();
+    std::size_t const num_threads = 2 * hpx::get_num_worker_threads();
+
     // This test should be run on at least two worker threads.
-    HPX_TEST_LTE(std::size_t(2), num_threads);
+    HPX_TEST_LTE(std::size_t(4), num_threads);
+
     std::vector<hpx::future<void>> fs;
     std::vector<std::vector<std::uint32_t>> popped_indices(num_threads);
     fs.reserve(num_threads);

diff --git a/libs/core/concurrency/tests/unit/non_contiguous_index_queue.cpp b/libs/core/concurrency/tests/unit/non_contiguous_index_queue.cpp
@@ -153,10 +153,10 @@ void test_concurrent(pop_mode m)
     std::uint32_t step = 7;
     hpx::concurrency::detail::non_contiguous_index_queue<> q{first, last, step};
 
-    std::size_t const num_threads = hpx::get_num_worker_threads();
+    std::size_t const num_threads = 2 * hpx::get_num_worker_threads();
 
     // This test should be run on at least two worker threads.
-    HPX_TEST_LTE(std::size_t(2), num_threads);
+    HPX_TEST_LTE(std::size_t(4), num_threads);
 
     std::vector<hpx::future<void>> fs;
     std::vector<std::vector<std::uint32_t>> popped_indices(num_threads);

diff --git a/libs/full/async_distributed/tests/regressions/future_hang_on_wait_with_callback_629.cpp b/libs/full/async_distributed/tests/regressions/future_hang_on_wait_with_callback_629.cpp
@@ -159,7 +159,7 @@ int main(int argc, char* argv[])
     // clang-format off
     cmdline.add_options()
         ("test-runs"
-        , value<std::uint64_t>()->default_value(1000)
+        , value<std::uint64_t>()->default_value(100)
         , "number of times to repeat the test (0 == infinite)")
 
         ("verbose"
@@ -174,7 +174,7 @@ int main(int argc, char* argv[])
         , "depth of the tree structure")
 
         ("delay-iterations"
-        , value<std::uint64_t>()->default_value(1000)
+        , value<std::uint64_t>()->default_value(100)
         , "number of iterations in the delay loop");
     // clang-format on