Merge pull request #729 from mborland/cygwin

Cygwin, FreeBSD and Long Doubles
boostorg · Feb 15, 2022 · 20ae7d1 · 20ae7d1
2 parents 9ad4c29 + cf58986
commit 20ae7d1
Show file tree

Hide file tree

Showing 15 changed files with 360 additions and 109 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -27,7 +27,7 @@ jobs:
           fetch-depth: '0'
       - uses: mstachniuk/ci-skip@v1
         with:
-          commit-filter: '[skip ci];[ci skip];[CI SKIP];[SKIP CI];***CI SKIP***;***SKIP CI***;[windows];[Windows];[WINDOWS];[apple];[Apple];[APPLE];[standalone];[STANDALONE]'
+          commit-filter: '[skip ci];[ci skip];[CI SKIP];[SKIP CI];***CI SKIP***;***SKIP CI***;[windows];[Windows];[WINDOWS];[apple];[Apple];[APPLE];[standalone];[STANDALONE];[cygwin];[CYGWIN]'
           commit-filter-separator: ';'
           fail-fast: true
       - name: Set TOOLSET
@@ -91,7 +91,7 @@ jobs:
           fetch-depth: '0'
       - uses: mstachniuk/ci-skip@v1
         with:
-          commit-filter: '[skip ci];[ci skip];[CI SKIP];[SKIP CI];***CI SKIP***;***SKIP CI***;[windows];[Windows];[WINDOWS];[apple];[Apple];[APPLE];[standalone];[STANDALONE]'
+          commit-filter: '[skip ci];[ci skip];[CI SKIP];[SKIP CI];***CI SKIP***;***SKIP CI***;[windows];[Windows];[WINDOWS];[apple];[Apple];[APPLE];[standalone];[STANDALONE];[cygwin];[CYGWIN]'
           commit-filter-separator: ';'
           fail-fast: true
       - name: Set TOOLSET
@@ -155,7 +155,7 @@ jobs:
           fetch-depth: '0'
       - uses: mstachniuk/ci-skip@v1
         with:
-          commit-filter: '[skip ci];[ci skip];[CI SKIP];[SKIP CI];***CI SKIP***;***SKIP CI***;[windows];[Windows];[WINDOWS];[linux];[Linux];[LINUX];[standalone];[STANDALONE]'
+          commit-filter: '[skip ci];[ci skip];[CI SKIP];[SKIP CI];***CI SKIP***;***SKIP CI***;[windows];[Windows];[WINDOWS];[linux];[Linux];[LINUX];[standalone];[STANDALONE];[cygwin];[CYGWIN]'
           commit-filter-separator: ';'
           fail-fast: true
       - name: Checkout main boost
@@ -203,7 +203,7 @@ jobs:
           fetch-depth: '0'
       - uses: mstachniuk/ci-skip@v1
         with:
-          commit-filter: '[skip ci];[ci skip];[CI SKIP];[SKIP CI];***CI SKIP***;***SKIP CI***;[apple];[Apple];[APPLE];[linux];[Linux];[LINUX];[standalone];[STANDALONE]'
+          commit-filter: '[skip ci];[ci skip];[CI SKIP];[SKIP CI];***CI SKIP***;***SKIP CI***;[apple];[Apple];[APPLE];[linux];[Linux];[LINUX];[standalone];[STANDALONE];[cygwin];[CYGWIN]'
           commit-filter-separator: ';'
           fail-fast: true
       - name: Checkout main boost
@@ -279,92 +279,136 @@ jobs:
       - name: Test
         run: ..\..\..\b2 --hash %ARGS% define=CI_SUPPRESS_KNOWN_ISSUES ${{ matrix.suite }}
         working-directory: ../boost-root/libs/math/test
