Adapting HPX CUDA modules to C++ modules

CMakeLists.txt

@@ -1407,6 +1407,9 @@ if((HPX_WITH_NETWORKING AND HPX_WITH_PARCELPORT_MPI)
     # hpx_add_compile_flag() below does not add the extra options to the top
     # level directory
     hpx_add_config_define(OMPI_IMPORTS)
+    if(HPX_WITH_CUDA)
+      hpx_add_config_cond_define(NOMINMAX)
+    endif()
   endif()
 endif()
 

cmake/HPX_AddModule.cmake

@@ -351,8 +351,9 @@ function(add_hpx_module libname modulename)
     )
     set(generated_headers ${generated_headers} ${cache_line_size_file})
 
-    # Generate an empty placeholder file for hpx/config/std_headers.hpp This
-    # will be overwritten in libs/CMakeLists.txt with some real content.
+    # Generate empty placeholder files for hpx/config/std_headers.hpp and
+    # hpx/config/modules_enabled.hpp. Those will be overwritten in
+    # libs/CMakeLists.txt with some real content.
     if(HPX_WITH_CXX_MODULES)
       set(std_header_file
           "${CMAKE_CURRENT_BINARY_DIR}/include/hpx/config/std_headers.hpp"
@@ -361,6 +362,11 @@ function(add_hpx_module libname modulename)
       set(generated_headers ${generated_headers} ${std_header_file})
     endif()
 
+    set(modules_enabled_file
+        "${CMAKE_CURRENT_BINARY_DIR}/include/hpx/config/modules_enabled.hpp"
+    )
+    file(WRITE ${modules_enabled_file} "")
+    set(generated_headers ${generated_headers} ${modules_enabled_file})
   endif()
 
   # collect zombie generated headers

cmake/templates/std_headers.hpp.in

@@ -14,9 +14,6 @@
 #include <hpx/config/modules_enabled.hpp>
 
 @cxx_standard_headers@
-// Some standard headers include the following headers.
-#include <numeric>
-
 #if defined(HPX_HAVE_STDEXEC)
 # if defined(HPX_GCC_VERSION)
 #  pragma GCC diagnostic push
@@ -95,8 +92,33 @@
 // 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
 
+#if defined(HPX_HAVE_MODULE_THRUST)
+# include <hpx/thrust/thrust_headers.hpp>
+#endif
+
+#if defined(HPX_HAVE_MM_PREFETCH)
+# if defined(HPX_MSVC)
+#  include <intrin.h>
+# endif
+# if defined(HPX_GCC_VERSION)
+#  include <emmintrin.h>
+# endif
+#endif
+
+#if defined(HPX_HAVE_DATAPAR)
+# if defined(HPX_HAVE_DATAPAR_EVE)
+#  include <eve/eve.hpp>
+#  include <eve/memory/aligned_ptr.hpp>
+# endif
+# if defined(HPX_HAVE_DATAPAR_STD_EXPERIMENTAL_SIMD)
+#  include <experimental/simd>
+# endif
+# if defined(HPX_HAVE_DATAPAR_VC)
+#  include <Vc/Vc>
+#  include <Vc/global.h>
+# endif
 #endif

components/component_storage/include/hpx/components/component_storage/component_storage.hpp

@@ -8,8 +8,8 @@
 
 #include <hpx/config.hpp>
 #include <hpx/components/client_base.hpp>
-#include <hpx/modules/futures.hpp>
 #include <hpx/modules/async_base.hpp>
+#include <hpx/modules/futures.hpp>
 #include <hpx/naming_base/address.hpp>
 #include <hpx/naming_base/id_type.hpp>
 

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

@@ -14,9 +14,8 @@
 // http://lafstern.org/matt/segmented.pdf.
 
 #include <hpx/config.hpp>
-#include <hpx/algorithms/traits/is_value_proxy.hpp>
-#include <hpx/algorithms/traits/segmented_iterator_traits.hpp>
 #include <hpx/assert.hpp>
+#include <hpx/modules/algorithms.hpp>
 #include <hpx/modules/async_base.hpp>
 #include <hpx/modules/iterator_support.hpp>
 #include <hpx/naming_base/id_type.hpp>

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

@@ -9,10 +9,10 @@
 #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/modules/executors.hpp>
 #include <hpx/hpx_main.hpp>
 #include <hpx/include/partitioned_vector_predef.hpp>
 #include <hpx/include/partitioned_vector_view.hpp>
+#include <hpx/modules/executors.hpp>
 #include <hpx/modules/testing.hpp>
 #include <hpx/runtime_distributed/find_all_localities.hpp>
 

docs/sphinx/manual/creating_hpx_projects.rst

@@ -265,7 +265,12 @@ implicitly using ``main()`` as the entry point. If you want the same wrapping
 behavior without including :hpx-header:`wrap/include,hpx/hpx_main.hpp`, link to
 the ``HPX::auto_wrap_main`` target instead. This enables the runtime
 initialization around ``main()`` unconditionally and is useful for codebases
-where adding the header to ``main.cpp`` is impractical.
+where adding the header to ``main.cpp`` is impractical
+
+.. note::
+
+    The use of ``HPX::auto_wrap_main`` is not supported when using the
+    native Windows MSVC toolchain.
 
 If you want to use the facilities exposed by ``hpx::runtime_manager`` in binaries
 that were not linked as executables (e.g., in shared libraries), you will need

docs/sphinx/manual/executors.rst

@@ -53,7 +53,7 @@ Parallel Executor
 .. code-block:: c++
 
     #include <hpx/execution.hpp>
-    #include <hpx/parallel/algorithms/for_each.hpp>
+    #include <hpx/algorithm.hpp>
     #include <vector>
 
     std::vector<int> data(100, 1);
@@ -77,7 +77,7 @@ Fork-Join Executor
 .. code-block:: c++
 
     #include <hpx/execution.hpp>
-    #include <hpx/parallel/algorithms/for_each.hpp>
+    #include <hpx/algorithm.hpp>
     #include <vector>
 
     std::vector<int> data(100, 1);
@@ -103,7 +103,7 @@ Sequential Executor
 .. code-block:: c++
 
     #include <hpx/execution.hpp>
-    #include <hpx/parallel/algorithms/for_each.hpp>
+    #include <hpx/algorithm.hpp>
     #include <vector>
 
     std::vector<int> data(100, 1);

docs/sphinx/manual/starting_the_hpx_runtime.rst

@@ -59,6 +59,10 @@ you cannot or do not want to include ``hpx/hpx_main.hpp`` in ``main.cpp``, you
 can instead link against ``HPX::auto_wrap_main``. That target enables the same
 runtime startup path without needing the header-triggered opt-in.
 
+.. note::
+
+    The use of ``HPX::auto_wrap_main`` is not supported when using the
+    native Windows MSVC toolchain.
 
 .. note::
 

examples/quickstart/sort_by_key_demo.cpp

@@ -4,9 +4,9 @@
 //  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/algorithm.hpp>
 #include <hpx/execution.hpp>
 #include <hpx/init.hpp>
-#include <hpx/parallel/algorithms/sort_by_key.hpp>
 
 #include <cstddef>
 #include <iostream>

libs/CMakeLists.txt

@@ -184,21 +184,30 @@ add_library(hpx_interface_wrap_main INTERFACE)
 target_link_libraries(
   hpx_interface_wrap_main INTERFACE $<${_is_executable}:HPXInternal::hpx_wrap>
 )
-add_library(hpx_interface_auto_wrap_main INTERFACE)
-target_link_libraries(
-  hpx_interface_auto_wrap_main
-  INTERFACE $<${_is_executable}:HPXInternal::hpx_auto_wrap>
-)
 
 target_link_libraries(wrap_main INTERFACE hpx_interface_wrap_main)
-target_link_libraries(auto_wrap_main INTERFACE hpx_interface_auto_wrap_main)
 target_link_libraries(init INTERFACE HPXInternal::hpx_init)
 target_link_libraries(hpx INTERFACE hpx_interface)
 
-# HPX::component is to be linked privately to all HPX components NOTE: The
-# _is_library guard only prevents simple mistakes of linking HPX::component to
-# executables. It does not prevent linking it to libraries that are not
-# components.
+set(hpx_targets hpx wrap_main init plugin component)
+set(hpx_internal_targets hpx_full hpx_interface hpx_interface_wrap_main)
+
+if(NOT MSVC)
+  add_library(hpx_interface_auto_wrap_main INTERFACE)
+  target_link_libraries(
+    hpx_interface_auto_wrap_main
+    INTERFACE $<${_is_executable}:HPXInternal::hpx_auto_wrap>
+  )
+  target_link_libraries(auto_wrap_main INTERFACE hpx_interface_auto_wrap_main)
+  set(hpx_targets ${hpx_targets} auto_wrap_main)
+  set(hpx_internal_targets ${hpx_internal_targets} hpx_interface_auto_wrap_main)
+endif()
+
+# HPX::component is to be linked privately to all HPX components
+#
+# NOTE: The _is_library guard only prevents simple mistakes of linking
+# HPX::component to executables. It does not prevent linking it to libraries
+# that are not components.
 add_library(component INTERFACE)
 target_compile_definitions(
   component
@@ -219,11 +228,6 @@ target_compile_definitions(
     "$<${_is_library}:HPX_PLUGIN_NAME_DEFAULT=hpx_$<TARGET_PROPERTY:NAME>>"
 )
 
-set(hpx_targets hpx wrap_main auto_wrap_main init plugin component)
-set(hpx_internal_targets hpx_full hpx_interface hpx_interface_wrap_main
-                         hpx_interface_auto_wrap_main
-)
-
 # cmake-format: off
 install(
   TARGETS ${hpx_targets}

libs/core/algorithms/CMakeLists.txt

@@ -1,4 +1,4 @@
-# Copyright (c) 2019-2023 The STE||AR-Group
+# Copyright (c) 2019-2025 The STE||AR-Group
 #
 # SPDX-License-Identifier: BSL-1.0
 # Distributed under the Boost Software License, Version 1.0. (See accompanying
@@ -172,22 +172,6 @@ set(algorithms_headers
     hpx/parallel/container_algorithms/unique.hpp
     hpx/parallel/container_memory.hpp
     hpx/parallel/container_numeric.hpp
-    hpx/parallel/datapar.hpp
-    hpx/parallel/datapar/adjacent_difference.hpp
-    hpx/parallel/datapar/adjacent_find.hpp
-    hpx/parallel/datapar/equal.hpp
-    hpx/parallel/datapar/fill.hpp
-    hpx/parallel/datapar/find.hpp
-    hpx/parallel/datapar/generate.hpp
-    hpx/parallel/datapar/handle_local_exceptions.hpp
-    hpx/parallel/datapar/iterator_helpers.hpp
-    hpx/parallel/datapar/loop.hpp
-    hpx/parallel/datapar/mismatch.hpp
-    hpx/parallel/datapar/reduce.hpp
-    hpx/parallel/datapar/replace.hpp
-    hpx/parallel/datapar/transfer.hpp
-    hpx/parallel/datapar/transform_loop.hpp
-    hpx/parallel/datapar/zip_iterator.hpp
     hpx/parallel/memory.hpp
     hpx/parallel/numeric.hpp
     hpx/parallel/run_on_all.hpp
@@ -236,6 +220,28 @@ set(algorithms_headers
     hpx/parallel/util/zip_iterator.hpp
 )
 
+if(HPX_WITH_DATAPAR)
+  set(algorithms_headers
+      ${algorithms_headers}
+      hpx/parallel/datapar.hpp
+      hpx/parallel/datapar/adjacent_difference.hpp
+      hpx/parallel/datapar/adjacent_find.hpp
+      hpx/parallel/datapar/equal.hpp
+      hpx/parallel/datapar/fill.hpp
+      hpx/parallel/datapar/find.hpp
+      hpx/parallel/datapar/generate.hpp
+      hpx/parallel/datapar/handle_local_exceptions.hpp
+      hpx/parallel/datapar/iterator_helpers.hpp
+      hpx/parallel/datapar/loop.hpp
+      hpx/parallel/datapar/mismatch.hpp
+      hpx/parallel/datapar/reduce.hpp
+      hpx/parallel/datapar/replace.hpp
+      hpx/parallel/datapar/transfer.hpp
+      hpx/parallel/datapar/transform_loop.hpp
+      hpx/parallel/datapar/zip_iterator.hpp
+  )
+endif()
+
 # cmake-format: off
 set(algorithms_compat_headers
     hpx/algorithms.hpp => hpx/algorithm.hpp
@@ -252,8 +258,11 @@ set(algorithms_sources handle_exception_termination_handler.cpp task_group.cpp)
 include(HPX_AddModule)
 add_hpx_module(
   core algorithms
+  GLOBAL_HEADER_GEN ON
+  GLOBAL_HEADER_MODULE_GEN ON
   HEADERS ${algorithms_headers}
   COMPAT_HEADERS ${algorithms_compat_headers}
+  ADD_TO_GLOBAL_HEADER "hpx/parallel/util/detail/handle_remote_exceptions.hpp"
   SOURCES ${algorithms_sources}
   MODULE_DEPENDENCIES
     hpx_async_combinators

libs/core/algorithms/include/hpx/algorithms/traits/is_pair.hpp

@@ -1,18 +1,20 @@
-//  Copyright (c) 2023 Hartmut Kaiser
+//  Copyright (c) 2023-2025 Hartmut Kaiser
 //
 //  SPDX-License-Identifier: BSL-1.0
 //  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)
 
 #pragma once
 
+#include <hpx/config.hpp>
+
 #include <utility>
 
 namespace hpx::traits {
 
-    template <typename T>
+    HPX_CXX_EXPORT template <typename T>
     inline constexpr bool is_pair_v = false;
 
-    template <typename T1, typename T2>
+    HPX_CXX_EXPORT template <typename T1, typename T2>
     inline constexpr bool is_pair_v<std::pair<T1, T2>> = true;
 }    // namespace hpx::traits

libs/core/algorithms/include/hpx/algorithms/traits/is_value_proxy.hpp

@@ -8,24 +8,26 @@
 
 #pragma once
 
+#include <hpx/config.hpp>
+
 #include <type_traits>
 
 namespace hpx::traits {
 
-    template <typename T>
+    HPX_CXX_EXPORT template <typename T>
     struct is_value_proxy : std::false_type
     {
     };
 
-    template <typename T>
+    HPX_CXX_EXPORT template <typename T>
     inline constexpr bool is_value_proxy_v = is_value_proxy<T>::value;
 
-    template <typename T>
+    HPX_CXX_EXPORT template <typename T>
     struct proxy_value
     {
         using type = T;
     };
 
-    template <typename T>
+    HPX_CXX_EXPORT template <typename T>
     using proxy_value_t = typename proxy_value<T>::type;
 }    // namespace hpx::traits