Merge branch 'master' of github.com:STEllAR-GROUP/hpx into release-1.9.X

STEllAR-GROUP · May 1, 2023 · 9f79a3c · 9f79a3c
2 parents 7476fc8 + 8a577a9
commit 9f79a3c
Show file tree

Hide file tree

Showing 218 changed files with 3,048 additions and 2,099 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -244,6 +244,7 @@ jobs:
                 -DHPX_WITH_TESTS_DEBUG_LOG_DESTINATION=/hpx/build/debug-log.txt \
                 -DHPX_WITH_SPINLOCK_DEADLOCK_DETECTION=On \
                 -DHPX_WITH_CHECK_MODULE_DEPENDENCIES=On \
+                -DHPX_LOGGING_WITH_SEPARATE_DESTINATIONS=Off \
                 -DCMAKE_EXPORT_COMPILE_COMMANDS=On \
                 -DHPX_WITH_DOCUMENTATION=On \
                 -DHPX_WITH_DOCUMENTATION_OUTPUT_FORMATS="${DOCUMENTATION_OUTPUT_FORMATS}"

diff --git a/.cmake-format.py b/.cmake-format.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2022 Hartmut Kaiser
+# Copyright (c) 2020-2023 Hartmut Kaiser
 #
 # SPDX-License-Identifier: BSL-1.0
 # Distributed under the Boost Software License, Version 1.0. (See accompanying
@@ -238,6 +238,7 @@
                                        'HEADER_ROOT': 1,
                                        'INI': 1,
                                        'INSTALL_SUFFIX': 1,
+                                       'INSTALL_COMPONENT': 1,
                                        'LANGUAGE': 1,
                                        'LINK_FLAGS': '+',
                                        'OUTPUT_SUFFIX': 1,

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,5 +1,5 @@
 # Copyright (c)      2020 Mikael Simberg
-# Copyright (c) 2007-2022 Hartmut Kaiser
+# Copyright (c) 2007-2023 Hartmut Kaiser
 # Copyright (c) 2011-2014 Thomas Heller
 # Copyright (c) 2007-2008 Chirag Dekate
 # Copyright (c)      2011 Bryce Lelbach
@@ -2439,7 +2439,7 @@ if(PYTHONINTERP_FOUND)
   install(
     FILES "${PROJECT_BINARY_DIR}/bin/hpxrun.py"
     DESTINATION ${CMAKE_INSTALL_BINDIR}
-    COMPONENT core
+    COMPONENT runtime
     PERMISSIONS
       OWNER_READ
       OWNER_WRITE
@@ -2485,18 +2485,6 @@ install(
   PATTERN ".git" EXCLUDE
 )
 
-if("${HPX_PLATFORM_UC}" STREQUAL "XEONPHI")
-  # FIXME: push changes upstream
-  install(
-    DIRECTORY external/asio/boost
-    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/hpx/external
-    COMPONENT core
-    FILES_MATCHING
-    PATTERN "*.hpp"
-    PATTERN ".git" EXCLUDE
-  )
-endif()
-
 install(
   FILES "${PROJECT_SOURCE_DIR}/LICENSE_1_0.txt"
   DESTINATION ${CMAKE_INSTALL_DATADIR}/hpx
@@ -2581,12 +2569,13 @@ include(HPX_PrintSummary)
 create_configuration_summary("Configuration summary:\n--" "hpx")
 
 include(HPX_ExportTargets)
+
 # Modules can't link to this if not exported
 install(
   TARGETS hpx_base_libraries
   EXPORT HPXInternalTargets
-  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT hpx_base_libraries
+  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT hpx_base_libraries
   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT hpx_base_libraries
 )
 hpx_export_internal_targets(hpx_base_libraries)

diff --git a/cmake/HPX_AddComponent.cmake b/cmake/HPX_AddComponent.cmake
@@ -1,4 +1,4 @@
-# Copyright (c) 2007-2012 Hartmut Kaiser
+# Copyright (c) 2007-2023 Hartmut Kaiser
 # Copyright (c) 2011      Bryce Lelbach
 #
 # SPDX-License-Identifier: BSL-1.0
@@ -28,6 +28,7 @@ function(add_hpx_component name)
       HEADER_GLOB
       OUTPUT_SUFFIX
       INSTALL_SUFFIX
+      INSTALL_COMPONENT
       LANGUAGE
   )
   set(multi_value_args
@@ -191,12 +192,15 @@ function(add_hpx_component name)
       set(archive_install_destination ${${name}_INSTALL_SUFFIX})
       set(runtime_install_destination ${${name}_INSTALL_SUFFIX})
     endif()
+    if(${name}_INSTALL_COMPONENT)
+      set(install_component COMPONENT ${${name}_INSTALL_COMPONENT})
+    endif()
     # cmake-format: off
     set(_target_flags
         INSTALL INSTALL_FLAGS
-          LIBRARY DESTINATION ${library_install_destination}
-          ARCHIVE DESTINATION ${archive_install_destination}
-          RUNTIME DESTINATION ${runtime_install_destination}
+          LIBRARY DESTINATION ${library_install_destination} ${install_component}
+          ARCHIVE DESTINATION ${archive_install_destination} ${install_component}
+          RUNTIME DESTINATION ${runtime_install_destination} ${install_component}
     )
     # cmake-format: on
 
@@ -210,6 +214,7 @@ function(add_hpx_component name)
           ${_target_flags}
           INSTALL_PDB $<TARGET_PDB_FILE:${name}_component>
             DESTINATION ${runtime_install_destination}
+            ${install_component}
           CONFIGURATIONS Debug RelWithDebInfo
           OPTIONAL
       )

diff --git a/cmake/HPX_AddConfigTest.cmake b/cmake/HPX_AddConfigTest.cmake
@@ -587,6 +587,15 @@ function(hpx_check_for_cxx20_std_default_sentinel)
   )
 endfunction()
 
