Adapting HPX networking base modules to C++ modules

cmake/HPX_SetupDatapar.cmake

@@ -52,7 +52,7 @@ if("${HPX_WITH_DATAPAR_BACKEND}" STREQUAL "EVE")
     ADVANCED
   )
   hpx_option(
-    HPX_WITH_EVE_TAG STRING "Eve repository tag or branch" "v2023.02.15"
+    HPX_WITH_Eve_TAG STRING "Eve repository tag or branch" "v2023.02.15"
     CATEGORY "Build Targets"
     ADVANCED
   )

cmake/HPX_SetupEve.cmake

@@ -29,7 +29,7 @@ if(("${HPX_WITH_DATAPAR_BACKEND}" STREQUAL "EVE") AND NOT TARGET eve::eve)
     fetchcontent_declare(
       eve
       GIT_REPOSITORY https://github.com/jfalcou/eve.git
-      GIT_TAG ${HPX_WITH_EVE_TAG}
+      GIT_TAG ${HPX_WITH_Eve_TAG}
     )
 
     fetchcontent_getproperties(eve)

cmake/templates/std_headers.hpp.in

@@ -11,6 +11,7 @@
 
 #include <hpx/config/defines.hpp>
 #include <hpx/config/compiler_specific.hpp>
+#include <hpx/config/modules_enabled.hpp>
 
 @cxx_standard_headers@
 // Some standard headers include the following headers.
@@ -57,14 +58,45 @@
 # include <generator>
 #endif
 
-#if defined(__GNUG__)
+#if defined(HPX_GCC_VERSION)
 # include <cxxabi.h>
 #endif
 
 #if defined(HPX_WINDOWS)
-#include <excpt.h>
-#undef exception_info
+# include <excpt.h>
+# undef exception_info
 #endif
 
 #include <asio.hpp>
 #include <hwloc.h>
+
+// Include MPI headers if required
+#if (defined(HPX_HAVE_NETWORKING) && defined(HPX_HAVE_PARCELPORT_MPI)) ||      \
+    defined(HPX_HAVE_MODULE_MPI_BASE)
+
+# if defined(HPX_CLANG_VERSION)
+#  pragma clang diagnostic push
+#  pragma clang diagnostic ignored "-Wcast-qual"
+# elif defined(HPX_GCC_VERSION)
+#  pragma GCC diagnostic push
+#  pragma GCC diagnostic ignored "-Wcast-qual"
+# endif
+
+# include <mpi.h>
+
+# if defined(HPX_GCC_VERSION)
+#  pragma GCC diagnostic pop
+# elif defined(HPX_CLANG_VERSION)
+#  pragma clang diagnostic pop
+# endif
+
+#endif
+
+// Include LCI headers if required
+#if (defined(HPX_HAVE_NETWORKING) && defined(HPX_HAVE_PARCELPORT_LCI)) ||      \
+    defined(HPX_HAVE_MODULE_LCI_BASE)
+
+# include "lci.hpp"
+# include "lct.h"
+
+#endif

components/component_storage/src/component_module.cpp

@@ -13,6 +13,8 @@
 
 #include <hpx/components/component_storage/server/migrate_to_storage.hpp>
 
+#include <hpx/config/warnings_prefix.hpp>
+
 ///////////////////////////////////////////////////////////////////////////////
 // Add factory registration functionality.
 HPX_REGISTER_COMPONENT_MODULE()

components/component_storage/src/component_storage.cpp

@@ -16,6 +16,8 @@
 #include <utility>
 #include <vector>
 
