Adapting HPX modules of levels 16, 17, and 18 to C++ modules

Signed-off-by: Hartmut Kaiser <hartmut.kaiser@gmail.com>

Author: hkaiser

.jenkins/lsu-perftests/ctest.cmake

@@ -6,7 +6,7 @@
 # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 # This is a dummy file to trigger the upload of the perftests reports
-cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.19 FATAL_ERROR)
 
 set(CTEST_TEST_TIMEOUT 300)
 set(CTEST_BUILD_PARALLELISM 20)

.jenkins/lsu/ctest.cmake

@@ -5,7 +5,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)
 
-cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.19 FATAL_ERROR)
 
 set(CTEST_TEST_TIMEOUT 300)
 set(CTEST_BUILD_PARALLELISM 20)
@@ -65,6 +65,7 @@ if(NOT CTEST_BUILD_ID AND __ctest_build_id)
   set(CTEST_BUILD_ID ${__ctest_build_id})
 endif()
 set(ctest_submission_result ${ctest_submission_result} "Configure: "
+
                             ${__configure_result} "\n"
 )
 

libs/core/affinity/CMakeLists.txt

@@ -26,6 +26,7 @@ include(HPX_AddModule)
 add_hpx_module(
   core affinity
   GLOBAL_HEADER_GEN ON
+  GLOBAL_HEADER_MODULE_GEN ON
   SOURCES ${affinity_sources}
   HEADERS ${affinity_headers}
   COMPAT_HEADERS ${affinity_compat_headers}

libs/core/affinity/include/hpx/affinity/affinity_data.hpp

@@ -7,7 +7,7 @@
 #pragma once
 
 #include <hpx/config.hpp>
-#include <hpx/topology/topology.hpp>
+#include <hpx/modules/topology.hpp>
 
 #include <atomic>
 #include <cstddef>
@@ -21,7 +21,7 @@ namespace hpx::threads::policies::detail {
     ///////////////////////////////////////////////////////////////////////////
     // Structure holding the information related to thread affinity selection
     // for the shepherd threads of this instance
-    struct HPX_CORE_EXPORT affinity_data
+    HPX_CXX_EXPORT struct HPX_CORE_EXPORT affinity_data
     {
         affinity_data();
 

libs/core/affinity/include/hpx/affinity/parse_affinity_options.hpp

@@ -12,7 +12,7 @@
 
 #include <hpx/config.hpp>
 #include <hpx/modules/errors.hpp>
-#include <hpx/topology/cpu_mask.hpp>
+#include <hpx/modules/topology.hpp>
 
 #include <cstddef>
 #include <string>
@@ -22,14 +22,14 @@
 
 namespace hpx::threads {
 
-    HPX_CORE_EXPORT void parse_affinity_options(std::string const& spec,
-        std::vector<mask_type>& affinities, std::size_t used_cores,
-        std::size_t max_cores, std::size_t num_threads,
+    HPX_CXX_EXPORT HPX_CORE_EXPORT void parse_affinity_options(
+        std::string const& spec, std::vector<mask_type>& affinities,
+        std::size_t used_cores, std::size_t max_cores, std::size_t num_threads,
         std::vector<std::size_t>& num_pus, bool use_process_mask,
         error_code& ec = throws);
 
     // backwards compatibility helper
-    inline void parse_affinity_options(std::string const& spec,
+    HPX_CXX_EXPORT inline void parse_affinity_options(std::string const& spec,
         std::vector<mask_type>& affinities, error_code& ec = throws)
     {
         std::vector<std::size_t> num_pus;

libs/core/affinity/src/affinity_data.cpp

@@ -8,8 +8,7 @@
 #include <hpx/affinity/parse_affinity_options.hpp>
 #include <hpx/assert.hpp>
 #include <hpx/modules/errors.hpp>
-#include <hpx/topology/cpu_mask.hpp>
-#include <hpx/topology/topology.hpp>
+#include <hpx/modules/topology.hpp>
 
 #include <algorithm>
 #include <atomic>

libs/core/affinity/src/parse_affinity_options.cpp

@@ -10,7 +10,7 @@
 #include <hpx/assert.hpp>
 #include <hpx/modules/datastructures.hpp>
 #include <hpx/modules/errors.hpp>
-#include <hpx/topology/topology.hpp>
+#include <hpx/modules/topology.hpp>
 
 #include <hwloc.h>
 

libs/core/command_line_handling_local/CMakeLists.txt

@@ -1,4 +1,4 @@
-# Copyright (c) 2019-2024 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
@@ -62,6 +62,7 @@ include(HPX_AddModule)
 add_hpx_module(
   core command_line_handling_local
   GLOBAL_HEADER_GEN ON
+  GLOBAL_HEADER_MODULE_GEN ON
   SOURCES ${command_line_handling_local_sources}
   HEADERS ${command_line_handling_local_headers}
   DEPENDENCIES ${command_line_handling_local_dependencies}

libs/core/command_line_handling_local/include/hpx/command_line_handling_local/command_line_handling_local.hpp

@@ -21,7 +21,7 @@
 namespace hpx::local::detail {
 
     ///////////////////////////////////////////////////////////////////////////
-    struct HPX_CORE_EXPORT command_line_handling
+    HPX_CXX_EXPORT struct HPX_CORE_EXPORT command_line_handling
     {
         command_line_handling(hpx::util::runtime_configuration rtcfg,
             std::vector<std::string> ini_config,
@@ -89,25 +89,26 @@ namespace hpx::local::detail {
     };
 
     ///////////////////////////////////////////////////////////////////////////
-    HPX_CORE_EXPORT std::string runtime_configuration_string(
+    HPX_CXX_EXPORT HPX_CORE_EXPORT std::string runtime_configuration_string(
         command_line_handling const& cfg);
 
-    HPX_CORE_EXPORT std::vector<std::string> prepend_options(
+    HPX_CXX_EXPORT HPX_CORE_EXPORT std::vector<std::string> prepend_options(
         std::vector<std::string>&& args, std::string&& options);
 
-    HPX_CORE_EXPORT std::string convert_to_log_file(std::string const& dest);
+    HPX_CXX_EXPORT HPX_CORE_EXPORT std::string convert_to_log_file(
+        std::string const& dest);
 
-    HPX_CORE_EXPORT std::size_t handle_num_cores_default(
+    HPX_CXX_EXPORT HPX_CORE_EXPORT std::size_t handle_num_cores_default(
         util::manage_config& cfgmap,
         hpx::program_options::variables_map const& vm, std::size_t num_threads,
         std::size_t num_default_cores);
 
-    HPX_CORE_EXPORT std::size_t get_number_of_default_threads(
+    HPX_CXX_EXPORT HPX_CORE_EXPORT std::size_t get_number_of_default_threads(
         bool use_process_mask);
-    HPX_CORE_EXPORT std::size_t get_number_of_default_cores(
+    HPX_CXX_EXPORT HPX_CORE_EXPORT std::size_t get_number_of_default_cores(
         bool use_process_mask);
 
-    HPX_CORE_EXPORT void print_config(
+    HPX_CXX_EXPORT HPX_CORE_EXPORT void print_config(
         std::vector<std::string> const& ini_config);
 }    // namespace hpx::local::detail
 

libs/core/command_line_handling_local/include/hpx/command_line_handling_local/json_config_file.hpp

@@ -17,7 +17,8 @@
 
 namespace hpx::local::detail {
 
-    HPX_CORE_EXPORT std::vector<std::string> read_json_config_file_options(
+    HPX_CXX_EXPORT HPX_CORE_EXPORT std::vector<std::string>
+    read_json_config_file_options(
         std::string const& filename, util::commandline_error_mode error_mode);
 
 }    // namespace hpx::local::detail