+# ##############################################################################
+function(hpx_check_for_cxx20_std_bit_cast)
+  add_hpx_config_test(
+    HPX_WITH_CXX20_STD_BIT_CAST
+    SOURCE cmake/tests/cxx20_std_bit_cast.cpp
+    FILE ${ARGN}
+  )
+endfunction()
+
 # ##############################################################################
 function(hpx_check_for_cxx23_std_generator)
   add_hpx_config_test(

diff --git a/cmake/HPX_AddDefinitions.cmake b/cmake/HPX_AddDefinitions.cmake
@@ -185,15 +185,15 @@ function(write_config_defines_file)
   if(NOT OPTION_TEMPLATE)
     string(TOUPPER ${OPTION_NAMESPACE} NAMESPACE_UPPER)
     set(PREAMBLE
-        "//  Copyright (c) 2019-2020 STE||AR Group\n"
+        "//  Copyright (c) 2019-2023 STE||AR Group\n"
         "//\n"
         "//  SPDX-License-Identifier: BSL-1.0\n"
         "//  Distributed under the Boost Software License, Version 1.0. (See accompanying\n"
         "//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\n"
         "\n"
         "// Do not edit this file! It has been generated by the cmake configuration step.\n"
         "\n"
-        "#pragma once"
+        "#pragma once\n"
     )
     set(TEMP_FILENAME
         "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${NAMESPACE_UPPER}"

diff --git a/cmake/HPX_AddExecutable.cmake b/cmake/HPX_AddExecutable.cmake
@@ -1,4 +1,4 @@
-# Copyright (c) 2007-2012 Hartmut Kaiser
+# Copyright (c) 2007-2023 Hartmut Kaiser
 # Copyright (c) 2011      Bryce Lelbach
 #
 # SPDX-License-Identifier: BSL-1.0
@@ -165,7 +165,9 @@ function(add_hpx_executable name)
     if(${name}_INSTALL_SUFFIX)
       set(install_destination ${${name}_INSTALL_SUFFIX})
     endif()
-    set(_target_flags INSTALL INSTALL_FLAGS DESTINATION ${install_destination})
+    set(_target_flags INSTALL INSTALL_FLAGS DESTINATION ${install_destination}
+                      COMPONENT executables
+    )
     # install PDB if needed
     if(MSVC
        AND NOT ${name}_STATIC
@@ -176,6 +178,7 @@ function(add_hpx_executable name)
           ${_target_flags}
           INSTALL_PDB $<TARGET_PDB_FILE:${name}>
             DESTINATION ${install_destination}
+            COMPONENT executables
           CONFIGURATIONS Debug RelWithDebInfo
           OPTIONAL
       )

diff --git a/cmake/HPX_AddLibrary.cmake b/cmake/HPX_AddLibrary.cmake
@@ -1,4 +1,4 @@
-# Copyright (c) 2007-2012 Hartmut Kaiser
+# Copyright (c) 2007-2023 Hartmut Kaiser
 # Copyright (c) 2011      Bryce Lelbach
 #
 # SPDX-License-Identifier: BSL-1.0
@@ -180,9 +180,9 @@ function(add_hpx_library name)
     # cmake-format: off
     set(_target_flags
         INSTALL INSTALL_FLAGS
-          LIBRARY DESTINATION ${library_install_destination}
-          ARCHIVE DESTINATION ${archive_install_destination}
-          RUNTIME DESTINATION ${runtime_install_destination}
+          LIBRARY DESTINATION ${library_install_destination} COMPONENT runtime
+          ARCHIVE DESTINATION ${archive_install_destination} COMPONENT runtime
+          RUNTIME DESTINATION ${runtime_install_destination} COMPONENT runtime
     )
     # cmake-format: on
 
@@ -196,6 +196,7 @@ function(add_hpx_library name)
           ${_target_flags}
           INSTALL_PDB $<TARGET_PDB_FILE:${name}>
             DESTINATION ${runtime_install_destination}
+            COMPONENT runtime
           CONFIGURATIONS Debug RelWithDebInfo
           OPTIONAL
       )

diff --git a/cmake/HPX_AddModule.cmake b/cmake/HPX_AddModule.cmake
@@ -1,4 +1,4 @@
-# Copyright (c) 2019 ETH Zurich
+# Copyright (c) 2019-2023 ETH Zurich
 #
 # SPDX-License-Identifier: BSL-1.0
 # Distributed under the Boost Software License, Version 1.0. (See accompanying
@@ -380,8 +380,8 @@ function(add_hpx_module libname modulename)
   install(
     TARGETS hpx_${modulename}
     EXPORT HPXInternalTargets
-    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT ${modulename}
+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT ${modulename}
     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT ${modulename}
   )
   hpx_export_internal_targets(hpx_${modulename})
@@ -420,6 +420,7 @@ function(add_hpx_module libname modulename)
         FILES ${_pdb_dir}/${_pdb_file}.pdb
         DESTINATION ${CMAKE_INSTALL_LIBDIR}
         CONFIGURATIONS ${cfg}
+        COMPONENT ${modulename}
         OPTIONAL
       )
     endforeach()

