Adapting modules hash, datastructures, memory

Signed-off-by: Hartmut Kaiser <[email protected]>

Author: hkaiser

cmake/HPX_AddModule.cmake

@@ -189,16 +189,12 @@ function(add_hpx_module libname modulename)
     endif()
 
     # Decide output path and template file
-    set(module_macro_headers)
+    set(module_macro_headers "\n#include <hpx/${modulename}/config/defines.hpp>\n")
     set(global_header
         "${CMAKE_CURRENT_BINARY_DIR}/include/hpx/modules/${modulename}.hpp"
     )
     if(${modulename}_GLOBAL_HEADER_MODULE_GEN)
       # generate list of macro headers to #include
-      list(LENGTH ${modulename}_MACRO_HEADERS macro_headers)
-      if(macro_headers GREATER 0)
-        set(module_macro_headers "\n")
-      endif()
       foreach(header_file ${${modulename}_MACRO_HEADERS})
         set(module_macro_headers
             "${module_macro_headers}#include <${header_file}>\n"

examples/throttle/throttle/server/throttle.hpp

@@ -8,11 +8,11 @@
 
 #include <hpx/config.hpp>
 #if !defined(HPX_COMPUTE_DEVICE_CODE)
-#include <hpx/datastructures/detail/dynamic_bitset.hpp>
 #include <hpx/future.hpp>
 #include <hpx/hpx.hpp>
 #include <hpx/include/actions.hpp>
 #include <hpx/include/components.hpp>
+#include <hpx/modules/datastructures.hpp>
 #include <hpx/mutex.hpp>
 
 #include <cstddef>

examples/tuplespace/central_tuplespace/server/tuple.hpp

@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <hpx/datastructures/serialization/serializable_any.hpp>
+#include <hpx/modules/datastructures.hpp>
 #include <hpx/modules/serialization.hpp>
 
 #include <type_traits>

init/CMakeLists.txt

@@ -51,14 +51,15 @@ add_library(hpx_init STATIC ${hpx_init_SOURCES} ${hpx_init_HEADERS})
 set_target_properties(hpx_init PROPERTIES POSITION_INDEPENDENT_CODE ON)
 target_link_libraries(hpx_init PRIVATE hpx_full)
 target_link_libraries(hpx_init PRIVATE hpx_private_flags)
-target_compile_definitions(
-  hpx_init PRIVATE HPX_APPLICATION_EXPORTS HPX_LIBRARY_EXPORTS
-                   HPX_BINARY_DOESNT_USE_CXX_MODULES
-)
+target_compile_definitions(hpx_init PRIVATE HPX_LIBRARY_EXPORTS)
 target_include_directories(
   hpx_init PUBLIC $<BUILD_INTERFACE:${hpx_init_HEADER_ROOT}>
                   $<INSTALL_INTERFACE:include>
 )
+if(HPX_WITH_CXX_MODULES)
+  target_link_libraries(hpx_init PRIVATE hpx_core_module_if)
+  set_target_properties(hpx_init PROPERTIES CXX_SCAN_FOR_MODULES ON)
+endif()
 
 set_property(TARGET hpx_init PROPERTY FOLDER "Core")
 

libs/core/affinity/src/parse_affinity_options.cpp

@@ -1,4 +1,4 @@
-//  Copyright (c) 2007-2024 Hartmut Kaiser
+//  Copyright (c) 2007-2025 Hartmut Kaiser
 //
 //  SPDX-License-Identifier: BSL-1.0
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
@@ -8,7 +8,7 @@
 #include <hpx/affinity/detail/partlit.hpp>
 #include <hpx/affinity/parse_affinity_options.hpp>
 #include <hpx/assert.hpp>
-#include <hpx/datastructures/tuple.hpp>
+#include <hpx/modules/datastructures.hpp>
 #include <hpx/modules/errors.hpp>
 #include <hpx/topology/topology.hpp>
 

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

@@ -9,10 +9,10 @@
 
 #include <hpx/config.hpp>
 #include <hpx/algorithms/traits/segmented_iterator_traits.hpp>
-#include <hpx/datastructures/tuple.hpp>
 #include <hpx/execution/executors/execution.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/type_support.hpp>
 #include <hpx/parallel/util/detail/algorithm_result.hpp>

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

@@ -737,11 +737,11 @@ namespace hpx { namespace experimental {
 
 #include <hpx/config.hpp>
 #include <hpx/assert.hpp>
-#include <hpx/datastructures/tuple.hpp>
 #include <hpx/execution/algorithms/detail/predicates.hpp>
 #include <hpx/iterator_support/range.hpp>
 #include <hpx/iterator_support/traits/is_iterator.hpp>
 #include <hpx/modules/concepts.hpp>
+#include <hpx/modules/datastructures.hpp>
 #include <hpx/modules/executors.hpp>
 #include <hpx/modules/tag_invoke.hpp>
 #include <hpx/modules/threading_base.hpp>

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

@@ -192,7 +192,6 @@ namespace hpx {
 #else    // DOXYGEN
 
 #include <hpx/config.hpp>
-#include <hpx/datastructures/tuple.hpp>
 #include <hpx/execution/executors/execution.hpp>
 #include <hpx/execution/executors/execution_parameters.hpp>
 #include <hpx/execution/traits/is_execution_policy.hpp>
@@ -201,6 +200,7 @@ namespace hpx {
 #include <hpx/futures/future.hpp>
 #include <hpx/iterator_support/traits/is_iterator.hpp>
 #include <hpx/modules/concepts.hpp>
+#include <hpx/modules/datastructures.hpp>
 #include <hpx/modules/tag_invoke.hpp>
 #include <hpx/modules/type_support.hpp>
 #include <hpx/parallel/algorithms/detail/dispatch.hpp>

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

@@ -282,13 +282,13 @@ namespace hpx {
 
 #include <hpx/config.hpp>
 #include <hpx/assert.hpp>
-#include <hpx/datastructures/tuple.hpp>
 #include <hpx/execution/algorithms/detail/predicates.hpp>
 #include <hpx/execution/executors/execution_parameters.hpp>
 #include <hpx/executors/execution_policy.hpp>
 #include <hpx/functional/invoke.hpp>
 #include <hpx/iterator_support/traits/is_iterator.hpp>
 #include <hpx/iterator_support/unwrap_iterator.hpp>
+#include <hpx/modules/datastructures.hpp>
 #include <hpx/modules/itt_notify.hpp>
 #include <hpx/modules/type_support.hpp>
 #include <hpx/parallel/algorithms/copy.hpp>

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

@@ -121,10 +121,10 @@ namespace hpx { namespace experimental {
 #else
 
 #include <hpx/config.hpp>
-#include <hpx/datastructures/tuple.hpp>
 #include <hpx/execution/executors/execution.hpp>
 #include <hpx/iterator_support/range.hpp>
 #include <hpx/iterator_support/transform_iterator.hpp>
+#include <hpx/modules/datastructures.hpp>
 #include <hpx/parallel/algorithms/for_each.hpp>
 #include <hpx/parallel/algorithms/inclusive_scan.hpp>
 #include <hpx/parallel/container_algorithms/copy.hpp>