Skip to content

Adapting HPX actions module to C++20 modules #7237

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

Open
arpittkhandelwal wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Adapting HPX actions module to C++20 modules #7237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5945111
Enable C++20 module generation for remaining core and full modules
arpittkhandelwal May 1, 2026
5013ced
Modularize actions module for C++20
arpittkhandelwal May 1, 2026
ee3d2d6
Fix CI module build failures for init_runtime and parcelports headers
arpittkhandelwal May 1, 2026
a5ba56a
Fix include ordering to pass clang-format CI check
arpittkhandelwal May 1, 2026
d36ed2f
Fix transfer_action C++20 module visibility
arpittkhandelwal May 1, 2026
f53b135
Fix clang-format issues in core
arpittkhandelwal May 1, 2026
4ac4103
Run clang-format and cmake-format on all edited files
arpittkhandelwal May 1, 2026
e8805e8
actions: ensure actions.hpp precedes transfer_continuation_action.hpp
arpittkhandelwal May 1, 2026
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
2 changes: 1 addition & 1 deletion ...s/component_storage/include/hpx/components/component_storage/server/component_storage.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#pragma once

#include <hpx/config.hpp>
#include <hpx/actions/transfer_action.hpp>
#include <hpx/modules/actions.hpp>
#include <hpx/async_distributed/transfer_continuation_action.hpp>
#include <hpx/modules/actions_base.hpp>
#include <hpx/modules/naming_base.hpp>
Expand Down
1 change: 1 addition & 0 deletions components/component_storage/src/component_module.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

#include <hpx/config.hpp>
#include <hpx/modules/actions.hpp>
#include <hpx/async_distributed/transfer_continuation_action.hpp>
#include <hpx/modules/actions_base.hpp>
#include <hpx/modules/components_base.hpp>
Expand Down
2 changes: 1 addition & 1 deletion ...nclude/hpx/components/containers/partitioned_vector/partitioned_vector_component_decl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
/// classes are asynchronous API which return the futures.

#include <hpx/config.hpp>
#include <hpx/actions/transfer_action.hpp>
#include <hpx/modules/actions.hpp>
#include <hpx/async_distributed/transfer_continuation_action.hpp>
#include <hpx/components/client_base.hpp>
#include <hpx/modules/actions_base.hpp>
Expand Down
2 changes: 1 addition & 1 deletion ...ordered/include/hpx/components/containers/unordered/partition_unordered_map_component.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
/// classes are asynchronous API which return the futures.

#include <hpx/config.hpp>
#include <hpx/actions/transfer_action.hpp>
#include <hpx/assert.hpp>
#include <hpx/modules/actions.hpp>
#include <hpx/async_distributed/transfer_continuation_action.hpp>
#include <hpx/components/client_base.hpp>
#include <hpx/components/get_ptr.hpp>
Expand Down
2 changes: 1 addition & 1 deletion components/iostreams/include/hpx/components/iostreams/server/output_stream.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#pragma once

#include <hpx/config.hpp>
#include <hpx/actions/transfer_action.hpp>
#include <hpx/modules/actions.hpp>
#include <hpx/async_distributed/transfer_continuation_action.hpp>
#include <hpx/modules/actions_base.hpp>
#include <hpx/modules/components_base.hpp>
Expand Down
1 change: 1 addition & 0 deletions components/iostreams/src/component_module.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
#include <hpx/components/iostreams/server/output_stream.hpp>
#include <hpx/components/iostreams/standard_streams.hpp>

#include <hpx/modules/actions.hpp>
#include <hpx/async_distributed/transfer_continuation_action.hpp>
#include <hpx/modules/actions_base.hpp>
#include <hpx/modules/components_base.hpp>
Expand Down
2 changes: 1 addition & 1 deletion components/process/include/hpx/components/process/server/child.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#pragma once

