Merge pull request #6254 from STEllAR-GROUP/release-1.9.1

Preparing V1.9.1 release

.circleci/config.yml

@@ -568,7 +568,7 @@ jobs:
           command: |
               ulimit -c unlimited
               ctest \
-                --timeout 180 \
+                --timeout 270 \
                 -T test \
                 --no-compress-output \
                 --output-on-failure \

.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

.cmake-format.py

@@ -352,6 +352,7 @@
                                                    'nargs': '1+'}},
     'add_hpx_module': { 'kwargs': { 'CMAKE_SUBDIRS': '+',
                                     'COMPAT_HEADERS': '+',
+                                    'GENERATED_HEADERS': '+',
                                     'DEPENDENCIES': '+',
                                     'EXCLUDE_FROM_GLOBAL_HEADER': '+',
                                     'ADD_TO_GLOBAL_HEADER': '+',

.github/workflows/windows_release_gcc_mingw.yml

@@ -0,0 +1,62 @@
+# Copyright (c) 2023 The STE||AR-Group
+#
+# 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)
+
+name: Windows CI (Release, gcc/mingw toolset)
+
+on: [pull_request]
+
+jobs:
+  build:
+    runs-on: windows-latest
+
+    steps:
+    - uses: actions/checkout@v3
+    - uses: jwlawson/[email protected]
+      with:
+        cmake-version: '3.22.x'
+    - name: Install dependencies
+      run: |
+        choco install ninja -y
+        md C:\projects
+        $client = new-object System.Net.WebClient
+        $client.DownloadFile("https://boostorg.jfrog.io/artifactory/main/release/1.78.0/source/boost_1_78_0.7z","C:\projects\boost_1_78_0.7z")
+        7z x C:\projects\boost_1_78_0.7z -y -oC:\projects\boost
+        cd C:\projects\boost\boost_1_78_0
+        .\bootstrap.bat gcc
+        .\b2.exe `
+            link=shared `
+            variant=release `
+            architecture=x86 `
+            address-model=64 `
+            threading=multi `
+            --with-iostreams `
+            --build-type=complete `
+            install
+        $client.DownloadFile("https://download.open-mpi.org/release/hwloc/v2.8/hwloc-win64-build-2.8.0.zip","C:\projects\hwloc-win64-build-2.8.0.zip")
+        7z x C:\projects\hwloc-win64-build-2.8.0.zip -y -oC:\projects
+    - name: Configure
+      shell: bash
+      run: |
+          cmake . -Bbuild -G'Ninja' \
+              -DCMAKE_BUILD_TYPE=Release \
+              -DCMAKE_CXX_COMPILER=g++ \
+              -DBOOST_ROOT="C:\Boost" \
+              -DHWLOC_ROOT="C:\projects\hwloc-win64-build-2.8.0" \
+              -DHPX_WITH_CXX_STANDARD=20 \
+              -DHPX_WITH_STATIC_LINKING=ON \
+              -DHPX_WITH_MALLOC=system \
+              -DHPX_WITH_FETCH_ASIO=ON \
+              -DHPX_WITH_PKGCONFIG=OFF \
+              -DHPX_WITH_TESTS_MAX_THREADS_PER_LOCALITY=2 \
+              -DHPX_WITH_EXAMPLES=ON \
+              -DHPX_WITH_TESTS=ON \
+              -DHPX_WITH_TESTS_UNIT=ON \
+              -DHPX_WITH_DEPRECATION_WARNINGS=OFF \
+              -DHPX_WITH_MODULES_AS_STATIC_LIBRARIES=OFF
+    - name: Build
+      shell: bash
+      run: |
+          cmake --build build --config Release -- -j 2

.jenkins/lsu/Jenkinsfile

@@ -35,7 +35,8 @@ pipeline {
                 axes {
                     axis {
                         name 'configuration_name'
-                        values 'gcc-9', 'gcc-10', 'gcc-11', 'gcc-12', 'clang-11', 'clang-12', 'clang-13', 'clang-14', 'gcc-10-cuda-11', 'hipcc'
+                        values 'gcc-9', 'gcc-10', 'gcc-11', 'gcc-12', 'clang-11', 'clang-12', 'clang-13', 'clang-14', 'gcc-10-cuda-11', 'gcc-12-cuda-12-dgx', 'hipcc'
+                        values 'gcc-10', 'gcc-11', 'gcc-12', 'gcc-13', 'clang-12', 'clang-13', 'clang-14', 'clang-15', 'gcc-10-cuda-11', 'gcc-12-cuda-12-dgx', 'hipcc'
                     }
                     axis {
                          name 'build_type'

.jenkins/lsu/batch.sh

@@ -21,7 +21,7 @@ ulimit -l unlimited
 
 set +e
 ctest \
-    --verbose \
+    ${ctest_extra_args} \
     -S ${src_dir}/.jenkins/lsu/ctest.cmake \
     -DCTEST_CONFIGURE_EXTRA_OPTIONS="${configure_extra_options}" \
     -DCTEST_BUILD_CONFIGURATION_NAME="${configuration_name_with_build_type}" \

.jenkins/lsu/entry.sh

@@ -46,6 +46,7 @@ sbatch \
     --job-name="${job_name}" \
     --nodes="${configuration_slurm_num_nodes}" \
     --partition="${configuration_slurm_partition}" \
+    --exclude="bahram" \
     --time="03:00:00" \
     --output="jenkins-hpx-${configuration_name_with_build_type}.out" \
     --error="jenkins-hpx-${configuration_name_with_build_type}.err" \

.jenkins/lsu/env-clang-15.sh

@@ -0,0 +1,36 @@
+# Copyright (c) 2020 ETH Zurich
+#
+# 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)
+
+module purge
+module load cmake
+module load llvm/15
+module load boost/1.82.0-${build_type,,}
+module load hwloc
+module load openmpi
+module load pwrapi/1.1.1
+
+export HPXRUN_RUNWRAPPER=srun
+export CXX_STD="20"
+
+configure_extra_options+=" -DCMAKE_BUILD_TYPE=${build_type}"
+configure_extra_options+=" -DHPX_WITH_CXX_STANDARD=${CXX_STD}"
+configure_extra_options+=" -DHPX_WITH_MALLOC=system"
+configure_extra_options+=" -DHPX_WITH_FETCH_ASIO=ON"
+configure_extra_options+=" -DHPX_WITH_COMPILER_WARNINGS=ON"
+configure_extra_options+=" -DHPX_WITH_COMPILER_WARNINGS_AS_ERRORS=ON"
+configure_extra_options+=" -DHPX_WITH_PARCELPORT_MPI=ON"
+configure_extra_options+=" -DHPX_WITH_PARCELPORT_LCI=ON"
+configure_extra_options+=" -DHPX_WITH_FETCH_LCI=ON"
+configure_extra_options+=" -DHPX_WITH_LOGGING=OFF"
+configure_extra_options+=" -DHPX_WITH_DATAPAR_BACKEND=EVE"
+configure_extra_options+=" -DHPX_WITH_FETCH_EVE=ON"
+
+# The pwrapi library still needs to be set up properly on rostam
+# configure_extra_options+=" -DHPX_WITH_POWER_COUNTER=ON"
+
+# Make sure HWLOC does not report 'cores'. This is purely an option to enable
+# testing the topology code under conditions close to those on FreeBSD.
+configure_extra_options+=" -DHPX_TOPOLOGY_WITH_ADDITIONAL_HWLOC_TESTING=ON"

.jenkins/lsu/env-common.sh

@@ -11,5 +11,7 @@ if [ "${build_type}" = "Debug" ]; then
     configure_extra_options+=" -DLCI_DEBUG=ON"
 fi
 
+ctest_extra_args+=" --verbose "
+
 hostname
 module avail

.jenkins/lsu/env-gcc-10-cuda-11.sh

@@ -23,4 +23,4 @@ configure_extra_options+=" -DHPX_WITH_CUDA=ON"
 configure_extra_options+=" -DHPX_WITH_NETWORKING=OFF"
 configure_extra_options+=" -DHPX_WITH_DISTRIBUTED_RUNTIME=OFF"
 configure_extra_options+=" -DHPX_WITH_ASYNC_MPI=ON"
-configure_extra_options+=" -DCMAKE_CUDA_ARCHITECTURES='37;70'"
+configure_extra_options+=" -DCMAKE_CUDA_ARCHITECTURES='70;80'"

.jenkins/lsu/env-gcc-11.sh

@@ -20,9 +20,7 @@ configure_extra_options+=" -DHPX_WITH_MALLOC=system"
 configure_extra_options+=" -DHPX_WITH_FETCH_ASIO=ON"
 configure_extra_options+=" -DHPX_WITH_COMPILER_WARNINGS=ON"
 configure_extra_options+=" -DHPX_WITH_COMPILER_WARNINGS_AS_ERRORS=ON"
-configure_extra_options+=" -DHPX_WITH_PARCELPORT_MPI=ON"
-configure_extra_options+=" -DHPX_WITH_PARCELPORT_LCI=ON"
-configure_extra_options+=" -DHPX_WITH_FETCH_LCI=ON"
+configure_extra_options+=" -DHPX_WITH_NETWORKING=OFF"
 configure_extra_options+=" -DHPX_WITH_DATAPAR_BACKEND=STD_EXPERIMENTAL_SIMD"
 
 # The pwrapi library still needs to be set up properly on rostam

.jenkins/lsu/env-gcc-13.sh

@@ -0,0 +1,31 @@
+# Copyright (c) 2020 ETH Zurich
+#
+# 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)
+
+module purge
+module load cmake
+module load gcc/13
+module load boost/1.82.0-${build_type,,}
+module load hwloc
+module load openmpi
+module load pwrapi/1.1.1
+
+export HPXRUN_RUNWRAPPER=srun
+export CXX_STD="20"
+
+configure_extra_options+=" -DHPX_WITH_CXX_STANDARD=${CXX_STD}"
+configure_extra_options+=" -DHPX_WITH_MALLOC=system"
+configure_extra_options+=" -DHPX_WITH_FETCH_ASIO=ON"
+configure_extra_options+=" -DHPX_WITH_COMPILER_WARNINGS=ON"
+configure_extra_options+=" -DHPX_WITH_COMPILER_WARNINGS_AS_ERRORS=ON"
+configure_extra_options+=" -DHPX_WITH_PARCELPORT_MPI=ON"
+configure_extra_options+=" -DHPX_WITH_PARCELPORT_LCI=ON"
+configure_extra_options+=" -DHPX_WITH_FETCH_LCI=ON"
+configure_extra_options+=" -DHPX_WITH_DATAPAR_BACKEND=EVE"
+configure_extra_options+=" -DHPX_WITH_FETCH_EVE=ON"
+configure_extra_options+=" -DHPX_WITH_EVE_TAG=main"
+
+# The pwrapi library still needs to be set up properly on rostam
+# configure_extra_options+=" -DHPX_WITH_POWER_COUNTER=ON"

.jenkins/lsu/env-hipcc.sh

@@ -17,4 +17,6 @@ configure_extra_options+=" -DHPX_WITH_FETCH_ASIO=ON"
 configure_extra_options+=" -DHPX_WITH_MAX_CPU_COUNT=128"
 configure_extra_options+=" -DHPX_WITH_DEPRECATION_WARNINGS=OFF"
 configure_extra_options+=" -DHPX_WITH_COMPILER_WARNINGS=ON"
-configure_extra_options+=" -DHPX_WITH_COMPILER_WARNINGS_AS_ERRORS=ON"
+configure_extra_options+=" -DHPX_WITH_COMPILER_WARNINGS_AS_ERRORS=OFF"
+
+ctest_extra_args+=" -E tests.unit.modules.algorithms.detail "

.jenkins/lsu/slurm-configuration-clang-15.sh

@@ -0,0 +1,8 @@
+# Copyright (c) 2020 ETH Zurich
+#
+# 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)
+
+configuration_slurm_partition="jenkins-compute"
+configuration_slurm_num_nodes="1"

.jenkins/lsu/slurm-configuration-gcc-13.sh

@@ -0,0 +1,8 @@
+# Copyright (c) 2020 ETH Zurich
+#
+# 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)
+
+configuration_slurm_partition="jenkins-compute"
+configuration_slurm_num_nodes="1"

CMakeLists.txt

@@ -59,9 +59,9 @@ endif()
 # ##############################################################################
 set(HPX_VERSION_MAJOR 1)
 set(HPX_VERSION_MINOR 9)
-set(HPX_VERSION_SUBMINOR 0)
+set(HPX_VERSION_SUBMINOR 1)
 set(HPX_VERSION_DATE 20230502)
-set(HPX_VERSION_TAG "")
+set(HPX_VERSION_TAG "-rc1")
 
 set(HPX_VERSION
     "${HPX_VERSION_MAJOR}.${HPX_VERSION_MINOR}.${HPX_VERSION_SUBMINOR}"
@@ -110,7 +110,7 @@ if(NOT HPX_CMAKE_LOGLEVEL)
 endif()
 
 # print initial diagnostics
-hpx_info("CMake version: ${CMAKE_VERSION}")
+hpx_info("CMake version: ${CMAKE_VERSION}, generator: ${CMAKE_GENERATOR}")
 hpx_info("HPX version: ${HPX_VERSION}")
 
 # ##############################################################################
@@ -373,9 +373,9 @@ endif()
 # The cmake Ninja generator runs out of memory if the modules are being built as
 # OBJECT libraries. In this case the fallback is to build whole-archive STATIC
 # libraries.
-set(HPX_WITH_MODULES_AS_STATIC_LIBRARIES_DEFAULT ON)
-if("${CMAKE_MAKE_PROGRAM}" STREQUAL "ninja")
-  set(HPX_WITH_MODULES_AS_STATIC_LIBRARIES_DEFAULT OFF)
+set(HPX_WITH_MODULES_AS_STATIC_LIBRARIES_DEFAULT OFF)
+if("${CMAKE_GENERATOR}" STREQUAL "Ninja")
+  set(HPX_WITH_MODULES_AS_STATIC_LIBRARIES_DEFAULT ON)
 endif()
 
 hpx_option(
@@ -655,8 +655,8 @@ endif()
 hpx_option(
   HPX_WITH_ZERO_COPY_SERIALIZATION_THRESHOLD
   STRING
-  "The threshold in bytes to when perform zero copy optimizations (default: 128)"
-  "128"
+  "The threshold in bytes to when perform zero copy optimizations (default: 8192)"
+  "8192"
   ADVANCED
 )
 hpx_add_config_define(
@@ -1138,7 +1138,7 @@ if(HPX_WITH_NETWORKING)
     ADVANCED
   )
   hpx_option(
-    HPX_WITH_LCI_TAG STRING "LCI repository tag or branch" "v1.7.4"
+    HPX_WITH_LCI_TAG STRING "LCI repository tag or branch" "v1.7.5"
     CATEGORY "Build Targets"
     ADVANCED
   )
@@ -1754,6 +1754,12 @@ if(WIN32)
     hpx_add_target_compile_option(-MP PUBLIC)
     # Increase the maximum size of object file sections
     hpx_add_target_compile_option(-bigobj PUBLIC)
+  elseif(MINGW)
+    if(HPX_CXX11_STD_ATOMIC_LIBRARIES)
+      target_link_libraries(
+        hpx_base_libraries INTERFACE ${HPX_CXX11_STD_ATOMIC_LIBRARIES}
+      )
+    endif()
   endif()
 
   target_link_libraries(hpx_base_libraries INTERFACE psapi shlwapi)
@@ -1834,8 +1840,6 @@ if(HPX_WITH_COMPILER_WARNINGS)
 
   else() # Trial and error approach for any other compiler ...
     hpx_add_compile_flag_if_available(-Wall)
-    hpx_add_compile_flag_if_available(-Wextra)
-    hpx_add_compile_flag_if_available(-Wpedantic)
     hpx_add_compile_flag_if_available(-Wno-strict-aliasing)
     hpx_add_compile_flag_if_available(-Wno-sign-promo)
     hpx_add_compile_flag_if_available(-Wno-attributes)
@@ -1848,6 +1852,16 @@ if(HPX_WITH_COMPILER_WARNINGS)
         # caused by the use of std::destructive_interference_size
         hpx_add_compile_flag_if_available(-Wno-interference-size)
       endif()
+      if("${CMAKE_CXX_COMPILER_VERSION}" VERSION_GREATER_EQUAL "13.0")
+        # gcc V13.x is overeager to report dangling references where there are
+        # none
+        hpx_add_compile_flag_if_available(-Wextra)
+        hpx_add_compile_flag_if_available(-Wpedantic)
+        hpx_add_compile_flag_if_available(-Wno-self-move)
+      endif()
+    else()
+      hpx_add_compile_flag_if_available(-Wextra)
+      hpx_add_compile_flag_if_available(-Wpedantic)
     endif()
 
     # We do not in general guarantee ABI compatibility between C++ standards, so

cmake/HPX_AddConfigTest.cmake

@@ -278,6 +278,15 @@ function(hpx_check_for_cxx11_std_atomic)
     unset(HPX_CXX11_STD_ATOMIC_LIBRARIES CACHE)
   endif()
 
+  # we shouldn't delete this key if the user has pre-set the atomic libraries to
+  # use
+  if(HPX_CXX11_STD_ATOMIC_LIBRARIES)
+    set(__std_atomic_libraries
+        TRUE
+        CACHE STRING "std::atomics need separate library" FORCE
+    )
+  endif()
+
   # first see if we can build atomics with no -latomics
   add_hpx_config_test(
     HPX_WITH_CXX11_ATOMIC
@@ -301,12 +310,18 @@ function(hpx_check_for_cxx11_std_atomic)
         LIBRARIES ${HPX_CXX11_STD_ATOMIC_LIBRARIES}
         FILE ${ARGN}
       )
-      if(NOT HPX_WITH_CXX11_ATOMIC)
-        unset(HPX_CXX11_STD_ATOMIC_LIBRARIES CACHE)
-        unset(HPX_WITH_CXX11_ATOMIC CACHE)
+      if(HPX_WITH_CXX11_ATOMIC)
+        set(__std_atomic_libraries
+            TRUE
+            CACHE STRING "std::atomics need separate library" FORCE
+        )
       endif()
     endif()
   endif()
+
+  if(NOT HPX_WITH_CXX11_ATOMIC)
+    hpx_error("HPX needs support for C++11 std::atomic")
+  endif()
 endfunction()
 
 # Separately check for 128 bit atomics
@@ -334,11 +349,15 @@ function(hpx_check_for_cxx11_std_atomic_128bit)
       )
       if(NOT HPX_WITH_CXX11_ATOMIC_128BIT)
         # Adding -latomic did not help, so we don't attempt to link to it later
-        unset(HPX_CXX11_STD_ATOMIC_LIBRARIES CACHE)
+        # but only if normal atomics don't require it
+        if(NOT __std_atomic_libraries)
+          unset(HPX_CXX11_STD_ATOMIC_LIBRARIES CACHE)
+        endif()
         unset(HPX_WITH_CXX11_ATOMIC_128BIT CACHE)
       endif()
     endif()
   endif()
+  unset(__std_atomic_libraries CACHE)
 endfunction()
 
 # ##############################################################################
@@ -350,6 +369,15 @@ function(hpx_check_for_cxx11_std_shared_ptr_lwg3018)
   )
 endfunction()
 
+# ##############################################################################
+function(hpx_check_for_cxx14_delete_operator_with_size)
+  add_hpx_config_test(
+    HPX_WITH_CXX14_DELETE_OPERATOR_WITH_SIZE
+    SOURCE cmake/tests/cxx_14_delete_operator_with_size.cpp
+    FILE ${ARGN}
+  )
+endfunction()
+
 # ##############################################################################
 function(hpx_check_for_c11_aligned_alloc)
   add_hpx_config_test(