From 665e1db61f0f9b17f7f39bd7e661e4bc886fb723 Mon Sep 17 00:00:00 2001 From: Matt Borland Date: Fri, 19 Jul 2024 13:36:37 -0400 Subject: [PATCH 1/3] Add intel compiler to CI --- .github/workflows/ci.yml | 77 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cdd5404fcf..552ceb2438 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,6 +19,83 @@ concurrency: cancel-in-progress: true jobs: + intel: + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + compiler: [ intel ] + standard: [ c++20 ] + suite: [ github_ci_block_1, github_ci_block_2 ] + steps: + - uses: actions/checkout@v4 + with: + fetch-depth: '0' + + - name: Intel Apt repository + timeout-minutes: 1 + run: | + wget https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB + sudo apt-key add GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB + rm GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB + echo "deb https://apt.repos.intel.com/oneapi all main" | sudo tee /etc/apt/sources.list.d/oneAPI.list + sudo apt-get update + + - name: Install Intel oneAPI compilers + timeout-minutes: 5 + run: sudo apt-get install -y intel-oneapi-compiler-fortran intel-oneapi-compiler-dpcpp-cpp + + - name: Setup Intel oneAPI environment + run: | + source /opt/intel/oneapi/setvars.sh + printenv >> $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-get install -y 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: Install deps + run: python tools/boostdep/depinst/depinst.py math -I example -I tools + 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 intel : : icpx : -std=${{ matrix.standard }} ;" > ~/user-config.jam' + working-directory: ../boost-root + - name: Config info install + run: ../../../b2 config_info_travis_install toolset=intel + working-directory: ../boost-root/libs/config/test + - name: Config info + run: ./config_info_travis + working-directory: ../boost-root/libs/config/test + - name: Test + run: ../../../b2 toolset=intel ${{ matrix.suite }} define=CI_SUPPRESS_KNOWN_ISSUES define=SLOW_COMPILER define=BOOST_MATH_RUN_MP_TESTS + working-directory: ../boost-root/libs/math/test + ubuntu-noble: runs-on: ubuntu-24.04 strategy: From 73d0da5c8e863e247c8d1088fd6b8d78f807569e Mon Sep 17 00:00:00 2001 From: Matt Borland Date: Fri, 19 Jul 2024 16:03:39 -0400 Subject: [PATCH 2/3] link TBB --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 552ceb2438..7ff8bedc92 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -93,7 +93,7 @@ jobs: run: ./config_info_travis working-directory: ../boost-root/libs/config/test - name: Test - run: ../../../b2 toolset=intel ${{ matrix.suite }} define=CI_SUPPRESS_KNOWN_ISSUES define=SLOW_COMPILER define=BOOST_MATH_RUN_MP_TESTS + run: ../../../b2 toolset=intel ${{ matrix.suite }} linkflags=-ltbb define=CI_SUPPRESS_KNOWN_ISSUES define=SLOW_COMPILER define=BOOST_MATH_RUN_MP_TESTS working-directory: ../boost-root/libs/math/test ubuntu-noble: From fba432ac6a0949eb1048d07da58ceb99a6654d36 Mon Sep 17 00:00:00 2001 From: Matt Borland Date: Fri, 19 Jul 2024 17:14:07 -0400 Subject: [PATCH 3/3] Remove obsolete command line option --- example/Jamfile.v2 | 1 - 1 file changed, 1 deletion(-) diff --git a/example/Jamfile.v2 b/example/Jamfile.v2 index 34e4a5a8c8..dd5e2dd892 100644 --- a/example/Jamfile.v2 +++ b/example/Jamfile.v2 @@ -14,7 +14,6 @@ project gcc:-Wno-missing-braces darwin:-Wno-missing-braces acc:+W2068,2461,2236,4070 - intel:-Qwd264,239 msvc:all msvc:on msvc:_CRT_SECURE_NO_DEPRECATE