Merge pull request #710 from boostorg/develop

Merge to Master for 1.89

Author: mborland

.circleci/config.yml

@@ -6,7 +6,7 @@ jobs:
       - BOOST_LIBRARY=multiprecision
       - CXX_STANDARD=gnu++11
     docker:
-      - image: gcc:7
+      - image: gcc:9
     steps:
       - checkout
       - run:
@@ -46,11 +46,11 @@ jobs:
       - run:
           name: Building inspect
           command: |
-            cd $BOOST/boost/tools/inspect/build && ../../../b2 -j2 address-model=64 architecture=x86 toolset=gcc cxxflags="-std=gnu++14" release dist-bin
+            cd $BOOST/boost/tools/inspect && ../../b2 -j1 toolset=gcc variant=release dist-bin
       - run:
           name: Building docs
           command: |
-            cd $BOOST_REMOVE/doc && rm -rf html/boost_multiprecision && ../../../b2 -j2 address-model=64 architecture=x86 toolset=gcc cxxflags="-std=gnu++14" release
+            cd $BOOST_REMOVE/doc && rm -rf html/boost_multiprecision && ../../../b2 -j1
       - run:
           name: Running Inspect
           command: |

.drone.star

@@ -121,6 +121,11 @@ def main(ctx):
   linux_cxx("Ubuntu clang++-10 std=c++20 compile_fail examples", "clang++-10", packages="clang-10 libgmp-dev libmpfr-dev libmpc-dev libmpfi-dev libtommath-dev", llvm_os="xenial", llvm_ver="10", buildtype="boost", image="cppalliance/droneubuntu1804:1", environment={'TEST_SUITE': 'compile_fail examples', 'TOOLSET': 'clang', 'COMPILER': 'clang++-10', 'CXXSTD': 'c++20', }, globalenv=globalenv),
   linux_cxx("Ubuntu clang++-10 std=c++20 concepts", "clang++-10", packages="clang-10 libgmp-dev libmpfr-dev libmpc-dev libmpfi-dev libtommath-dev", llvm_os="xenial", llvm_ver="10", buildtype="boost", image="cppalliance/droneubuntu1804:1", environment={'TOOLSET': 'clang', 'COMPILER': 'clang++-10', 'CXXSTD': 'c++20', 'TEST_SUITE': 'concepts', }, globalenv=globalenv),
 
+  # Slow test suite: specfun_cpp_bin_float
+  # This test took over 6 hours on GHA
+  linux_cxx("Ubuntu g++-10 std=gnu++17 specfun_cpp_bin_float", "g++-10", packages="g++-10 libgmp-dev libmpfr-dev libmpc-dev libmpfi-dev libtommath-dev", buildtype="boost", image="cppalliance/droneubuntu2004:1", environment={'TOOLSET': 'gcc', 'COMPILER': 'g++-10', 'CXXSTD': 'gnu++17', 'TEST_SUITE': 'specfun_cpp_bin_float', }, globalenv=globalenv),
+  linux_cxx("Ubuntu g++-10 std=gnu++20 specfun_cpp_bin_float", "g++-10", packages="g++-10 libgmp-dev libmpfr-dev libmpc-dev libmpfi-dev libtommath-dev", buildtype="boost", image="cppalliance/droneubuntu2004:1", environment={'TOOLSET': 'gcc', 'COMPILER': 'g++-10', 'CXXSTD': 'gnu++20', 'TEST_SUITE': 'specfun_cpp_bin_float', }, globalenv=globalenv),
+
   # Sanitizers:
   #linux_cxx("Ubuntu clang++-10 std=c++20 ASAN arithmetic_tests", "clang++-10", packages="clang-10 libgmp-dev libmpfr-dev libmpc-dev libmpfi-dev libtommath-dev", llvm_os="xenial", llvm_ver="10", buildtype="boost", image=linuxglobalimage, environment={'TOOLSET': 'clang', 'COMPILER': 'clang++-10', 'CXXSTD': 'c++20', 'TEST_SUITE': 'cxxflags=-fsanitize=address linkflags=-fsanitize=address arithmetic_tests', }, globalenv=globalenv),
   #linux_cxx("Ubuntu clang++-10 std=c++20 ASAN cpp_int_test", "clang++-10", packages="clang-10 libgmp-dev libmpfr-dev libmpc-dev libmpfi-dev libtommath-dev", llvm_os="xenial", llvm_ver="10", buildtype="boost", image=linuxglobalimage, environment={'TOOLSET': 'clang', 'COMPILER': 'clang++-10', 'CXXSTD': 'c++20', 'TEST_SUITE': 'cxxflags=-fsanitize=address linkflags=-fsanitize=address cpp_int_tests', }, globalenv=globalenv),