diff --git a/cmake/HPX_CompilerFlagsTargets.cmake b/cmake/HPX_CompilerFlagsTargets.cmake
@@ -34,20 +34,22 @@ target_compile_definitions(
 # Remaining flags are set through the macros in cmake/HPX_AddCompileFlag.cmake
 
 include(HPX_ExportTargets)
+
 # Modules can't link to this if not exported
 install(
   TARGETS hpx_private_flags
   EXPORT HPXInternalTargets
-  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT hpx_private_flags
+  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT hpx_private_flags
   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT hpx_private_flags
 )
 install(
   TARGETS hpx_public_flags
   EXPORT HPXInternalTargets
-  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT hpx_public_flags
+  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT hpx_public_flags
   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT hpx_public_flags
 )
+
 hpx_export_internal_targets(hpx_private_flags)
 hpx_export_internal_targets(hpx_public_flags)
diff --git a/cmake/HPX_ForwardCacheVariables.cmake b/cmake/HPX_ForwardCacheVariables.cmake
@@ -1,4 +1,4 @@
-# Copyright (c) 2019 Ste||ar Group
+# Copyright (c) 2019-2023 Ste||ar Group
 #
 # SPDX-License-Identifier: BSL-1.0
 # Distributed under the Boost Software License, Version 1.0. (See accompanying

diff --git a/cmake/HPX_GeneratePackage.cmake b/cmake/HPX_GeneratePackage.cmake
@@ -32,6 +32,7 @@ install(
   NAMESPACE HPXInternal::
   FILE HPXInternalTargets.cmake
   DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${HPX_PACKAGE_NAME}
+  COMPONENT cmake
 )
 
 # Export HPXTargets in the build directory
@@ -56,6 +57,7 @@ install(
   NAMESPACE HPX::
   FILE HPXTargets.cmake
   DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${HPX_PACKAGE_NAME}
+  COMPONENT cmake
 )
 
 # Install dir
@@ -117,7 +119,7 @@ if(HPX_WITH_PKGCONFIG)
   install(
     FILES "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/hpxcxx"
     DESTINATION ${CMAKE_INSTALL_BINDIR}
-    COMPONENT compiler_wrapper
+    COMPONENT runtime
     PERMISSIONS
       OWNER_READ
       OWNER_WRITE

diff --git a/cmake/HPX_PerformCxxFeatureTests.cmake b/cmake/HPX_PerformCxxFeatureTests.cmake
@@ -144,6 +144,8 @@ function(hpx_perform_cxx_feature_tests)
     hpx_check_for_cxx20_std_default_sentinel(
       DEFINITIONS HPX_HAVE_CXX20_STD_DEFAULT_SENTINEL
     )
+
+    hpx_check_for_cxx20_std_bit_cast(DEFINITIONS HPX_HAVE_CXX20_STD_BIT_CAST)
   endif()
 
   if(HPX_WITH_CXX_STANDARD GREATER_EQUAL 23)

diff --git a/cmake/HPX_SetupAsio.cmake b/cmake/HPX_SetupAsio.cmake
@@ -1,4 +1,4 @@
-# Copyright (c) 2021 Hartmut Kaiser
+# Copyright (c) 2021-2023 Hartmut Kaiser
 #
 # SPDX-License-Identifier: BSL-1.0
 # Distributed under the Boost Software License, Version 1.0. (See accompanying
@@ -61,6 +61,7 @@ elseif(NOT TARGET Asio::asio AND NOT HPX_FIND_PACKAGE)
     NAMESPACE Asio::
     FILE HPXAsioTarget.cmake
     DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${HPX_PACKAGE_NAME}
+    COMPONENT cmake
   )
 
   add_library(Asio::asio ALIAS asio)

diff --git a/cmake/HPX_SetupEve.cmake b/cmake/HPX_SetupEve.cmake
@@ -60,6 +60,7 @@ if(("${HPX_WITH_DATAPAR_BACKEND}" STREQUAL "EVE") AND NOT TARGET eve::eve)
       NAMESPACE eve::
       FILE HPXEveTarget.cmake
       DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${HPX_PACKAGE_NAME}
+      COMPONENT cmake
     )
 
     add_library(eve::eve ALIAS eve)

