Skip to content

Commit

Permalink
Throttling scheduler must be disabled if hwloc is not used
Browse files Browse the repository at this point in the history
  • Loading branch information
biddisco committed Nov 16, 2017
1 parent bf8b214 commit f49573f
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/runtime/threads/detail/scheduled_thread_pool.cpp
Expand Up @@ -52,7 +52,7 @@ template class HPX_EXPORT hpx::threads::detail::scheduled_thread_pool<
hpx::threads::policies::periodic_priority_queue_scheduler<>>;
#endif

#if defined(HPX_HAVE_THROTTLING_SCHEDULER)
#if defined(HPX_HAVE_THROTTLING_SCHEDULER) && defined(HPX_HAVE_HWLOC)
#include <hpx/runtime/threads/policies/throttling_scheduler.hpp>
template class HPX_EXPORT hpx::threads::detail::scheduled_thread_pool<
hpx::threads::policies::throttling_scheduler<>>;
Expand Down
2 changes: 1 addition & 1 deletion src/runtime/threads/threadmanager.cpp
Expand Up @@ -711,7 +711,7 @@ namespace hpx { namespace threads

case resource::throttle:
{
#if defined(HPX_HAVE_THROTTLING_SCHEDULER)
#if defined(HPX_HAVE_THROTTLING_SCHEDULER) && defined(HPX_HAVE_HWLOC)
// set parameters for scheduler and pool instantiation and
// perform compatibility checks
hpx::detail::ensure_high_priority_compatibility(cfg_.vm_);
Expand Down

0 comments on commit f49573f

Please sign in to comment.