#include <hpx/config.hpp>
#include <hpx/actions/transfer_action.hpp>
#include <hpx/modules/actions.hpp>
#include <hpx/async_distributed/transfer_continuation_action.hpp>
#include <hpx/modules/actions_base.hpp>
#include <hpx/modules/components_base.hpp>
Expand Down
5 changes: 2 additions & 3 deletions libs/core/algorithms/include/hpx/parallel/algorithms/shift_left.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,9 +277,8 @@ namespace hpx {
)
// clang-format on
friend typename hpx::parallel::util::detail::algorithm_result<ExPolicy,
FwdIter>::type
tag_fallback_invoke(shift_left_t, ExPolicy&& policy, FwdIter first,
FwdIter last, Size n)
FwdIter>::type tag_fallback_invoke(shift_left_t, ExPolicy&& policy,
FwdIter first, FwdIter last, Size n)
{
static_assert(std::forward_iterator<FwdIter>,
"Requires at least forward iterator.");
Expand Down
5 changes: 2 additions & 3 deletions libs/core/algorithms/include/hpx/parallel/algorithms/shift_right.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,9 +322,8 @@ namespace hpx {
)
// clang-format on
friend typename hpx::parallel::util::detail::algorithm_result<ExPolicy,
FwdIter>::type
tag_fallback_invoke(shift_right_t, ExPolicy&& policy, FwdIter first,
FwdIter last, Size n)
FwdIter>::type tag_fallback_invoke(shift_right_t, ExPolicy&& policy,
FwdIter first, FwdIter last, Size n)
{
static_assert(std::forward_iterator<FwdIter>,
"Requires at least forward iterator.");
Expand Down
12 changes: 5 additions & 7 deletions libs/core/algorithms/include/hpx/parallel/container_algorithms/find.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2261,9 +2261,8 @@ namespace hpx::ranges {
)
// clang-format on
friend hpx::parallel::util::detail::algorithm_result_t<ExPolicy,
std::ranges::iterator_t<Rng>>
tag_fallback_invoke(find_if_not_t, ExPolicy&& policy, Rng&& rng,
Pred pred, Proj proj = Proj())
std::ranges::iterator_t<Rng>> tag_fallback_invoke(find_if_not_t,
ExPolicy&& policy, Rng&& rng, Pred pred, Proj proj = Proj())
{
using iterator_type = std::ranges::iterator_t<Rng>;

Expand Down Expand Up @@ -2472,10 +2471,9 @@ namespace hpx::ranges {
)
// clang-format on
friend hpx::parallel::util::detail::algorithm_result_t<ExPolicy,
std::ranges::iterator_t<Rng1>>
tag_fallback_invoke(find_first_of_t, ExPolicy&& policy, Rng1&& rng1,
Rng2&& rng2, Pred op = Pred(), Proj1 proj1 = Proj1(),
Proj2 proj2 = Proj2())
std::ranges::iterator_t<Rng1>> tag_fallback_invoke(find_first_of_t,
ExPolicy&& policy, Rng1&& rng1, Rng2&& rng2, Pred op = Pred(),
Proj1 proj1 = Proj1(), Proj2 proj2 = Proj2())
{
using iterator_type = std::ranges::iterator_t<Rng1>;

Expand Down
5 changes: 2 additions & 3 deletions libs/core/algorithms/include/hpx/parallel/container_algorithms/iota.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,9 +189,8 @@ namespace hpx::ranges {
)
// clang-format on
friend hpx::parallel::util::detail::algorithm_result_t<ExPolicy,
iota_result<FwdIter, T>>
tag_fallback_invoke(
iota_t, ExPolicy&& policy, FwdIter first, Sent last, T value)
iota_result<FwdIter, T>> tag_fallback_invoke(iota_t,
ExPolicy&& policy, FwdIter first, Sent last, T value)
{
auto dist = hpx::parallel::detail::distance(first, last);

Expand Down
2 changes: 2 additions & 0 deletions libs/core/async_sycl/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ include(HPX_AddModule)
add_hpx_module(
core async_sycl
GLOBAL_HEADER_GEN ON
GLOBAL_HEADER_MODULE_GEN ON
ADD_TO_GLOBAL_HEADER hpx/async_sycl/detail/sycl_event_callback.hpp
Copy link
Copy Markdown
Contributor

@hkaiser hkaiser May 3, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you please separate this into its own PR?

SOURCES ${async_sycl_sources}
HEADERS ${async_sycl_headers}
COMPAT_HEADERS ${async_sycl_compat_headers}
Expand Down
5 changes: 3 additions & 2 deletions libs/core/execution/include/hpx/execution/algorithms/when_all.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -580,8 +580,9 @@ namespace hpx::execution::experimental {
// execution::transfer_when_all_with_variant is used to join multiple
// sender chains and create a sender whose execution is dependent on all
// the input senders, which may have one or more sets of sent values.
HPX_CXX_CORE_EXPORT inline constexpr struct transfer_when_all_with_variant_t
final : hpx::functional::tag<transfer_when_all_with_variant_t>
HPX_CXX_CORE_EXPORT inline constexpr struct
transfer_when_all_with_variant_t final
: hpx::functional::tag<transfer_when_all_with_variant_t>
Copy link
Copy Markdown
Contributor

@hkaiser hkaiser May 3, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If there are formatting changes required (why should they - our tests constantly verify that everything is formatted properly), please separate those into their own PR.

{
} transfer_when_all_with_variant{};

Expand Down
12 changes: 6 additions & 6 deletions libs/core/execution/include/hpx/execution/executors/execution_parameters_fwd.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,8 +209,8 @@ namespace hpx::execution::experimental {
/// \note This calls params.reset_thread_distribution(exec) if it exists;
/// otherwise it does nothing.
///
HPX_CXX_CORE_EXPORT inline constexpr struct reset_thread_distribution_t
final
HPX_CXX_CORE_EXPORT inline constexpr struct
reset_thread_distribution_t final
: hpx::functional::detail::tag_priority<reset_thread_distribution_t>
{
private:
Expand Down Expand Up @@ -299,8 +299,8 @@ namespace hpx::execution::experimental {

/// Generate a policy that supports setting the number of cores for
/// execution.
HPX_CXX_CORE_EXPORT inline constexpr struct with_processing_units_count_t
final
HPX_CXX_CORE_EXPORT inline constexpr struct
with_processing_units_count_t final
: hpx::functional::detail::tag_priority<with_processing_units_count_t>
{
} with_processing_units_count{};
Expand Down Expand Up @@ -434,8 +434,8 @@ namespace hpx::execution::experimental {
/// \note This calls params.mark_begin_execution(exec) if it exists;
/// otherwise it does nothing.
///
HPX_CXX_CORE_EXPORT inline constexpr struct collect_execution_parameters_t
final
HPX_CXX_CORE_EXPORT inline constexpr struct
collect_execution_parameters_t final
: hpx::functional::detail::tag_priority<collect_execution_parameters_t>
{
private:
Expand Down
4 changes: 2 additions & 2 deletions libs/core/execution_base/include/hpx/execution_base/completion_signatures.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,8 +397,8 @@ namespace hpx::execution::experimental {
// Otherwise, no-completion-signatures{}.
//
#if !defined(HPX_HAVE_STDEXEC)
HPX_CXX_CORE_EXPORT inline constexpr struct get_completion_signatures_t
final
HPX_CXX_CORE_EXPORT inline constexpr struct
get_completion_signatures_t final
: hpx::functional::detail::tag_fallback<get_completion_signatures_t>
{
private:
Expand Down
1 change: 1 addition & 0 deletions libs/core/gasnet_base/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ include(HPX_AddModule)
add_hpx_module(
core gasnet_base
GLOBAL_HEADER_GEN ON
GLOBAL_HEADER_MODULE_GEN ON
Copy link
Copy Markdown
Contributor

@hkaiser hkaiser May 3, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please separate into a new PR.

SOURCES ${gasnet_base_sources}
HEADERS ${gasnet_base_headers}
DEPENDENCIES PkgConfig::GASNET ${gasnet_additional_dependencies}
Expand Down
1 change: 1 addition & 0 deletions libs/core/lcw_base/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ include(HPX_AddModule)
add_hpx_module(
core lcw_base
GLOBAL_HEADER_GEN ON
GLOBAL_HEADER_MODULE_GEN ON
Copy link
Copy Markdown
Contributor

@hkaiser hkaiser May 3, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here, please keep this unrelated change separate.

SOURCES ${lcw_base_sources}
HEADERS ${lcw_base_headers}
MODULE_DEPENDENCIES hpx_logging hpx_runtime_configuration hpx_string_util
Expand Down
2 changes: 2 additions & 0 deletions libs/core/preprocessor/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,9 @@ include(HPX_AddModule)
add_hpx_module(
core preprocessor NO_CONFIG_IN_GENERATED_HEADERS
GLOBAL_HEADER_GEN ON
GLOBAL_HEADER_MODULE_GEN OFF
Copy link
Copy Markdown
Contributor

@hkaiser hkaiser May 3, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the default, no need to specify.

HEADERS ${preprocessor_headers}
MACRO_HEADERS ${preprocessor_headers}
Copy link
Copy Markdown
Contributor

@hkaiser hkaiser May 3, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

copilot is correct here.

COMPAT_HEADERS ${preprocessor_compat_headers}
CMAKE_SUBDIRS tests
)
5 changes: 3 additions & 2 deletions libs/core/threading_base/include/hpx/threading_base/thread_data.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -672,8 +672,9 @@ namespace hpx::threads {
}

#if defined(HPX_HAVE_MODULE_TRACY)
HPX_CXX_CORE_EXPORT HPX_CORE_EXPORT tracing::region_init_data
get_region_init_data(thread_data const* thrdptr);
HPX_CXX_CORE_EXPORT HPX_CORE_EXPORT
tracing::region_init_data get_region_init_data(
thread_data const* thrdptr);

HPX_CXX_CORE_EXPORT HPX_CORE_EXPORT tracing::fiber_region_init_data
get_fiber_region_init_data(thread_data const* thrdptr);
Expand Down
5 changes: 5 additions & 0 deletions libs/full/actions/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,16 @@ set(actions_headers
hpx/actions/actions_fwd.hpp
hpx/actions/base_action.hpp
hpx/actions/invoke_function.hpp
hpx/actions/macros.hpp
hpx/actions/post_helper_fwd.hpp
hpx/actions/post_helper.hpp
hpx/actions/register_action.hpp
hpx/actions/transfer_base_action.hpp
hpx/actions/transfer_action.hpp
)

set(actions_macro_headers hpx/actions/macros.hpp)

# Default location is $HPX_ROOT/libs/actions/include_compatibility
# cmake-format: off
set(actions_compat_headers
Expand All @@ -43,8 +46,10 @@ include(HPX_AddModule)
add_hpx_module(
full actions
GLOBAL_HEADER_GEN ON
GLOBAL_HEADER_MODULE_GEN ON
SOURCES ${actions_sources}
HEADERS ${actions_headers}
MACRO_HEADERS ${actions_macro_headers}
COMPAT_HEADERS ${actions_compat_headers}
MODULE_DEPENDENCIES hpx_actions_base hpx_components_base hpx_naming_base
hpx_parcelset_base
Expand Down
104 changes: 1 addition & 103 deletions libs/full/actions/include/hpx/actions/base_action.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,109 +194,7 @@ namespace hpx::serialization {
} // namespace hpx::serialization

#include <hpx/config/warnings_suffix.hpp>

// Helper macro for action serialization, each of the defined actions needs to
// be registered with the serialization library
#define HPX_DEFINE_GET_ACTION_NAME(action) \
HPX_DEFINE_GET_ACTION_NAME_(action, action) \
/**/

#define HPX_DEFINE_GET_ACTION_NAME_(action, actionname) \
HPX_DEFINE_GET_ACTION_NAME_ITT(action, actionname) \
namespace hpx::actions::detail { \
template <> \
HPX_ALWAYS_EXPORT char const* get_action_name</**/ action>() noexcept \
{ \
return HPX_PP_STRINGIZE(actionname); \
} \
} \
/**/
/**/

///////////////////////////////////////////////////////////////////////////////
#if defined(HPX_HAVE_ITTNOTIFY) && HPX_HAVE_ITTNOTIFY != 0 && \
!defined(HPX_HAVE_APEX)
#define HPX_DEFINE_GET_ACTION_NAME_ITT(action, actionname) \
namespace hpx::actions::detail { \
template <> \
HPX_ALWAYS_EXPORT util::itt::string_handle const& \
get_action_name_itt</**/ action>() noexcept \
{ \
static util::itt::string_handle sh(HPX_PP_STRINGIZE(actionname)); \
return sh; \
} \
} \
/**/

#define HPX_REGISTER_ACTION_DECLARATION_NO_DEFAULT_GUID_ITT(action) \
namespace hpx::actions::detail { \
template <> \
HPX_ALWAYS_EXPORT util::itt::string_handle const& \
get_action_name_itt</**/ action>() noexcept; \
} \
/**/
#else // HPX_HAVE_ITTNOTIFY != 0 && !defined(HPX_HAVE_APEX)
#define HPX_DEFINE_GET_ACTION_NAME_ITT(action, actionname) /**/
#define HPX_REGISTER_ACTION_DECLARATION_NO_DEFAULT_GUID_ITT(action) /**/
#endif // HPX_HAVE_ITTNOTIFY != 0 && !defined(HPX_HAVE_APEX)

#define HPX_REGISTER_ACTION_DECLARATION_NO_DEFAULT_GUID(action) \
HPX_REGISTER_ACTION_DECLARATION_NO_DEFAULT_GUID_ITT(action) \
namespace hpx::actions::detail { \
template <> \
HPX_ALWAYS_EXPORT char const* get_action_name<action>() noexcept; \
} \
HPX_REGISTER_ACTION_EXTERN_DECLARATION(action) \
\
namespace hpx::traits { \
template <> \
struct is_action</**/ action> : std::true_type \
{ \
}; \
template <> \
struct needs_automatic_registration</**/ action> : std::false_type \
{ \
}; \
} \
/**/

#define HPX_REGISTER_ACTION_DECLARATION_2(action, actionname) \
HPX_REGISTER_ACTION_DECLARATION_NO_DEFAULT_GUID(action) \
/**/

#if defined(HPX_MSVC) || defined(HPX_MINGW)
#define HPX_REGISTER_ACTION_2(action, actionname) \
HPX_DEFINE_GET_ACTION_NAME_(action, actionname) \
HPX_REGISTER_ACTION_INVOCATION_COUNT(action) \
HPX_REGISTER_PER_ACTION_DATA_COUNTER_TYPES(action) \
namespace hpx::actions { \
template struct HPX_ALWAYS_EXPORT transfer_action</**/ action>; \
template struct HPX_ALWAYS_EXPORT \
transfer_continuation_action</**/ action>; \
} \
/**/
#define HPX_REGISTER_ACTION_EXTERN_DECLARATION(action) /**/

#else // defined(HPX_MSVC) || defined(HPX_MINGW)

#define HPX_REGISTER_ACTION_2(action, actionname) \
HPX_DEFINE_GET_ACTION_NAME_(action, actionname) \
HPX_REGISTER_ACTION_INVOCATION_COUNT(action) \
HPX_REGISTER_PER_ACTION_DATA_COUNTER_TYPES(action) \
namespace hpx::actions { \
template struct transfer_action</**/ action>; \
template struct transfer_continuation_action</**/ action>; \
} \
/**/
#define HPX_REGISTER_ACTION_EXTERN_DECLARATION(action) \
namespace hpx::actions { \
extern template struct HPX_ALWAYS_IMPORT transfer_action</**/ action>; \
extern template struct HPX_ALWAYS_IMPORT \
transfer_continuation_action</**/ action>; \
} \
/**/

#endif // defined(HPX_MSVC) || defined(HPX_MINGW)
#include <hpx/actions/macros.hpp>

HPX_TRAITS_SERIALIZED_WITH_ID(hpx::actions::base_action)
HPX_TRAITS_SERIALIZED_WITH_ID(hpx::actions::base_action_data)
Expand Down
Loading
Loading