Adapting HPX modules from level 37 and 38 to C++20 modules

.cmake-format.py

@@ -392,7 +392,6 @@
                                              'SOURCES': '+',
                                              'SOURCE_ROOT': 1,
                                              'ARGS': '+',
-                                             'EXECUTABLE': 1,
                                              'PSEUDO_DEPS_NAME': 1,
                                              'LOCALITIES': 1,
                                              'PARCELPORTS': '+',

.codacy.yml

@@ -13,4 +13,5 @@ exclude_paths:
 tools:
   duplication:
     exclude:
+      - "tests/**"
       - "**/tests/**"

components/component_storage/src/component_module.cpp

@@ -9,7 +9,7 @@
 #include <hpx/modules/actions_base.hpp>
 #include <hpx/modules/async_distributed.hpp>
 #include <hpx/modules/components_base.hpp>
-#include <hpx/runtime_components/component_factory.hpp>
+#include <hpx/modules/runtime_components.hpp>
 
 #include <hpx/components/component_storage/server/migrate_to_storage.hpp>
 

components/component_storage/src/component_storage.cpp

@@ -7,8 +7,8 @@
 #include <hpx/config.hpp>
 #include <hpx/assert.hpp>
 #include <hpx/modules/async_distributed.hpp>
+#include <hpx/modules/runtime_components.hpp>
 #include <hpx/modules/type_support.hpp>
-#include <hpx/runtime_components/new.hpp>
 
 #include <hpx/components/component_storage/component_storage.hpp>
 

components/containers/partitioned_vector/include/hpx/components/containers/partitioned_vector/partitioned_vector_component_impl.hpp

@@ -12,7 +12,7 @@
 #include <hpx/modules/async_base.hpp>
 #include <hpx/modules/components.hpp>
 #include <hpx/modules/preprocessor.hpp>
-#include <hpx/runtime_components/component_factory.hpp>
+#include <hpx/modules/runtime_components.hpp>
 
 #include <hpx/components/containers/partitioned_vector/partitioned_vector_decl.hpp>
 

components/containers/partitioned_vector/include/hpx/components/containers/partitioned_vector/partitioned_vector_decl.hpp

@@ -18,9 +18,8 @@
 #include <hpx/modules/async_combinators.hpp>
 #include <hpx/modules/components.hpp>
 #include <hpx/modules/functional.hpp>
+#include <hpx/modules/runtime_components.hpp>
 #include <hpx/modules/type_support.hpp>
-#include <hpx/runtime_components/distributed_metadata_base.hpp>
-#include <hpx/runtime_components/new.hpp>
 #include <hpx/runtime_distributed/copy_component.hpp>
 
 #include <hpx/components/containers/partitioned_vector/export_definitions.hpp>

components/containers/partitioned_vector/include/hpx/components/containers/partitioned_vector/partitioned_vector_impl.hpp

@@ -18,8 +18,7 @@
 #include <hpx/modules/components.hpp>
 #include <hpx/modules/errors.hpp>
 #include <hpx/modules/execution.hpp>
-#include <hpx/runtime_components/distributed_metadata_base.hpp>
-#include <hpx/runtime_components/new.hpp>
+#include <hpx/modules/runtime_components.hpp>
 #include <hpx/runtime_distributed/copy_component.hpp>
 
 #include <hpx/components/containers/partitioned_vector/partitioned_vector_component_impl.hpp>

components/containers/partitioned_vector/src/partitioned_vector_component.cpp

@@ -11,7 +11,7 @@
 /// required for proper functioning of components in the context of HPX.
 
 #include <hpx/config.hpp>
-#include <hpx/runtime_components/component_factory.hpp>
+#include <hpx/modules/runtime_components.hpp>
 
 #include <hpx/components/containers/partitioned_vector/export_definitions.hpp>
 #include <hpx/components/containers/partitioned_vector/partitioned_vector.hpp>

components/containers/unordered/include/hpx/components/containers/unordered/partition_unordered_map_component.hpp

@@ -28,8 +28,8 @@
 #include <hpx/modules/errors.hpp>
 #include <hpx/modules/functional.hpp>
 #include <hpx/modules/preprocessor.hpp>
+#include <hpx/modules/runtime_components.hpp>
 #include <hpx/modules/type_support.hpp>
-#include <hpx/runtime_components/component_factory.hpp>
 
 #include <cstddef>
 #include <memory>

components/containers/unordered/include/hpx/components/containers/unordered/unordered_map.hpp

@@ -16,10 +16,9 @@
 #include <hpx/modules/components.hpp>
 #include <hpx/modules/components_base.hpp>
 #include <hpx/modules/functional.hpp>
+#include <hpx/modules/runtime_components.hpp>
 #include <hpx/modules/serialization.hpp>
 #include <hpx/modules/type_support.hpp>