+  cygwin:
+    runs-on: windows-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        compiler: [ g++-11 ]
+        standard: [ c++17 ]
+        suite: [ float128_tests, special_fun, distribution_tests, misc, quadrature, mp, interpolators, autodiff, ../example//examples, ../tools ]
+    env:
+      TOOLSET: gcc
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: '0'
+      - uses: mstachniuk/ci-skip@v1
+        with:
+          commit-filter: '[skip ci];[ci skip];[CI SKIP];[SKIP CI];***CI SKIP***;***SKIP CI***;[apple];[Apple];[APPLE];[linux];[Linux];[LINUX];[standalone];[STANDALONE]'
+          commit-filter-separator: ';'
+          fail-fast: true
+      - name: Install Cygwin
+        run: |
+          choco install git gcc-core gcc-g++ python39 libgmp-devel libmpfr-devel libfftw3-devel --source cygwin
+      - name: Checkout main boost
+        run: C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && git clone -b develop --depth 1 https://github.com/boostorg/boost.git ../boost-root'
+      - name: Update tools/boostdep
+        run: C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE")/../boost-root && git submodule update --init tools/boostdep'
+      - name: Copy files
+        run: C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && cp -r * ../boost-root/libs/math'
+      - name: Install deps
+        run: C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE")/../boost-root && python tools/boostdep/depinst/depinst.py math'
+      - name: Bootstrap
+        run: C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE")/../boost-root && ./bootstrap.sh'
+      - name: Generate headers
+        run: C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE")/../boost-root && ./b2 headers'
+      - name: Config info install
+        run: C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE")/../boost-root/libs/config/test && ../../../b2 config_info_travis_install toolset=$TOOLSET'
+      - name: Config info
+        run: C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE")/../boost-root/libs/config/test && ./config_info_travis'
+      - name: Test
+        run: C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE")/../boost-root/libs/math/test && ../../../b2 toolset=$TOOLSET ${{ matrix.suite }} define=CI_SUPPRESS_KNOWN_ISSUES define=SLOW_COMPILER'
   standalone-compile-tests-gcc:
-      runs-on: ubuntu-20.04
-      strategy:
-        fail-fast: false
-      steps:
-        - uses: actions/checkout@v2
-          with:
-            fetch-depth: '0'
-        - uses: mstachniuk/ci-skip@v1
-          with:
-            commit-filter: '[skip ci];[ci skip];[CI SKIP];[SKIP CI];***CI SKIP***;***SKIP CI***;[windows];[Windows];[WINDOWS];[apple];[Apple];[APPLE]'
-            commit-filter-separator: ';'
-            fail-fast: true
-        - 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++-10 libgmp-dev libmpfr-dev libfftw3-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/math
-          working-directory: ../boost-root
-        - name: Run CMake
-          run: cmake -DBUILD_TESTING=1 -DCMAKE_CXX_COMPILER=g++-10 .
-          working-directory: ../boost-root/libs/math
-        - name: Run Compile Tests
-          run: make -j$((`nproc`+1))
-          working-directory: ../boost-root/libs/math
+    runs-on: ubuntu-20.04
+    strategy:
+      fail-fast: false
+      matrix:
+        compiler: [ g++-10 ]
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: '0'
+      - uses: mstachniuk/ci-skip@v1
+        with:
+          commit-filter: '[skip ci];[ci skip];[CI SKIP];[SKIP CI];***CI SKIP***;***SKIP CI***;[windows];[Windows];[WINDOWS];[apple];[Apple];[APPLE];[cygwin];[CYGWIN]'
+          commit-filter-separator: ';'
+          fail-fast: true
+      - 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++-10 libgmp-dev libmpfr-dev libfftw3-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/math
+        working-directory: ../boost-root
+      - name: Run CMake
+        run: cmake -DBUILD_TESTING=1 -DCMAKE_CXX_COMPILER=g++-10 .
+        working-directory: ../boost-root/libs/math
+      - name: Run Compile Tests
+        run: make -j$((`nproc`+1))
+        working-directory: ../boost-root/libs/math
   standalone-compile-tests-clang:
-      runs-on: ubuntu-20.04
-      strategy:
-        fail-fast: false
-      steps:
-        - uses: actions/checkout@v2
-          with:
-            fetch-depth: '0'
-        - uses: mstachniuk/ci-skip@v1
-          with:
-            commit-filter: '[skip ci];[ci skip];[CI SKIP];[SKIP CI];***CI SKIP***;***SKIP CI***;[windows];[Windows];[WINDOWS];[apple];[Apple];[APPLE]'
-            commit-filter-separator: ';'
-            fail-fast: true
-        - 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 clang-10 libgmp-dev libmpfr-dev libfftw3-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/math
-          working-directory: ../boost-root
-        - name: Run CMake
-          run: cmake -DBUILD_TESTING=1 -DCMAKE_CXX_COMPILER=clang++-10 .
-          working-directory: ../boost-root/libs/math
-        - name: Run Compile Tests
-          run: make -j$((`nproc`+1))
-          working-directory: ../boost-root/libs/math
+    runs-on: ubuntu-20.04
+    strategy:
+      fail-fast: false
+      matrix:
+        compiler: [ clang++-10 ]
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: '0'
+      - uses: mstachniuk/ci-skip@v1
+        with:
+          commit-filter: '[skip ci];[ci skip];[CI SKIP];[SKIP CI];***CI SKIP***;***SKIP CI***;[windows];[Windows];[WINDOWS];[apple];[Apple];[APPLE];[cygwin];[CYGWIN]'
+          commit-filter-separator: ';'
+          fail-fast: true
+      - 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 clang-10 libgmp-dev libmpfr-dev libfftw3-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/math
+        working-directory: ../boost-root
+      - name: Run CMake
+        run: cmake -DBUILD_TESTING=1 -DCMAKE_CXX_COMPILER=clang++-10 .
+        working-directory: ../boost-root/libs/math
+      - name: Run Compile Tests
+        run: make -j$((`nproc`+1))
+        working-directory: ../boost-root/libs/math
   standalone-gcc:
     runs-on: ubuntu-20.04
     strategy:

diff --git a/config/Jamfile.v2 b/config/Jamfile.v2
@@ -35,6 +35,7 @@ obj has_gmp : has_gmp.cpp :
       <include>$(gmp_path) <include>$(gmp_path)/mpfr <include>$(gmp_path)/gmpfrxx ;
 obj is_ci_sanitizer_run : is_ci_sanitizer_run.cpp ;
 obj is_ci_standalone_run : is_ci_standalone_run.cpp ;
+obj is_cygwin_run : is_cygwin_run.cpp ;
 
 explicit has_long_double_support ;
 explicit has_mpfr_class ;
@@ -50,3 +51,4 @@ explicit has_128bit_floatmax_t ;
 explicit has_fftw3 ;
 explicit is_ci_sanitizer_run ;
 explicit is_ci_standalone_run ;
+explicit is_cygwin_run ;
diff --git a/config/is_cygwin_run.cpp b/config/is_cygwin_run.cpp
@@ -0,0 +1,13 @@
+//  Copyright Matt Borland 2022.
+//  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)
+
+#ifndef __CYGWIN__
+# error "Cygwin run is NOT in effect".
+#endif
+
+int main()
+{
+   return 0;
+}
diff --git a/include/boost/math/tools/config.hpp b/include/boost/math/tools/config.hpp
@@ -90,7 +90,7 @@
 
 #include <boost/math/tools/user.hpp>
 
-#if (defined(__CYGWIN__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__EMSCRIPTEN__)\
+#if (defined(__NetBSD__) || defined(__EMSCRIPTEN__)\
    || (defined(__hppa) && !defined(__OpenBSD__)) || (defined(__NO_LONG_DOUBLE_MATH) && (DBL_MANT_DIG != LDBL_MANT_DIG))) \
    && !defined(BOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS)
 //#  define BOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS