Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove gstats_label_ifs to avoid name clash #48

Merged
merged 2 commits into from
Dec 1, 2023
Merged

Remove gstats_label_ifs to avoid name clash #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b5f6ba8
Remove gstats_label_ifs to avoid name clash
reuterbal Nov 29, 2023
d363a16
Fix github actions building with intel compilers
wdeconinck Nov 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .github/tools/install-intel-oneapi.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
#!/bin/sh
#!/usr/bin/env bash

KEY=GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB
version=2023.2.0
KEY=GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB
wget https://apt.repos.intel.com/intel-gpg-keys/$KEY
sudo apt-key add $KEY
rm $KEY
echo "deb https://apt.repos.intel.com/oneapi all main" | sudo tee /etc/apt/sources.list.d/oneAPI.list
sudo apt-get update
sudo apt-get install \
intel-oneapi-compiler-fortran \
intel-oneapi-compiler-dpcpp-cpp-and-cpp-classic \
intel-oneapi-mpi \
intel-oneapi-mpi-devel \
intel-oneapi-mkl
intel-oneapi-compiler-fortran-$version \
intel-oneapi-compiler-dpcpp-cpp-and-cpp-classic-$version \
intel-oneapi-mpi-devel-2021.10.0 \
intel-oneapi-mkl-$version
8 changes: 4 additions & 4 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
- linux gnu-10
- linux clang-12
- linux nvhpc-21.9
- linux intel
- linux intel-classic
- macos

include:
Expand Down Expand Up @@ -77,9 +77,9 @@ jobs:
ctest_options: -E memory
caching: false

- name : linux intel
- name : linux intel-classic
os: ubuntu-20.04
compiler: intel-oneapi
compiler: intel-classic
compiler_cc: icc
compiler_cxx: icpc
compiler_fc: ifort
Expand Down Expand Up @@ -139,7 +139,7 @@ jobs:
${ECTRANS_TOOLS}/install-intel-oneapi.sh
source /opt/intel/oneapi/setvars.sh
printenv >> $GITHUB_ENV
echo "CACHE_SUFFIX=$(icc -dumpversion)" >> $GITHUB_ENV
echo "CACHE_SUFFIX=$CC-$($CC -dumpversion)" >> $GITHUB_ENV

- name: Install MPI
shell: bash -eux {0}
Expand Down
Loading