Merge branch 'master' into libs_updates

STEllAR-GROUP · May 10, 2023 · 3497a11 · 3497a11
2 parents 0012055 + ad3ac76
commit 3497a11
Show file tree

Hide file tree

Showing 1,046 changed files with 6,690 additions and 4,936 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/.clang-tidy b/.clang-tidy
@@ -11,6 +11,7 @@ Checks: >
     -bugprone-exception-escape,
     -bugprone-forward-declaration-namespace,
     -bugprone-macro-parentheses,
+    -bugprone-branch-clone,
     modernize-use-nullptr,
     misc-assert-side-effect
     misc-dangling-handle

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,
@@ -375,7 +376,24 @@
                                           'SOURCE_ROOT': 1},
                               'pargs': { 'flags': ['FAILURE_EXPECTED', 'NOLIBS'],
                                          'nargs': '2+'}},
-    'add_hpx_regression_test': {'pargs': {'nargs': 2}},
+    'add_hpx_regression_test': { 'kwargs': { 'COMPONENT_DEPENDENCIES': '+',
+                                             'DEPENDENCIES': '+',
+                                             'FOLDER': 1,
+                                             'SOURCES': '+',
+                                             'SOURCE_ROOT': 1,
+                                             'ARGS': '+',
+                                             'EXECUTABLE': 1,
+                                             'PSEUDO_DEPS_NAME': 1,
+                                             'LOCALITIES': 1,
+                                             'PARCELPORTS': '+',
+                                             'THREADS_PER_LOCALITY': 1},
+                              'pargs': { 'flags': ['FAILURE_EXPECTED',
+                                                   'NOLIBS',
+                                                   'RUN_SERIAL',
+                                                   'NO_PARCELPORT_TCP',
+                                                   'NO_PARCELPORT_LCI',
+                                                   'NO_PARCELPORT_MPI'],
+                                         'nargs': '2+'}},
     'add_hpx_source_group': { 'kwargs': { 'CLASS': 1,
                                           'NAME': 1,
                                           'ROOT': 1,
@@ -385,10 +403,7 @@
                                   'EXECUTABLE': 1,
                                   'LOCALITIES': 1,
                                   'PARCELPORTS': '+',
-                                  'THREADS_PER_LOCALITY': 1,
-                                  'NO_PARCELPORT_TCP': 1,
-                                  'NO_PARCELPORT_MPI': 1,
-                                  'NO_PARCELPORT_LCI': 1},
+                                  'THREADS_PER_LOCALITY': 1},
                       'pargs': {'flags': ['FAILURE_EXPECTED',
                                           'RUN_SERIAL',
                                           'NO_PARCELPORT_TCP',
@@ -409,8 +424,19 @@
                                           'DEPENDENCIES': '+',
                                           'FOLDER': 1,
                                           'SOURCES': '+',
-                                          'SOURCE_ROOT': 1},
-                           'pargs': { 'flags': ['FAILURE_EXPECTED', 'NOLIBS'],
+                                          'SOURCE_ROOT': 1,
+                                          'ARGS': '+',
+                                          'EXECUTABLE': 1,
+                                          'PSEUDO_DEPS_NAME': 1,
+                                          'LOCALITIES': 1,
+                                          'PARCELPORTS': '+',
+                                          'THREADS_PER_LOCALITY': 1},
+                           'pargs': { 'flags': ['FAILURE_EXPECTED',
+                                                'NOLIBS',
+                                                'RUN_SERIAL',
+                                                'NO_PARCELPORT_TCP',
+                                                'NO_PARCELPORT_LCI',
+                                                'NO_PARCELPORT_MPI'],
                                       'nargs': '2+'}},
     'add_parcelport': { 'kwargs': { 'COMPILE_FLAGS': '+',
                                     'DEPENDENCIES': '+',

diff --git a/CITATION.cff b/CITATION.cff
@@ -7,7 +7,7 @@
 # Metadata for citation of this software according to the CFF format (https://citation-file-format.github.io/)
 cff-version: 1.2.0
 message: If you use this software, please cite it using these metadata.
-title: 'STEllAR-GROUP/hpx: HPX V1.8.1: The C++ Standards Library for Parallelism and
+title: 'STEllAR-GROUP/hpx: HPX V1.9.0: The C++ Standards Library for Parallelism and
   Concurrency'
 doi: 10.5281/zenodo.5185328
 authors:
@@ -84,7 +84,7 @@ authors:
 - given-names: Zahra
   family-names: Khatami
   affiliation: Louisiana State University
-version: 1.8.1
-date-released: 2022-07-18
+version: 1.9.0
+date-released: 2023-05-02
 repository-code: https://github.com/STEllAR-GROUP/hpx
 license: BSL-1.0
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
@@ -58,9 +58,9 @@ endif()
 # Build all of HPX
 # ##############################################################################
 set(HPX_VERSION_MAJOR 1)
-set(HPX_VERSION_MINOR 9)
+set(HPX_VERSION_MINOR 10)
 set(HPX_VERSION_SUBMINOR 0)
-set(HPX_VERSION_DATE 20220805)
+set(HPX_VERSION_DATE 20230502)
 set(HPX_VERSION_TAG "-trunk")
 
 set(HPX_VERSION
@@ -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_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_PrintSummary.cmake b/cmake/HPX_PrintSummary.cmake
@@ -77,7 +77,7 @@ function(create_configuration_summary message module_name)
         if(NOT ${__pos} EQUAL -1)
           set(hpx_config_information
               "${hpx_config_information}"
-              "\n        \"${_variableName}=${_value}\","
+              "\n            \"${_variableName}=${_value}\","
           )
         elseif(NOT ${_variableName}Category STREQUAL "Generic"
                AND NOT ${_variableName}Category STREQUAL "Build Targets"
@@ -88,8 +88,9 @@ function(create_configuration_summary message module_name)
             PROPERTY TYPE
           )
           if(_type STREQUAL "BOOL")
-            set(hpx_config_information "${hpx_config_information}"
-                                       "\n        \"${_variableName}=OFF\","
+            set(hpx_config_information
+                "${hpx_config_information}"
+                "\n            \"${_variableName}=OFF\","
             )
           endif()
         endif()