+#include <hpx/config/warnings_prefix.hpp>
+
 namespace hpx { namespace components {
     component_storage::component_storage(hpx::id_type target_locality)
       : base_type(hpx::new_<server::component_storage>(target_locality))

components/component_storage/src/server/component_storage_server.cpp

@@ -11,6 +11,8 @@
 
 #include <vector>
 
+#include <hpx/config/warnings_prefix.hpp>
+
 namespace hpx { namespace components { namespace server {
     component_storage::component_storage()
       : data_(container_layout(find_all_localities()))

components/containers/partitioned_vector/include/hpx/components/containers/partitioned_vector/detail/view_element.hpp

@@ -13,8 +13,8 @@
 #include <hpx/components/containers/partitioned_vector/partitioned_vector_component_decl.hpp>
 #include <hpx/components/containers/partitioned_vector/partitioned_vector_segmented_iterator.hpp>
 #include <hpx/modules/async_base.hpp>
+#include <hpx/modules/runtime_local.hpp>
 #include <hpx/naming_base/id_type.hpp>
-#include <hpx/runtime_local/get_locality_id.hpp>
 
 #include <cstddef>
 #include <cstdint>

components/containers/partitioned_vector/src/partitioned_vector_component_double.cpp

@@ -16,6 +16,8 @@
 
 #include <vector>
 
+#include <hpx/config/warnings_prefix.hpp>
+
 HPX_REGISTER_PARTITIONED_VECTOR(double)
 
 // an out-of-line definition of a member of a class template cannot have default

components/containers/partitioned_vector/src/partitioned_vector_component_int.cpp

@@ -16,6 +16,8 @@
 
 #include <vector>
 
+#include <hpx/config/warnings_prefix.hpp>
+
 HPX_REGISTER_PARTITIONED_VECTOR(int)
 using long_long = long long;
 HPX_REGISTER_PARTITIONED_VECTOR(long_long)

components/containers/partitioned_vector/src/partitioned_vector_component_std_string.cpp

@@ -19,6 +19,8 @@
 
 using std_string = std::string;
 
+#include <hpx/config/warnings_prefix.hpp>
+
 HPX_REGISTER_PARTITIONED_VECTOR(std_string)
 
 // an out-of-line definition of a member of a class template cannot have default

components/containers/partitioned_vector/tests/unit/partitioned_vector_view.cpp

@@ -9,7 +9,7 @@
 #include <hpx/collectives/spmd_block.hpp>
 #include <hpx/components/containers/partitioned_vector/partitioned_vector_local_view.hpp>
 #include <hpx/components/containers/partitioned_vector/partitioned_vector_view.hpp>
-#include <hpx/executors/execution_policy.hpp>
+#include <hpx/modules/executors.hpp>
 #include <hpx/hpx_main.hpp>
 #include <hpx/include/partitioned_vector_predef.hpp>
 #include <hpx/include/partitioned_vector_view.hpp>

components/containers/unordered/src/partition_unordered_map_component.cpp

@@ -15,6 +15,8 @@
 #include <hpx/components/containers/unordered/partition_unordered_map_component.hpp>
 #include <hpx/components/containers/unordered/unordered_map.hpp>
 
+#include <hpx/config/warnings_prefix.hpp>
+
 HPX_DISTRIBUTED_METADATA(hpx::server::unordered_map_config_data,
     hpx_server_unordered_map_config_data)
 

components/iostreams/src/component_module.cpp

@@ -12,9 +12,8 @@
 #include <hpx/components_base/component_type.hpp>
 #include <hpx/components_base/server/component.hpp>
 #include <hpx/modules/functional.hpp>
+#include <hpx/modules/runtime_local.hpp>
 #include <hpx/runtime_components/component_factory.hpp>
-#include <hpx/runtime_local/shutdown_function.hpp>
-#include <hpx/runtime_local/startup_function.hpp>
 
 #include <hpx/components/iostreams/ostream.hpp>
 #include <hpx/components/iostreams/server/output_stream.hpp>

components/iostreams/src/standard_streams.cpp

@@ -26,6 +26,8 @@
 #include <string>
 #include <type_traits>
 
+#include <hpx/config/warnings_prefix.hpp>
+
 ///////////////////////////////////////////////////////////////////////////////
 namespace hpx { namespace iostreams { namespace detail {
     std::ostream& get_coutstream() noexcept

components/performance_counters/io/src/io_counters.cpp

@@ -10,8 +10,8 @@
 #include <hpx/modules/format.hpp>
 #include <hpx/modules/functional.hpp>
 #include <hpx/modules/runtime_configuration.hpp>
+#include <hpx/modules/runtime_local.hpp>
 #include <hpx/performance_counters/manage_counter_type.hpp>
-#include <hpx/runtime_local/startup_function.hpp>
 
 #include <hpx/components/performance_counters/io/io_counters.hpp>
 

components/performance_counters/memory_counters/src/memory.cpp

@@ -9,8 +9,8 @@
 #include <hpx/components_base/component_startup_shutdown.hpp>
 #include <hpx/modules/functional.hpp>
 #include <hpx/modules/runtime_configuration.hpp>
+#include <hpx/modules/runtime_local.hpp>
 #include <hpx/performance_counters/manage_counter_type.hpp>
-#include <hpx/runtime_local/startup_function.hpp>
 
 #include <hpx/components/performance_counters/memory_counters/mem_counter.hpp>
 

components/performance_counters/papi/include/hpx/components/performance_counters/papi/server/papi.hpp

@@ -12,8 +12,8 @@
 #if defined(HPX_HAVE_PAPI)
 
 #include <hpx/components_base/server/component_base.hpp>
+#include <hpx/modules/runtime_local.hpp>
 #include <hpx/performance_counters/server/base_performance_counter.hpp>
-#include <hpx/runtime_local/interval_timer.hpp>
 
 #include <cstdint>
 #include <map>

components/performance_counters/papi/src/papi_startup.cpp

@@ -17,13 +17,11 @@
 #include <hpx/modules/errors.hpp>
 #include <hpx/modules/functional.hpp>
 #include <hpx/modules/iterator_support.hpp>
+#include <hpx/modules/program_options.hpp>
 #include <hpx/modules/runtime_configuration.hpp>
 #include <hpx/modules/runtime_local.hpp>
 #include <hpx/performance_counters/counter_creators.hpp>
 #include <hpx/performance_counters/manage_counter_type.hpp>
-#include <hpx/runtime_local/thread_mapper.hpp>
-
-#include <hpx/modules/program_options.hpp>
 
 #include <cctype>
 #include <cstdint>

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

@@ -18,7 +18,6 @@
 #include <hpx/modules/timing.hpp>
 #include <hpx/modules/type_support.hpp>
 #include <hpx/runtime_components/derived_component_factory.hpp>
-#include <hpx/runtime_local/thread_mapper.hpp>
 
 #include <boost/version.hpp>
 

components/performance_counters/power/src/power.cpp

@@ -8,8 +8,8 @@
 #include <hpx/components_base/component_startup_shutdown.hpp>
 #include <hpx/modules/functional.hpp>
 #include <hpx/modules/runtime_configuration.hpp>
+#include <hpx/modules/runtime_local.hpp>
 #include <hpx/performance_counters/manage_counter_type.hpp>
-#include <hpx/runtime_local/startup_function.hpp>
 
 #include <hpx/components/performance_counters/power/power_counter.hpp>
 

components/process/src/server/child_component.cpp

@@ -4,7 +4,7 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/runtime_local/run_as_os_thread.hpp>
+#include <hpx/modules/runtime_local.hpp>
 
 #include <hpx/components/process/child.hpp>
 #include <hpx/components/process/server/child.hpp>

examples/heartbeat/heartbeat.cpp

@@ -18,7 +18,7 @@
 #include <hpx/include/threadmanager.hpp>
 #include <hpx/modules/actions_base.hpp>
 #include <hpx/modules/format.hpp>
-#include <hpx/runtime_local/state.hpp>
+#include <hpx/modules/runtime_local.hpp>
 
 #include <cstdint>
 #include <iostream>

examples/performance_counters/sine/sine.cpp

@@ -9,7 +9,7 @@
 #include <hpx/hpx.hpp>
 #include <hpx/include/performance_counters.hpp>
 #include <hpx/include/util.hpp>
-#include <hpx/runtime_local/startup_function.hpp>
+#include <hpx/modules/runtime_local.hpp>
 
 #include <cstdint>
 

examples/quickstart/interest_calculator.cpp

@@ -19,8 +19,8 @@
 #include <hpx/hpx.hpp>
 #include <hpx/hpx_init.hpp>
 
-#include <hpx/async_local/dataflow.hpp>
 #include <hpx/modules/actions_base.hpp>
+#include <hpx/modules/async_local.hpp>
 
 #include <iostream>
 

init/src/hpx_main.cpp

@@ -7,7 +7,7 @@
 #include <hpx/config.hpp>
 #include <hpx/hpx_init.hpp>
 #include <hpx/modules/program_options.hpp>
-#include <hpx/runtime_local/config_entry.hpp>
+#include <hpx/modules/runtime_local.hpp>
 
 #include <cstddef>
 #include <string>

init/src/hpx_main_argc_argv.cpp

@@ -4,8 +4,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/hpx_init.hpp>
 #include <hpx/hpx_finalize.hpp>
+#include <hpx/hpx_init.hpp>
 
 ///////////////////////////////////////////////////////////////////////////////
 // Forwarding of hpx_main, if necessary. This has to be in a separate

init/src/hpx_user_main_argc_argv.cpp

@@ -6,7 +6,7 @@
 
 #include <hpx/hpx_init.hpp>
 #include <hpx/modules/errors.hpp>
-#include <hpx/runtime_local/config_entry.hpp>
+#include <hpx/modules/runtime_local.hpp>
 
 #include <iostream>
 #include <string>

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

@@ -123,9 +123,9 @@ namespace hpx {
 #else
 
 #include <hpx/config.hpp>
-#include <hpx/executors/execution_policy.hpp>
 #include <hpx/modules/coroutines.hpp>
 #include <hpx/modules/execution.hpp>
+#include <hpx/modules/executors.hpp>
 #include <hpx/modules/iterator_support.hpp>
 #include <hpx/modules/type_support.hpp>
 #include <hpx/parallel/algorithms/adjacent_find.hpp>

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

@@ -327,8 +327,8 @@ namespace hpx {
 
 #include <hpx/config.hpp>
 #include <hpx/algorithms/traits/projected.hpp>
-#include <hpx/executors/execution_policy.hpp>
 #include <hpx/modules/concepts.hpp>
+#include <hpx/modules/executors.hpp>
 #include <hpx/modules/iterator_support.hpp>
 #include <hpx/modules/type_support.hpp>
 #include <hpx/parallel/algorithms/detail/dispatch.hpp>

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

@@ -315,8 +315,8 @@ namespace hpx {
 #include <hpx/modules/iterator_support.hpp>
 #include <hpx/parallel/util/detail/sender_util.hpp>
 
-#include <hpx/executors/execution_policy.hpp>
 #include <hpx/modules/execution.hpp>
+#include <hpx/modules/executors.hpp>
 #include <hpx/modules/type_support.hpp>
 #include <hpx/parallel/algorithms/detail/dispatch.hpp>
 #include <hpx/parallel/algorithms/detail/distance.hpp>

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

@@ -203,9 +203,9 @@ namespace hpx {
 #else    // DOXYGEN
 
 #include <hpx/config.hpp>
-#include <hpx/executors/execution_policy.hpp>
 #include <hpx/modules/concepts.hpp>
 #include <hpx/modules/execution.hpp>
+#include <hpx/modules/executors.hpp>
 #include <hpx/modules/functional.hpp>
 #include <hpx/modules/iterator_support.hpp>
 #include <hpx/modules/pack_traversal.hpp>

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

@@ -154,8 +154,8 @@ namespace hpx {
 #include <hpx/modules/iterator_support.hpp>
 #include <hpx/parallel/util/detail/sender_util.hpp>
 
-#include <hpx/executors/execution_policy.hpp>
 #include <hpx/modules/execution.hpp>
+#include <hpx/modules/executors.hpp>
 #include <hpx/modules/type_support.hpp>
 #include <hpx/parallel/algorithms/detail/dispatch.hpp>
 #include <hpx/parallel/algorithms/detail/distance.hpp>

libs/core/algorithms/include/hpx/parallel/algorithms/detail/dispatch.hpp

@@ -9,11 +9,10 @@
 
 #include <hpx/config.hpp>
 #include <hpx/algorithms/traits/segmented_iterator_traits.hpp>
-#include <hpx/executors/exception_list.hpp>
-#include <hpx/executors/execution_policy.hpp>
 #include <hpx/modules/datastructures.hpp>
 #include <hpx/modules/errors.hpp>
 #include <hpx/modules/execution.hpp>
+#include <hpx/modules/executors.hpp>
 #include <hpx/modules/type_support.hpp>
 #include <hpx/parallel/util/detail/algorithm_result.hpp>
 #include <hpx/parallel/util/detail/scoped_executor_parameters.hpp>

libs/core/algorithms/include/hpx/parallel/algorithms/detail/generate.hpp

@@ -7,7 +7,7 @@
 #pragma once
 
 #include <hpx/config.hpp>
-#include <hpx/executors/execution_policy.hpp>
+#include <hpx/modules/executors.hpp>
 #include <hpx/modules/tag_invoke.hpp>
 #include <hpx/parallel/util/loop.hpp>
 

libs/core/algorithms/include/hpx/parallel/algorithms/detail/parallel_stable_sort.hpp

@@ -8,7 +8,7 @@
 #pragma once
 
 #include <hpx/assert.hpp>
-#include <hpx/executors/exception_list.hpp>
+#include <hpx/modules/executors.hpp>
 #include <hpx/parallel/algorithms/detail/sample_sort.hpp>
 
 #include <cstddef>

libs/core/algorithms/include/hpx/parallel/algorithms/detail/set_operation.hpp

@@ -10,7 +10,7 @@
 #include <hpx/assert.hpp>
 #include <hpx/modules/functional.hpp>
 
-#include <hpx/executors/execution_policy.hpp>
+#include <hpx/modules/executors.hpp>
 #include <hpx/modules/type_support.hpp>
 #include <hpx/parallel/algorithms/detail/distance.hpp>
 #include <hpx/parallel/algorithms/detail/upper_lower_bound.hpp>