.drone/after-success.sh

@@ -40,23 +40,23 @@ jobs:
       matrix:
         include:
           - { name: Collect coverage 1, coverage: yes,
-              compiler: gcc-12,     cxxstd: '20',          os: ubuntu-22.04, install: 'g++-12-multilib', address-model: '64', suite: 'arithmetic_tests' }
+              compiler: gcc-13,     cxxstd: '20',          os: ubuntu-24.04, install: 'g++-13-multilib', address-model: '64', suite: 'arithmetic_tests' }
           - { name: Collect coverage 2, coverage: yes,
-              compiler: gcc-12,     cxxstd: '20',          os: ubuntu-22.04, install: 'g++-12-multilib', address-model: '64', suite: 'cpp_int_tests' }
+              compiler: gcc-13,     cxxstd: '20',          os: ubuntu-24.04, install: 'g++-13-multilib', address-model: '64', suite: 'cpp_int_tests' }
           - { name: Collect coverage 3, coverage: yes,
-              compiler: gcc-12,     cxxstd: '20',          os: ubuntu-22.04, install: 'g++-12-multilib', address-model: '64', suite: 'functions_and_limits' }
+              compiler: gcc-13,     cxxstd: '20',          os: ubuntu-24.04, install: 'g++-13-multilib', address-model: '64', suite: 'functions_and_limits' }
           - { name: Collect coverage 4, coverage: yes,
-              compiler: gcc-12,     cxxstd: '20',          os: ubuntu-22.04, install: 'g++-12-multilib', address-model: '64', suite: 'conversions' }
+              compiler: gcc-13,     cxxstd: '20',          os: ubuntu-24.04, install: 'g++-13-multilib', address-model: '64', suite: 'conversions' }
           - { name: Collect coverage 5, coverage: yes,
-              compiler: gcc-12,     cxxstd: '20',          os: ubuntu-22.04, install: 'g++-12-multilib', address-model: '64', suite: 'performance' }
+              compiler: gcc-13,     cxxstd: '20',          os: ubuntu-24.04, install: 'g++-13-multilib', address-model: '64', suite: 'performance' }
           - { name: Collect coverage 6, coverage: yes,
-              compiler: gcc-12,     cxxstd: '20',          os: ubuntu-22.04, install: 'g++-12-multilib', address-model: '64', suite: 'misc' }
+              compiler: gcc-13,     cxxstd: '20',          os: ubuntu-24.04, install: 'g++-13-multilib', address-model: '64', suite: 'misc' }
           - { name: Collect coverage 7, coverage: yes,
-              compiler: gcc-12,     cxxstd: '20',          os: ubuntu-22.04, install: 'g++-12-multilib', address-model: '64', suite: 'compile_fail' }
+              compiler: gcc-13,     cxxstd: '20',          os: ubuntu-24.04, install: 'g++-13-multilib', address-model: '64', suite: 'compile_fail' }
           - { name: Collect coverage 8, coverage: yes,
-              compiler: gcc-12,     cxxstd: '20',          os: ubuntu-22.04, install: 'g++-12-multilib', address-model: '64', suite: 'examples' }
+              compiler: gcc-13,     cxxstd: '20',          os: ubuntu-24.04, install: 'g++-13-multilib', address-model: '64', suite: 'examples' }
           - { name: Collect coverage 9, coverage: yes,
-              compiler: gcc-12,     cxxstd: '20',          os: ubuntu-22.04, install: 'g++-12-multilib', address-model: '64', suite: 'concepts' }
+              compiler: gcc-13,     cxxstd: '20',          os: ubuntu-24.04, install: 'g++-13-multilib', address-model: '64', suite: 'concepts' }
 
     #timeout-minutes: 120
     runs-on: ${{matrix.os}}

.drone/before-install.sh

@@ -20,78 +20,16 @@ concurrency:
    cancel-in-progress: true
 
 jobs:
-  ubuntu-jammy:
-    runs-on: ubuntu-22.04
+  ubuntu-noble-specfun:
+    runs-on: ubuntu-24.04
     defaults:
       run:
         shell: bash
     strategy:
       fail-fast: false
       matrix:
-        compiler: [ g++-12, clang++-14 ]
-        standard: [ c++14, c++17 ]
-        suite: [ github_ci_block_1, github_ci_block_2 ]
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: '0'
-      - name: Set TOOLSET
-        run: echo ${{ matrix.compiler }} | awk '/^g/ { print "TOOLSET=gcc" } /^clang/ { print "TOOLSET=clang" }' >> $GITHUB_ENV
-      - name: Add repository
-        continue-on-error: true
-        id: addrepo
-        run: sudo apt-add-repository -y "ppa:ubuntu-toolchain-r/test"
-      - name: Retry Add Repo
-        continue-on-error: true
-        id: retry1
-        if: steps.addrepo.outcome=='failure'
-        run: sudo apt-add-repository -y "ppa:ubuntu-toolchain-r/test"
-      - name: Retry Add Repo 2
-        continue-on-error: true
-        id: retry2
-        if: steps.retry1.outcome=='failure'
-        run: sudo apt-add-repository -y "ppa:ubuntu-toolchain-r/test"
-      - name: Install packages
-        run: sudo apt install g++-12 clang-14 libgmp-dev libmpfr-dev libtommath-dev libeigen3-dev libmpfi-dev libmpc-dev
-      - name: Checkout main boost
-        run: git clone -b develop --depth 1 https://github.com/boostorg/boost.git ../boost-root
-      - name: Update tools/boostdep
-        run: git submodule update --init tools/boostdep
-        working-directory: ../boost-root
-      - name: Copy files
-        run: cp -r $GITHUB_WORKSPACE/* libs/multiprecision
-        working-directory: ../boost-root
-      - name: Install deps
-        run: python tools/boostdep/depinst/depinst.py multiprecision
-        working-directory: ../boost-root
-      - name: Bootstrap
-        run: ./bootstrap.sh
-        working-directory: ../boost-root
-      - name: Generate headers
-        run: ./b2 headers
-        working-directory: ../boost-root
-      - name: Generate user config
-        run: 'echo "using $TOOLSET : : ${{ matrix.compiler }} : <cxxflags>-std=${{ matrix.standard }} ;" > ~/user-config.jam'
-        working-directory: ../boost-root
-      - name: Config Info
-        run: ../../../b2 print_config_info print_math_info toolset=$TOOLSET
-        working-directory: ../boost-root/libs/config/test
-      - name: Test
-        run: ../../../b2 -j2 toolset=$TOOLSET ${{ matrix.suite }} define=CI_SUPPRESS_KNOWN_ISSUES define=BOOST_MP_SF_CONCEPT_TESTS include=/usr/include/eigen3
-        working-directory: ../boost-root/libs/multiprecision/test
-      - name: b2 config
-        run: cat bin.v2/config.log
-        working-directory: ../boost-root/
-  ubuntu-jammy-specfun:
-    runs-on: ubuntu-22.04
-    defaults:
-      run:
-        shell: bash
-    strategy:
-      fail-fast: false
-      matrix:
-        compiler: [ g++-12 ]
-        suite: [ specfun_mpfr, specfun_gmp, specfun_cpp_dec_float, specfun_cpp_bin_float, specfun_float128 ]
+        compiler: [ g++-14 ]
+        suite: [ specfun_mpfr, specfun_gmp, specfun_cpp_dec_float, specfun_cpp_bin_float, specfun_float128, specfun_cpp_double_double ]
     steps:
       - uses: actions/checkout@v4
         with:
@@ -113,7 +51,7 @@ jobs:
         if: steps.retry1.outcome=='failure'
         run: sudo apt-add-repository -y "ppa:ubuntu-toolchain-r/test"
       - name: Install packages
-        run: sudo apt install g++-12 clang-14 libgmp-dev libmpfr-dev libtommath-dev libeigen3-dev libmpfi-dev libmpc-dev
+        run: sudo apt install g++-14 libgmp-dev libmpfr-dev libtommath-dev libeigen3-dev libmpfi-dev libmpc-dev
       - name: Checkout main boost
         run: git clone -b develop --depth 1 https://github.com/boostorg/boost.git ../boost-root
       - name: Update tools/boostdep
@@ -143,15 +81,15 @@ jobs:
       - name: b2 config
         run: cat bin.v2/config.log
         working-directory: ../boost-root/
-  ubuntu-focal:
-    runs-on: ubuntu-20.04
+  ubuntu-noble:
+    runs-on: ubuntu-24.04
     defaults:
       run:
         shell: bash
     strategy:
       fail-fast: false
       matrix:
-        compiler: [ g++-10, g++-11, clang++-10, clang++-11 ]
+        compiler: [ g++-13, g++-14, clang++-19 ]
         standard: [ c++14, c++17 ]
         suite: [ github_ci_block_1, github_ci_block_2 ]
     steps:
@@ -175,7 +113,7 @@ jobs:
         if: steps.retry1.outcome=='failure'
         run: sudo apt-add-repository -y "ppa:ubuntu-toolchain-r/test"
       - name: Install packages
-        run: sudo apt install g++-9 g++-10 g++-11 clang-10 clang-11 libgmp-dev libmpfr-dev libtommath-dev libeigen3-dev libmpfi-dev libmpc-dev
+        run: sudo apt install g++-13 g++-14 clang-19 libgmp-dev libmpfr-dev libtommath-dev libeigen3-dev libmpfi-dev libmpc-dev
       - name: Checkout main boost
         run: git clone -b develop --depth 1 https://github.com/boostorg/boost.git ../boost-root
       - name: Update tools/boostdep
@@ -205,17 +143,17 @@ jobs:
       - name: b2 config
         run: cat bin.v2/config.log
         working-directory: ../boost-root/
-  ubuntu-focal-slow-tests:
-    runs-on: ubuntu-20.04
+  ubuntu-slow-tests:
+    runs-on: ubuntu-24.04
     defaults:
       run:
         shell: bash
     strategy:
       fail-fast: false
       matrix:
-        compiler: [ g++-10 ]
-        standard: [ c++17, c++2a ]
-        suite: [ specfun_mpfr, specfun_gmp, specfun_cpp_dec_float, specfun_cpp_bin_float, specfun_float128 ]
+        compiler: [ g++-13 ]
+        standard: [ c++17, c++20 ]
+        suite: [ specfun_mpfr, specfun_gmp, specfun_cpp_dec_float, specfun_float128, specfun_cpp_double_double ]
     steps:
       - uses: actions/checkout@v4
         with:
@@ -267,16 +205,16 @@ jobs:
       - name: b2 config
         run: cat bin.v2/config.log
         working-directory: ../boost-root/
-  ubuntu-focal-standalone-tests:
-    runs-on: ubuntu-20.04
+  ubuntu-standalone-tests:
+    runs-on: ubuntu-24.04
     defaults:
       run:
         shell: bash
     strategy:
       fail-fast: false
       matrix:
-        compiler: [ g++-11 ]
-        standard: [ c++14, c++17, c++20 ]
+        compiler: [ g++-13 ]
+        standard: [ c++14, c++17, c++20, c++23 ]
         suite: [ standalone ]
     steps:
       - uses: actions/checkout@v4
@@ -299,7 +237,7 @@ jobs:
         if: steps.retry1.outcome=='failure'
         run: sudo apt-add-repository -y "ppa:ubuntu-toolchain-r/test"
       - name: Install packages
-        run: sudo apt install g++-11 libgmp-dev libmpfr-dev libtommath-dev
+        run: sudo apt install g++-13 libgmp-dev libmpfr-dev libtommath-dev
       - name: Checkout main boost
         run: git clone -b develop --depth 1 https://github.com/boostorg/boost.git ../boost-root
       - name: Update tools/boostdep
@@ -329,16 +267,16 @@ jobs:
       - name: b2 config
         run: cat bin.v2/config.log
         working-directory: ../boost-root/
-  ubuntu-focal-ASAN:
-    runs-on: ubuntu-20.04
+  ubuntu-ASAN:
+    runs-on: ubuntu-latest
     defaults:
       run:
         shell: bash
     strategy:
       fail-fast: false
       matrix:
-        compiler: [ g++-10 ]
-        standard: [ c++17 ]
+        compiler: [ g++-13 ]
+        standard: [ c++20 ]
         suite: [ arithmetic_tests, functions_and_limits, conversions, cpp_int_tests, misc ]
     steps:
       - uses: actions/checkout@v4
@@ -361,7 +299,7 @@ jobs:
         if: steps.retry1.outcome=='failure'
         run: sudo apt-add-repository -y "ppa:ubuntu-toolchain-r/test"
       - name: Install packages
-        run: sudo apt install g++-10 libgmp-dev libmpfr-dev libtommath-dev libeigen3-dev
+        run: sudo apt install g++-13 libgmp-dev libmpfr-dev libtommath-dev libeigen3-dev
       - name: Checkout main boost
         run: git clone -b develop --depth 1 https://github.com/boostorg/boost.git ../boost-root
       - name: Update tools/boostdep
@@ -391,16 +329,16 @@ jobs:
       - name: b2 config
         run: cat bin.v2/config.log
         working-directory: ../boost-root/
-  ubuntu-focal-UBSAN:
-    runs-on: ubuntu-20.04
+  ubuntu-UBSAN:
+    runs-on: ubuntu-24.04
     defaults:
       run:
         shell: bash
     strategy:
       fail-fast: false
       matrix:
-        compiler: [ g++-10 ]
-        standard: [ c++17 ]
+        compiler: [ g++-13 ]
+        standard: [ c++20 ]
         suite: [ arithmetic_tests, functions_and_limits, misc ]
     steps:
       - uses: actions/checkout@v4
@@ -423,7 +361,7 @@ jobs:
         if: steps.retry1.outcome=='failure'
         run: sudo apt-add-repository -y "ppa:ubuntu-toolchain-r/test"
       - name: Install packages
-        run: sudo apt install g++-10 libgmp-dev libeigen3-dev
+        run: sudo apt install g++-13 libgmp-dev libeigen3-dev
       - name: Checkout main boost
         run: git clone -b develop --depth 1 https://github.com/boostorg/boost.git ../boost-root
       - name: Update tools/boostdep
@@ -454,7 +392,7 @@ jobs:
         run: cat bin.v2/config.log
         working-directory: ../boost-root/
   windows_gcc:
-    runs-on: windows-2019
+    runs-on: windows-latest
     defaults:
       run:
         shell: cmd
@@ -496,8 +434,8 @@ jobs:
       - name: b2 config
         run: cat bin.v2/config.log
         working-directory: ../boost-root/
-  windows_msvc_14_2:
-    runs-on: windows-2019
+  windows_msvc_14_3:
+    runs-on: windows-2022
     defaults:
       run:
         shell: cmd
@@ -506,7 +444,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        toolset: [ msvc-14.2 ]
+        toolset: [ msvc-14.3 ]
         standard: [ 14, 17, 20 ]
         suite: [ github_ci_block_1, github_ci_block_2 ]
     steps:

.drone/before-script.sh

@@ -1,20 +1,20 @@
-# /boost/libs/multiprecision/.gitignore
-# Use of manifest is unclear, so add to .gitignore.
-/doc/html/standalone_HTML.manifest
-*.DS_Store
-/**/*.dSYM/
-**/.temps/*
-build/*
-.vscode/*
-.idea/*
-
-# CMake Related Options
-*.a
-*.o
-cmake_install.cmake
-CMakeCache.txt
-Makefile
-**/CMakeFiles/**
-**CTestTestfile.cmake
-DartConfiguration.tcl
-cmake-build-debug/*
+# /boost/libs/multiprecision/.gitignore
+# Use of manifest is unclear, so add to .gitignore.
+/doc/html/standalone_HTML.manifest
+*.DS_Store
+/**/*.dSYM/
+**/.temps/*
+build/*
+.vscode/*
+.idea/*
+
+# CMake Related Options
+*.a
+*.o
+cmake_install.cmake
+CMakeCache.txt
+Makefile
+**/CMakeFiles/**
+**CTestTestfile.cmake
+DartConfiguration.tcl
+cmake-build-debug/*

.drone/boost.sh

@@ -38,7 +38,12 @@ else()
 
 endif()
 
-# Only enable tests when we're the root project
+if(BUILD_TESTING AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/test/CMakeLists.txt")
+
+  add_subdirectory(test)
+
+endif()
+
 if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
 
   #Testing with CMake not currently used