boostorg · mborland · Nov 5, 2024 · Aug 2, 2024 · Aug 6, 2024 · Aug 6, 2024
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -55,232 +55,8 @@ jobs:
           name: Running Inspect
           command: |
             cd $BOOST_REMOVE && ../../dist/bin/inspect -text
-  specfun_mpfr:
-    environment:
-      - BOOST_LIBRARY=multiprecision
-      - CXX_STANDARD=gnu++17
-    docker:
-      - image: gcc:9
-    steps:
-      - checkout
-      - run:
-          name: Setting up Environment
-          command: |
-            echo 'export BOOST="$HOME/boost-local"' >> $BASH_ENV
-            if [ $CIRCLE_BRANCH = "master" ]; then
-                echo 'export BOOST_BRANCH="master"' >> $BASH_ENV;
-            else
-                echo 'export BOOST_BRANCH="develop"' >> $BASH_ENV;
-            fi
-            echo 'export BOOST_REMOVE="$BOOST/boost/libs/$BOOST_LIBRARY"' >> $BASH_ENV
-            HOME_SED_=$(echo $HOME | sed -e 's/\//\\\//g')
-            echo 'export HOME_SED=$HOME_SED_' >> $BASH_ENV
-      - run:
-          name: install pre dependencies
-          command: |
-            apt-get update -yqq
-            apt-get install git libmpfr-dev libgmp-dev -y
-      - run:
-          name: Initializing git repo for boost
-          command: |
-            echo BOOST=$BOOST BOOST_REMOVE=$BOOST_REMOVE BOOST_LIBRARY=$BOOST_LIBRARY BOOST_BRANCH=$BOOST_BRANCH PWD=$PWD
-            mkdir $BOOST
-            cd $BOOST
-            git clone --single-branch --branch $BOOST_BRANCH https://github.com/boostorg/boost.git
-            cd boost
-            git submodule update --init --merge
-            rm -rf $BOOST_REMOVE
-            mv $HOME/project $BOOST_REMOVE
-      - run:
-          name: Bootstrapping boost-build
-          command: |
-            cd $BOOST/boost && ./bootstrap.sh && ./b2 headers
-      - run:
-          name: Building specfun MPFR Tests
-          command: |
-            cd $BOOST/boost/libs/multiprecision/test && ../../../b2 -j2 address-model=64 architecture=x86 toolset=gcc cxxstd=17 cxxstd-dialect=gnu specfun_mpfr
-  specfun_gmp:
-    environment:
-      - BOOST_LIBRARY=multiprecision
-      - CXX_STANDARD=gnu++17
-    docker:
-      - image: gcc:9
-    steps:
-      - checkout
-      - run:
-          name: Setting up Environment
-          command: |
-            echo 'export BOOST="$HOME/boost-local"' >> $BASH_ENV
-            if [ $CIRCLE_BRANCH = "master" ]; then
-                echo 'export BOOST_BRANCH="master"' >> $BASH_ENV;
-            else
-                echo 'export BOOST_BRANCH="develop"' >> $BASH_ENV;
-            fi
-            echo 'export BOOST_REMOVE="$BOOST/boost/libs/$BOOST_LIBRARY"' >> $BASH_ENV
-            HOME_SED_=$(echo $HOME | sed -e 's/\//\\\//g')
-            echo 'export HOME_SED=$HOME_SED_' >> $BASH_ENV
-      - run:
-          name: install pre dependencies
-          command: |
-            apt-get update -yqq
-            apt-get install git libgmp-dev -y
-      - run:
-          name: Initializing git repo for boost
-          command: |
-            echo BOOST=$BOOST BOOST_REMOVE=$BOOST_REMOVE BOOST_LIBRARY=$BOOST_LIBRARY BOOST_BRANCH=$BOOST_BRANCH PWD=$PWD
-            mkdir $BOOST
-            cd $BOOST
-            git clone --single-branch --branch $BOOST_BRANCH https://github.com/boostorg/boost.git
-            cd boost
-            git submodule update --init --merge
-            rm -rf $BOOST_REMOVE
-            mv $HOME/project $BOOST_REMOVE
-      - run:
-          name: Bootstrapping boost-build
-          command: |
-            cd $BOOST/boost && ./bootstrap.sh && ./b2 headers
-      - run:
-          name: Building specfun GMP Tests
-          command: |
-            cd $BOOST/boost/libs/multiprecision/test && ../../../b2 -j2 address-model=64 architecture=x86 toolset=gcc cxxstd=17 cxxstd-dialect=gnu specfun_gmp
-  specfun_cpp_dec_float:
-    environment:
-      - BOOST_LIBRARY=multiprecision
-      - CXX_STANDARD=gnu++17
-    docker:
-      - image: gcc:9
-    steps:
-      - checkout
-      - run:
-          name: Setting up Environment
-          command: |
-            echo 'export BOOST="$HOME/boost-local"' >> $BASH_ENV
-            if [ $CIRCLE_BRANCH = "master" ]; then
-                echo 'export BOOST_BRANCH="master"' >> $BASH_ENV;
-            else
-                echo 'export BOOST_BRANCH="develop"' >> $BASH_ENV;
-            fi
-            echo 'export BOOST_REMOVE="$BOOST/boost/libs/$BOOST_LIBRARY"' >> $BASH_ENV
-            HOME_SED_=$(echo $HOME | sed -e 's/\//\\\//g')
-            echo 'export HOME_SED=$HOME_SED_' >> $BASH_ENV
-      - run:
-          name: install pre dependencies
-          command: |
-            apt-get update -yqq
-            apt-get install git -y
-      - run:
-          name: Initializing git repo for boost
-          command: |
-            echo BOOST=$BOOST BOOST_REMOVE=$BOOST_REMOVE BOOST_LIBRARY=$BOOST_LIBRARY BOOST_BRANCH=$BOOST_BRANCH PWD=$PWD
-            mkdir $BOOST
-            cd $BOOST
-            git clone --single-branch --branch $BOOST_BRANCH https://github.com/boostorg/boost.git
-            cd boost
-            git submodule update --init --merge
-            rm -rf $BOOST_REMOVE
-            mv $HOME/project $BOOST_REMOVE
-      - run:
-          name: Bootstrapping boost-build
-          command: |
-            cd $BOOST/boost && ./bootstrap.sh && ./b2 headers
-      - run:
-          name: Building specfun cpp_dec_float Tests
-          command: |
-            cd $BOOST/boost/libs/multiprecision/test && ../../../b2 -j2 address-model=64 architecture=x86 toolset=gcc cxxstd=17 cxxstd-dialect=gnu specfun_cpp_dec_float
-  specfun_cpp_bin_float:
-    environment:
-      - BOOST_LIBRARY=multiprecision
-      - CXX_STANDARD=gnu++17
-    docker:
-      - image: gcc:9
-    steps:
-      - checkout
-      - run:
-          name: Setting up Environment
-          command: |
-            echo 'export BOOST="$HOME/boost-local"' >> $BASH_ENV
-            if [ $CIRCLE_BRANCH = "master" ]; then
-                echo 'export BOOST_BRANCH="master"' >> $BASH_ENV;
-            else
-                echo 'export BOOST_BRANCH="develop"' >> $BASH_ENV;
-            fi
-            echo 'export BOOST_REMOVE="$BOOST/boost/libs/$BOOST_LIBRARY"' >> $BASH_ENV
-            HOME_SED_=$(echo $HOME | sed -e 's/\//\\\//g')
-            echo 'export HOME_SED=$HOME_SED_' >> $BASH_ENV
-      - run:
-          name: install pre dependencies
-          command: |
-            apt-get update -yqq
-            apt-get install git -y
-      - run:
-          name: Initializing git repo for boost
-          command: |
-            echo BOOST=$BOOST BOOST_REMOVE=$BOOST_REMOVE BOOST_LIBRARY=$BOOST_LIBRARY BOOST_BRANCH=$BOOST_BRANCH PWD=$PWD
-            mkdir $BOOST
-            cd $BOOST
-            git clone --single-branch --branch $BOOST_BRANCH https://github.com/boostorg/boost.git
-            cd boost
-            git submodule update --init --merge
-            rm -rf $BOOST_REMOVE
-            mv $HOME/project $BOOST_REMOVE
-      - run:
-          name: Bootstrapping boost-build
-          command: |
-            cd $BOOST/boost && ./bootstrap.sh && ./b2 headers
-      - run:
-          name: Building specfun cpp_bin_float Tests
-          command: |
-            cd $BOOST/boost/libs/multiprecision/test && ../../../b2 -j2 address-model=64 architecture=x86 toolset=gcc cxxstd=17 cxxstd-dialect=gnu specfun_cpp_bin_float
-  specfun_float128:
-    environment:
-      - BOOST_LIBRARY=multiprecision
-      - CXX_STANDARD=gnu++17
-    docker:
-      - image: gcc:9
-    steps:
-      - checkout
-      - run:
-          name: Setting up Environment
-          command: |
-            echo 'export BOOST="$HOME/boost-local"' >> $BASH_ENV
-            if [ $CIRCLE_BRANCH = "master" ]; then
-                echo 'export BOOST_BRANCH="master"' >> $BASH_ENV;
-            else
-                echo 'export BOOST_BRANCH="develop"' >> $BASH_ENV;
-            fi
-            echo 'export BOOST_REMOVE="$BOOST/boost/libs/$BOOST_LIBRARY"' >> $BASH_ENV
-            HOME_SED_=$(echo $HOME | sed -e 's/\//\\\//g')
-            echo 'export HOME_SED=$HOME_SED_' >> $BASH_ENV
-      - run:
-          name: install pre dependencies
-          command: |
-            apt-get update -yqq
-            apt-get install git -y
-      - run:
-          name: Initializing git repo for boost
-          command: |
-            echo BOOST=$BOOST BOOST_REMOVE=$BOOST_REMOVE BOOST_LIBRARY=$BOOST_LIBRARY BOOST_BRANCH=$BOOST_BRANCH PWD=$PWD
-            mkdir $BOOST
-            cd $BOOST
-            git clone --single-branch --branch $BOOST_BRANCH https://github.com/boostorg/boost.git
-            cd boost
-            git submodule update --init --merge
-            rm -rf $BOOST_REMOVE
-            mv $HOME/project $BOOST_REMOVE
-      - run:
-          name: Bootstrapping boost-build
-          command: |
-            cd $BOOST/boost && ./bootstrap.sh && ./b2 headers
-      - run:
-          name: Building specfun float128 Tests
-          command: |
-            cd $BOOST/boost/libs/multiprecision/test && ../../../b2 -j2 address-model=64 architecture=x86 toolset=gcc cxxstd=17 cxxstd-dialect=gnu specfun_float128
 workflows:
   version: 2
   build_and_test:
     jobs:
       - inspect