diff --git a/cmake/HPX_SetupLCI.cmake b/cmake/HPX_SetupLCI.cmake
@@ -1,4 +1,4 @@
-# Copyright (c) 2021 Ste||ar Group
+# Copyright (c) 2021-2023 Ste||ar Group
 #
 # SPDX-License-Identifier: BSL-1.0
 # Distributed under the Boost Software License, Version 1.0. (See accompanying
@@ -103,13 +103,18 @@ macro(hpx_setup_lci)
         NAMESPACE LCI::
         FILE HPXLCITarget.cmake
         DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${HPX_PACKAGE_NAME}
+        COMPONENT cmake
       )
 
-      install(FILES "${lci_SOURCE_DIR}/cmake_modules/FindIBV.cmake"
-              DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${HPX_PACKAGE_NAME}
+      install(
+        FILES "${lci_SOURCE_DIR}/cmake_modules/FindIBV.cmake"
+        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${HPX_PACKAGE_NAME}
+        COMPONENT cmake
       )
-      install(FILES "${lci_SOURCE_DIR}/cmake_modules/FindOFI.cmake"
-              DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${HPX_PACKAGE_NAME}
+      install(
+        FILES "${lci_SOURCE_DIR}/cmake_modules/FindOFI.cmake"
+        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${HPX_PACKAGE_NAME}
+        COMPONENT cmake
       )
     endif()
   endif()

diff --git a/cmake/HPX_SetupSVE.cmake b/cmake/HPX_SetupSVE.cmake
@@ -61,6 +61,7 @@ if(("${HPX_WITH_DATAPAR_BACKEND}" STREQUAL "SVE") AND NOT TARGET SVE::sve)
       NAMESPACE SVE::
       FILE HPXSVETarget.cmake
       DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${HPX_PACKAGE_NAME}
+      COMPONENT cmake
     )
 
   else()

diff --git a/cmake/HPX_SetupTarget.cmake b/cmake/HPX_SetupTarget.cmake
@@ -1,5 +1,5 @@
 # Copyright (c) 2014      Thomas Heller
-# Copyright (c) 2007-2018 Hartmut Kaiser
+# Copyright (c) 2007-2023 Hartmut Kaiser
 # Copyright (c) 2011      Bryce Lelbach
 #
 # SPDX-License-Identifier: BSL-1.0

diff --git a/cmake/tests/cxx20_std_bit_cast.cpp b/cmake/tests/cxx20_std_bit_cast.cpp
@@ -0,0 +1,18 @@
+//  Copyright (c) 2023 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)
+
+// Test if std::bit_cast is available
+
+#include <bit>
+#include <cstdint>
+
+int main()
+{
+    float a = 42.0;
+    std::uint32_t i = std::bit_cast<std::uint32_t>(a);
+    (void) i;
+    return 0;
+}
diff --git a/components/component_storage/CMakeLists.txt b/components/component_storage/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2015 Hartmut Kaiser
+# Copyright (c) 2015-2023 Hartmut Kaiser
 #
 # SPDX-License-Identifier: BSL-1.0
 # Distributed under the Boost Software License, Version 1.0. (See accompanying
@@ -32,6 +32,7 @@ add_hpx_component(
   component_storage INTERNAL_FLAGS
   FOLDER "Core/Components/IO"
   INSTALL_HEADERS PREPEND_HEADER_ROOT
+  INSTALL_COMPONENT runtime
   HEADER_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/include
   HEADERS ${component_storage_headers}
   PREPEND_SOURCE_ROOT