Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Enable testing of new scheduler in CI #6428

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+4 −2
Open

Enable testing of new scheduler in CI #6428

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .jenkins/lsu/env-clang-12.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
1 change: 1 addition & 0 deletions .jenkins/lsu/env-gcc-10.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
4 changes: 2 additions & 2 deletions libs/core/schedulers/include/hpx/schedulers/local_workrequesting_scheduler.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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))
Expand All @@ -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
Expand Down
Loading