Enable testing of new scheduler in CI

- flyby: fixing buffer allocation
STEllAR-GROUP · Apr 28, 2024 · 2e610e7 · 2e610e7
1 parent e977ecc
commit 2e610e7
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/.jenkins/lsu/env-clang-12.sh b/.jenkins/lsu/env-clang-12.sh
@@ -37,3 +37,4 @@ configure_extra_options+=" -DHPX_WITH_LOGGING=OFF"
 configure_extra_options+=" -DHPX_TOPOLOGY_WITH_ADDITIONAL_HWLOC_TESTING=ON"
 
 configure_extra_options+=" -DHPX_COROUTINES_WITH_THREAD_SCHEDULE_HINT_RUNS_AS_CHILD=ON"
+configure_extra_options+=" -DHPX_WITH_TESTS_COMMAND_LINE=--hpx:queuing=local-workrequesting-mc"
diff --git a/.jenkins/lsu/env-gcc-10.sh b/.jenkins/lsu/env-gcc-10.sh
@@ -32,3 +32,4 @@ configure_extra_options+=" -DCMAKE_C_FLAGS=-fPIC"
 # configure_extra_options+=" -DHPX_WITH_POWER_COUNTER=ON"
 
 configure_extra_options+=" -DHPX_COROUTINES_WITH_THREAD_SCHEDULE_HINT_RUNS_AS_CHILD=ON"
+configure_extra_options+=" -DHPX_WITH_TESTS_COMMAND_LINE=--hpx:queuing=local-workrequesting-mc"
diff --git a/libs/core/schedulers/include/hpx/schedulers/local_workrequesting_scheduler.hpp b/libs/core/schedulers/include/hpx/schedulers/local_workrequesting_scheduler.hpp
@@ -20,7 +20,6 @@
 #include <hpx/threading_base/thread_data.hpp>
 #include <hpx/threading_base/thread_num_tss.hpp>
 #include <hpx/threading_base/thread_queue_init_parameters.hpp>
-#include <hpx/type_support/unused.hpp>
 
 #include <algorithm>
 #include <atomic>
@@ -875,9 +874,9 @@ namespace hpx::threads::policies {
             if (max_num_to_steal != 0)
             {
                 task_data thrds(d.num_thread_);
-                thrds.tasks_.reserve(max_num_to_steal);
 
 #ifdef HPX_HAVE_THREAD_STEALING_COUNTS
+                thrds.tasks_.reserve(max_num_to_steal);
                 thread_id_ref_type thrd;
                 while (max_num_to_steal-- != 0 &&
                     d.queue_->get_next_thread(thrd, false, true))
@@ -887,6 +886,7 @@ namespace hpx::threads::policies {
                     thrd = thread_id_ref_type{};
                 }
 #else
+                thrds.tasks_.resize(max_num_to_steal);
                 d.queue_->get_next_threads(
                     thrds.tasks_.begin(), thrds.tasks_.size(), false, true);
 #endif