-#include <hpx/runtime_components/distributed_metadata_base.hpp>
-#include <hpx/runtime_components/new.hpp>
 #include <hpx/runtime_distributed/copy_component.hpp>
 
 #include <hpx/components/containers/unordered/partition_unordered_map_component.hpp>

components/containers/unordered/src/partition_unordered_map_component.cpp

@@ -10,7 +10,7 @@
 /// required for proper functioning of components in the context of HPX.
 
 #include <hpx/config.hpp>
-#include <hpx/runtime_components/component_factory.hpp>
+#include <hpx/modules/runtime_components.hpp>
 
 #include <hpx/components/containers/unordered/partition_unordered_map_component.hpp>
 #include <hpx/components/containers/unordered/unordered_map.hpp>

components/iostreams/src/component_module.cpp

@@ -8,12 +8,13 @@
 #include <hpx/config.hpp>
 
 #include <hpx/modules/actions.hpp>
-#include <hpx/modules/async_distributed.hpp>
 #include <hpx/modules/actions_base.hpp>
+#include <hpx/modules/async_distributed.hpp>
 #include <hpx/modules/components_base.hpp>
 #include <hpx/modules/functional.hpp>
+#include <hpx/modules/runtime_components.hpp>
+#include <hpx/modules/runtime_configuration.hpp>
 #include <hpx/modules/runtime_local.hpp>
-#include <hpx/runtime_components/component_factory.hpp>
 
 #include <hpx/components/iostreams/ostream.hpp>
 #include <hpx/components/iostreams/server/output_stream.hpp>

components/performance_counters/papi/src/server/papi.cpp

@@ -14,10 +14,10 @@
 #include <hpx/modules/actions_base.hpp>
 #include <hpx/modules/components_base.hpp>
 #include <hpx/modules/errors.hpp>
+#include <hpx/modules/runtime_components.hpp>
 #include <hpx/modules/runtime_local.hpp>
 #include <hpx/modules/timing.hpp>
 #include <hpx/modules/type_support.hpp>
-#include <hpx/runtime_components/derived_component_factory.hpp>
 
 #include <cstdint>
 #include <functional>

components/process/include/hpx/components/process/process.hpp

@@ -8,7 +8,7 @@
 
 #include <hpx/config.hpp>
 #include <hpx/modules/naming_base.hpp>
-#include <hpx/runtime_components/new.hpp>
+#include <hpx/modules/runtime_components.hpp>
 
 #include <hpx/components/process/child.hpp>
 

components/process/src/process.cpp

@@ -5,7 +5,8 @@
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include <hpx/modules/components_base.hpp>
-#include <hpx/runtime_components/component_factory.hpp>
+#include <hpx/modules/runtime_components.hpp>
+#include <hpx/modules/runtime_configuration.hpp>
 
 #include <hpx/components/process/process.hpp>
 #include <hpx/components/process/server/child.hpp>

libs/core/algorithms/include/hpx/parallel/algorithms/adjacent_difference.hpp