-      - specfun_mpfr
-      - specfun_gmp
-      - specfun_cpp_dec_float
-      - specfun_float128
diff --git a/.github/workflows/multiprecision.yml b/.github/workflows/multiprecision.yml
@@ -82,6 +82,67 @@ jobs:
       - 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 ]
+    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=gnu++17 ;" > ~/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 
+        working-directory: ../boost-root/libs/multiprecision/test
+      - name: b2 config
+        run: cat bin.v2/config.log
+        working-directory: ../boost-root/
   ubuntu-focal:
     runs-on: ubuntu-20.04
     defaults:
@@ -435,49 +496,6 @@ jobs:
       - name: b2 config
         run: cat bin.v2/config.log
         working-directory: ../boost-root/
-  windows_msvc_14_0:
-    runs-on: windows-2019
-    defaults:
-      run:
-        shell: cmd
-    env:
-      ARGS: toolset=${{ matrix.toolset }} address-model=64 cxxstd=${{ matrix.standard }}
-    strategy:
-      fail-fast: false
-      matrix:
-        toolset: [ msvc-14.0 ]
-        standard: [ 14, latest ]
-        suite: [ github_ci_block_1, github_ci_block_2 ]
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: '0'
-      - 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: xcopy /s /e /q %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
-        working-directory: ../boost-root
-      - name: Generate headers
-        run: b2 headers
-        working-directory: ../boost-root
-      - name: Config Info
-        run: ..\..\..\b2 print_config_info print_math_info %ARGS%
-        working-directory: ../boost-root/libs/config/test
-      - name: Test
-        run: ..\..\..\b2 -j2 --hash %ARGS% define=CI_SUPPRESS_KNOWN_ISSUES ${{ matrix.suite }}
-        working-directory: ../boost-root/libs/multiprecision/test
-      - name: b2 config
-        run: cat bin.v2/config.log
-        working-directory: ../boost-root/
   windows_msvc_14_2:
     runs-on: windows-2019
     defaults:

