Merge pull request #6817 from STEllAR-GROUP/cuda_modules

Adapting HPX CUDA modules to C++ modules

Author: hkaiser

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>