@@ -316,7 +316,7 @@ namespace hpx::parallel {
                               std::size_t part_size) mutable {
                     // VS2015RC bails out when op is captured by ref
                     using hpx::get;
-                    util::const_loop_n<std::decay_t<ExPolicy>>(
+                    util::loop_n<std::decay_t<ExPolicy>>(
                         part_begin, part_size, [op](auto&& it) mutable {
                             get<2>(*it) =
                                 HPX_INVOKE(op, get<0>(*it), get<1>(*it));

libs/core/algorithms/include/hpx/parallel/datapar/adjacent_difference.hpp

@@ -50,7 +50,7 @@ namespace hpx::parallel::detail {
 
             using hpx::get;
 
-            util::const_loop_n<std::decay_t<ExPolicy>>(
+            util::loop_n<std::decay_t<ExPolicy>>(
                 hpx::util::zip_iterator(first, prev, dest), count,
                 [op](auto&& it) mutable {
                     get<2>(*it) = HPX_INVOKE(op, get<0>(*it), get<1>(*it));

libs/core/algorithms/include/hpx/parallel/util/loop.hpp

@@ -525,7 +525,7 @@ namespace hpx::parallel::util {
 
     HPX_CXX_CORE_EXPORT template <typename ExPolicy>
     struct const_loop_n_t final
-      : hpx::functional::detail::tag_fallback<loop_n_t<ExPolicy>>
+      : hpx::functional::detail::tag_fallback<const_loop_n_t<ExPolicy>>
     {
     private:
         template <typename Iter, typename F>

libs/core/algorithms/tests/unit/algorithms/sort_by_key.cpp

@@ -29,21 +29,20 @@
 //
 namespace debug {
     template <typename T>
-    void output(std::string const& name, std::vector<T> const& v)
+    void output([[maybe_unused]] std::string const& name,
+        [[maybe_unused]] std::vector<T> const& v)
     {
 #ifdef EXTRA_DEBUG7
         std::cout << name.c_str() << "\t : {" << v.size() << "} : ";
         std::copy(std::begin(v), std::end(v),
             std::ostream_iterator<T>(std::cout, ", "));
         std::cout << "\n";
-#else
-        HPX_UNUSED(name);
-        HPX_UNUSED(v);
 #endif
     }
 
     template <typename Iter>
-    void output(std::string const& name, Iter begin, Iter end)
+    void output([[maybe_unused]] std::string const& name,
+        [[maybe_unused]] Iter begin, [[maybe_unused]] Iter end)
     {
 #ifdef EXTRA_DEBUG
         std::cout << name.c_str() << "\t : {" << std::distance(begin, end)
@@ -53,10 +52,6 @@ namespace debug {
                 typename std::iterator_traits<Iter>::value_type>(
                 std::cout, ", "));
         std::cout << "\n";
-#else
-        HPX_UNUSED(name);
-        HPX_UNUSED(begin);
-        HPX_UNUSED(end);
 #endif
     }
 

libs/core/executors/tests/unit/CMakeLists.txt

@@ -61,7 +61,7 @@ if(HPX_WITH_CXX_MODULES AND (CMAKE_CXX_COMPILER_ID STREQUAL "Clang"))
   # Clang (last tested version is v22) fails compiling the following tests when
   # C++ module support is enabled.
   set(failing_clang_tests explicit_scheduler_executor parallel_scheduler
-                          thread_pool_scheduler
+                          scheduler_executor thread_pool_scheduler
   )
   foreach(test ${failing_clang_tests})
     target_compile_definitions(

libs/core/resource_partitioner/tests/unit/named_pool_executor.cpp

@@ -57,8 +57,7 @@ int hpx_main()
     }
 
     // Make sure default construction works
-    hpx::execution::parallel_executor exec_default;
-    HPX_UNUSED(exec_default);
+    [[maybe_unused]] hpx::execution::parallel_executor exec_default;
 
     // setup executors for different task priorities on the pools
     // segfaults or exceptions in any of the following will cause

libs/core/type_support/include/hpx/type_support/lazy_enable_if.hpp

@@ -18,6 +18,6 @@ namespace hpx::util {
     template <typename T>
     struct lazy_enable_if<true, T>
     {
-        using type = typename T::type;
+        using type = T::type;
     };
 }    // namespace hpx::util

libs/full/actions_base/include/hpx/actions_base/macros.hpp

@@ -292,7 +292,7 @@
 /// The parameter \a action is the type of the action to define the
 /// boilerplate for.
 ///
-/// The parameter \a actionname specifies an unique name of the action to be
+/// The parameter \a actionname specifies a unique name of the action to be
 /// used for serialization purposes.
 /// The second parameter has to be usable as a plain (nonqualified) C++
 /// identifier, it should not contain special characters which cannot be part
@@ -483,40 +483,50 @@
     /**/
 
 #define HPX_DEFINE_PLAIN_ACTION_1(func)                                        \
-    HPX_DEFINE_PLAIN_ACTION_2(func, HPX_PP_CAT(func, _action))                 \
+    HPX_DEFINE_PLAIN_ACTION_3(HPX_PP_EMPTY(), func, HPX_PP_CAT(func, _action)) \
+    /**/
+
+#define HPX_DEFINE_PLAIN_ACTION_2(func, name)                                  \
+    HPX_DEFINE_PLAIN_ACTION_3(HPX_PP_EMPTY(), func, name)                      \
     /**/
 
 #if defined(HPX_HAVE_CXX26_REFLECTION)
 // clang-format off
 /// When C++26 reflection is available, HPX_DEFINE_PLAIN_ACTION_2 uses
 /// reflect_action<^^func> instead of make_action_t. This eliminates the
 /// need for HPX_REGISTER_ACTION while keeping the same user-facing syntax.
-#define HPX_DEFINE_PLAIN_ACTION_2(func, name)                                  \
-    using name = hpx::actions::reflect_action<^^func>                          \
+#define HPX_DEFINE_PLAIN_ACTION_3(Prefix, func, name)                          \
+    Prefix using name = hpx::actions::reflect_action<^^func>                   \
     /**/
 // clang-format on
 #elif defined(__NVCC__) || defined(__CUDACC__)
-#define HPX_DEFINE_PLAIN_ACTION_2(func, name)                                  \
-    struct name                                                                \
+#define HPX_DEFINE_PLAIN_ACTION_3(Prefix, func, name)                          \
+    Prefix struct name                                                         \
       : hpx::actions::make_action<                                             \
             typename std::add_pointer<                                         \
                 typename std::remove_pointer<decltype(&func)>::type>::type,    \
             &func, name>::type                                                 \
     {                                                                          \
     } /**/
 #else
-#define HPX_DEFINE_PLAIN_ACTION_2(func, name)                                  \
-    struct name : hpx::actions::make_action_t<decltype(&func), &func, name>    \
+#define HPX_DEFINE_PLAIN_ACTION_3(Prefix, func, name)                          \
+    Prefix struct name                                                         \
+      : hpx::actions::make_action_t<decltype(&func), &func, name>              \
     {                                                                          \
     } /**/
 #endif
 
 #define HPX_DEFINE_PLAIN_DIRECT_ACTION_1(func)                                 \
-    HPX_DEFINE_PLAIN_DIRECT_ACTION_2(func, HPX_PP_CAT(func, _action))          \
+    HPX_DEFINE_PLAIN_DIRECT_ACTION_3(                                          \
+        HPX_PP_EMPTY(), func, HPX_PP_CAT(func, _action))                       \
     /**/
 
 #define HPX_DEFINE_PLAIN_DIRECT_ACTION_2(func, name)                           \
-    struct name                                                                \
+    HPX_DEFINE_PLAIN_DIRECT_ACTION_3(HPX_PP_EMPTY(), func, name)               \
+    /**/
+
+#define HPX_DEFINE_PLAIN_DIRECT_ACTION_3(Prefix, func, name)                   \
+    Prefix struct name                                                         \
       : hpx::actions::make_direct_action_t<decltype(&func), &func, name>       \
     {                                                                          \
     } /**/
@@ -597,7 +607,7 @@
 /// be encapsulated into a plain action. The parameter \p name is the name of
 /// the action type defined by this macro.
 ///
-/// The second parameter has to be usable as a plain (non-qualified) C++
+/// The second parameter has to be usable as a plain (nonqualified) C++
 /// identifier, it should not contain special characters which cannot be part of
 /// a C++ identifier, such as '<', '>', or ':'.
 ///

libs/full/agas/CMakeLists.txt

@@ -29,6 +29,7 @@ include(HPX_AddModule)
 add_hpx_module(
   full agas
   GLOBAL_HEADER_GEN ON
+  GLOBAL_HEADER_MODULE_GEN ON
   SOURCES ${agas_sources}
   HEADERS ${agas_headers}
   COMPAT_HEADERS ${agas_compat_headers}

libs/full/agas/include/hpx/agas/addressing_service.hpp

@@ -37,13 +37,13 @@
 
 #include <hpx/config/warnings_prefix.hpp>
 
-namespace hpx { namespace agas {
+namespace hpx::agas {
 
 #if defined(HPX_HAVE_NETWORKING)
-    HPX_EXPORT void destroy_big_boot_barrier();
+    HPX_CXX_EXPORT HPX_EXPORT void destroy_big_boot_barrier();
 #endif
 
-    struct addressing_service
+    HPX_CXX_EXPORT struct addressing_service
     {
     public:
         HPX_NON_COPYABLE(addressing_service);
@@ -115,7 +115,6 @@ namespace hpx { namespace agas {
 #if defined(HPX_HAVE_NETWORKING)
         ~addressing_service()
         {
-            // TODO: Free the future pools?
             destroy_big_boot_barrier();
         }
 #else
@@ -1217,7 +1216,6 @@ namespace hpx { namespace agas {
         // Pre-cache locality endpoints in hosted locality namespace
         void pre_cache_endpoints(std::vector<parcelset::endpoints_type> const&);
     };
-
-}}    // namespace hpx::agas
+}    // namespace hpx::agas
 
 #include <hpx/config/warnings_suffix.hpp>

libs/full/agas/include/hpx/agas/agas_fwd.hpp

@@ -14,12 +14,13 @@ namespace hpx {
 
     namespace agas {
 
-        struct HPX_EXPORT addressing_service;
+        HPX_CXX_EXPORT struct HPX_EXPORT addressing_service;
     }    // namespace agas
 
     namespace naming {
 
-        HPX_EXPORT agas::addressing_service& get_agas_client();
-        HPX_EXPORT agas::addressing_service* get_agas_client_ptr();
+        HPX_CXX_EXPORT HPX_EXPORT agas::addressing_service& get_agas_client();
+        HPX_CXX_EXPORT HPX_EXPORT agas::addressing_service*
+        get_agas_client_ptr();
     }    // namespace naming
 }    // namespace hpx

libs/full/agas/include/hpx/agas/state.hpp

@@ -9,8 +9,8 @@
 #include <hpx/config.hpp>
 #include <hpx/modules/threading_base.hpp>
 
-namespace hpx { namespace agas {
+namespace hpx::agas {
 
     // return whether resolver client is in state described by 'mask'
-    HPX_EXPORT bool router_is(state st);
-}}    // namespace hpx::agas
+    HPX_CXX_EXPORT HPX_EXPORT bool router_is(state st);
+}    // namespace hpx::agas