diff --git a/config/Jamfile.v2 b/config/Jamfile.v2
@@ -70,6 +70,7 @@ mp-run-simple has_mpc.cpp mpc mpfr gmp : : :
 mp-run-simple has_tommath.cpp tommath : : :
       <include>$(tommath_path) : has_tommath ;
 mp-run-simple has_float128.cpp quadmath : : : : has_float128 ;
+mp-run-simple has_basic_float128.cpp quadmath : : : : has_basic_float128 ;
 exe has_intel_quad : has_intel_quad.cpp : <cxxflags>-Qoption,cpp,--extended_float_type ;
 exe has_eigen : has_eigen.cpp ;
 exe has_f2c : has_f2c.cpp f2c ;
@@ -83,6 +84,7 @@ explicit has_mpfr ;
 explicit has_mpfi ;
 explicit has_tommath ;
 explicit has_float128 ;
+explicit has_basic_float128 ;
 explicit has_intel_quad ;
 explicit has_mpc ;
 explicit has_eigen ;

diff --git a/config/has_basic_float128.cpp b/config/has_basic_float128.cpp
@@ -0,0 +1,16 @@
+//  Copyright John Maddock 2024.
+//  Use, modification and distribution are subject to 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)
+
+#include <boost/config.hpp>
+
+#include <quadmath.h>
+
+int main()
+{
+   __float128 f = 0;
+   f = sqrtq(f);
+
+   return 0;
+}