diff --git a/.github/workflows/meson.yml b/.github/workflows/meson.yml index fc911f57..f3d57d65 100644 --- a/.github/workflows/meson.yml +++ b/.github/workflows/meson.yml @@ -17,6 +17,16 @@ jobs: metis: [32, 64] include: - compiler: gcc + - os: ubuntu-latest + compiler: intel + compiler_version: '2023.2' + metis: 32 + allow_failure: true + - os: ubuntu-latest + compiler: intel + compiler_version: '2023.2' + metis: 64 + allow_failure: true - os: macos-latest compiler: gcc compiler_version: '13' @@ -29,11 +39,11 @@ jobs: arch: 'arm64' metis: 64 allow_failure: true - # - os: ubuntu-latest - # compiler: nvidia-hpc - # compiler_version: '23.11' - # metis: 32 - # allow_failure: true + - os: ubuntu-latest + compiler: nvidia-hpc + compiler_version: '25.1' + metis: 32 + allow_failure: true runs-on: ${{ matrix.os }} steps: - name: Check out SPRAL diff --git a/meson.build b/meson.build index 4a586c98..c0735921 100644 --- a/meson.build +++ b/meson.build @@ -118,6 +118,12 @@ elif cxx.get_id() == 'intel-cl' or cxx.get_id() == 'intel-llvm-cl' endif lomp = '-lgomp' +if cxx.get_id() == 'intel' or cxx.get_id() == 'intel-llvm' + lomp = '-liomp5' +endif +if cxx.get_id() == 'nvidia_hpc' + lomp = '-lomp' +endif if host_machine.system() == 'darwin' or host_machine.system() == 'freebsd' if cxx.get_id() == 'clang' lomp = '-lomp'