Skip to content

Commit 4408788

Browse files
iulusoyiulusoy
authored
fix failures for ifx version 2021.1.2 (#40)
1 parent cbb7f4e commit 4408788

File tree

6 files changed

+41
-39
lines changed

6 files changed

+41
-39
lines changed

‎.github/compat/compat.csv

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
compiler,gcc,gcc,gcc,gcc,gcc,intel,intel,intel,intel,intel,intel,intel,intel,intel,intel,intel,intel,intel,intel-classic,intel-classic,intel-classic,intel-classic,intel-classic,intel-classic,intel-classic,intel-classic,intel-classic,intel-classic,intel-classic,intel-classic,intel-classic,intel-classic,lfortran,lfortran,lfortran,nvidia-hpc,nvidia-hpc,nvidia-hpc,nvidia-hpc,nvidia-hpc,nvidia-hpc,nvidia-hpc,nvidia-hpc
2-
version,10,11,12,13,9,2021.1,2021.1.2,2021.2,2021.4,2022.0,2022.1,2022.2,2022.2.1,2023.0,2023.1,2023.2,2024.0,2024.1,2021.1,2021.1.2,2021.10,2021.11,2021.12,2021.2,2021.3,2021.4,2021.5,2021.6,2021.7,2021.7.1,2021.8,2021.9,0.31.0,0.32.0,0.33.0,20.11,21.11,22.11,23.11,23.3,23.5,23.7,23.9
2+
version,9,10,11,12,13,2021.1,2021.1.2,2021.2,2021.4,2022.0,2022.1,2022.2,2022.2.1,2023.0,2023.1,2023.2,2024.0,2024.1,2021.1,2021.1.2,2021.2,2021.3,2021.4,2021.5,2021.6,2021.7,2021.7.1,2021.8,2021.9,2021.10,2021.11,2021.12,0.31.0,0.32.0,0.33.0,20.11,21.11,22.11,23.3,23.5,23.7,23.9,23.11
33
runner,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
4-
macos-12,✓,✓,✓,✓,✓,,,,,,,,,,,,,,✓,,✓,,,✓,✓,✓,✓,✓,✓,,✓,✓,✓,✓,✓,,,,,,,,
5-
macos-13,✓,✓,✓,✓,,,,,,,,,,,,,,,✓,,✓,,,✓,✓,✓,✓,✓,✓,,✓,✓,✓,✓,✓,,,,,,,,
6-
macos-14,,✓,✓,✓,,,,,,,,,,,,,,,✓,,✓,,,✓,✓,✓,✓,✓,✓,,✓,✓,✓,✓,✓,,,,,,,,
7-
ubuntu-20.04,✓,✓,,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓
8-
ubuntu-22.04,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓
9-
windows-2019,✓,✓,✓,✓,✓,,,,,,✓,✓,,,✓,✓,✓,✓,,,✓,✓,✓,,,,,✓,✓,,,✓,✓,✓,✓,,,,,,,,
10-
windows-2022,✓,✓,✓,✓,✓,,,,,,✓,✓,,,✓,✓,✓,✓,,,✓,✓,✓,,,,,✓,✓,,,✓,✓,✓,✓,,,,,,,,
4+
macos-12,✓,✓,✓,✓,✓,,,,,,,,,,,,,,✓,,✓,✓,✓,✓,✓,✓,,✓,✓,✓,,,✓,✓,✓,,,,,,,,
5+
macos-13,,✓,✓,✓,✓,,,,,,,,,,,,,,✓,,✓,✓,✓,✓,✓,✓,,✓,✓,✓,,,✓,✓,✓,,,,,,,,
6+
macos-14,,,✓,✓,✓,,,,,,,,,,,,,,✓,,✓,✓,✓,✓,✓,✓,,✓,✓,✓,,,✓,✓,✓,,,,,,,,
7+
ubuntu-20.04,✓,✓,✓,,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓
8+
ubuntu-22.04,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓
9+
windows-2019,✓,✓,✓,✓,✓,,,,,,✓,✓,,,✓,✓,✓,✓,,,,,,,✓,✓,,,✓,✓,✓,✓,✓,✓,✓,,,,,,,,
10+
windows-2022,✓,✓,✓,✓,✓,,,,,,✓,✓,,,✓,✓,✓,✓,,,,,,,✓,✓,,,✓,✓,✓,✓,✓,✓,✓,,,,,,,,

‎.github/compat/wide_compat_reports.py

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# read long CSV
1717
df = pd.read_csv(ip)
1818

19-
# pivot and sort
19+
# pivot and sort by runners
2020
df = pd.pivot_table(
2121
df,
2222
index="runner",
@@ -26,6 +26,22 @@
2626
aggfunc="first",
2727
).sort_values(by=["runner"])
2828

29+
30+
# group by compiler and sort by versions
31+
grouped_versions = {}
32+
for compiler in df.columns.get_level_values("compiler").unique():
33+
versions = df.loc[:, (compiler,)].columns.get_level_values("version").unique()
34+
versions = sorted(versions, key=lambda version: tuple(map(int, version.split("."))))
35+
grouped_versions[compiler] = versions
36+
37+
sorted_columns = []
38+
for compiler in grouped_versions:
39+
sorted_columns.extend(
40+
[(compiler, version) for version in grouped_versions[compiler]]
41+
)
42+
43+
df = df[sorted_columns]
44+
2945
# write wide CSV
3046
df.to_csv(op)
3147

‎README.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -107,15 +107,15 @@ These are made available to subsequent workflow steps via the [`GITHUB_ENV` envi
107107
Toolchain support varies across GitHub-hosted runner images.
108108

109109
<!-- compat starts -->
110-
| runner | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 |
111-
|:-------------|:--------|:--------|:--------|:--------|:--------|:--------|:--------|:--------|
112-
| macos-11 | &check; | &check; | &check; | &check; | &check; | &check; | &check; | &check; |
113-
| macos-12 | &check; | &check; | &check; | &check; | &check; | &check; | &check; | &check; |
114-
| macos-13 | &check; | &check; | &check; | &check; | &check; | &check; | &check; | &check; |
115-
| ubuntu-20.04 | | &check; | &check; | &check; | &check; | &check; | | &check; |
116-
| ubuntu-22.04 | | | | &check; | &check; | &check; | &check; | &check; |
117-
| windows-2019 | | | &check; | &check; | &check; | &check; | &check; | |
118-
| windows-2022 | | | &check; | &check; | &check; | &check; | &check; | |
110+
| runner | gcc 9 | gcc 10 | gcc 11 | gcc 12 | gcc 13 | intel 2021.1 | intel 2021.1.2 | intel 2021.2 | intel 2021.4 | intel 2022.0 | intel 2022.1 | intel 2022.2 | intel 2022.2.1 | intel 2023.0 | intel 2023.1 | intel 2023.2 | intel 2024.0 | intel 2024.1 | intel-classic 2021.1 | intel-classic 2021.1.2 | intel-classic 2021.2 | intel-classic 2021.3 | intel-classic 2021.4 | intel-classic 2021.5 | intel-classic 2021.6 | intel-classic 2021.7 | intel-classic 2021.7.1 | intel-classic 2021.8 | intel-classic 2021.9 | intel-classic 2021.10 | intel-classic 2021.11 | intel-classic 2021.12 | lfortran 0.31.0 | lfortran 0.32.0 | lfortran 0.33.0 | nvidia-hpc 20.11 | nvidia-hpc 21.11 | nvidia-hpc 22.11 | nvidia-hpc 23.3 | nvidia-hpc 23.5 | nvidia-hpc 23.7 | nvidia-hpc 23.9 | nvidia-hpc 23.11 |
111+
|:-------------|:---------------|:----------------|:----------------|:----------------|:----------------|:----------------------|:------------------------|:----------------------|:----------------------|:----------------------|:----------------------|:----------------------|:------------------------|:----------------------|:----------------------|:----------------------|:----------------------|:----------------------|:------------------------------|:--------------------------------|:------------------------------|:------------------------------|:------------------------------|:------------------------------|:------------------------------|:------------------------------|:--------------------------------|:------------------------------|:------------------------------|:-------------------------------|:-------------------------------|:-------------------------------|:-------------------------|:-------------------------|:-------------------------|:--------------------------|:--------------------------|:--------------------------|:-------------------------|:-------------------------|:-------------------------|:-------------------------|:--------------------------|
112+
| macos-12 | &check; | &check; | &check; | &check; | &check; | | | | | | | | | | | | | | &check; | | &check; | &check; | &check; | &check; | &check; | &check; | | &check; | &check; | &check; | | | &check; | &check; | &check; | | | | | | | | |
113+
| macos-13 | | &check; | &check; | &check; | &check; | | | | | | | | | | | | | | &check; | | &check; | &check; | &check; | &check; | &check; | &check; | | &check; | &check; | &check; | | | &check; | &check; | &check; | | | | | | | | |
114+
| macos-14 | | | &check; | &check; | &check; | | | | | | | | | | | | | | &check; | | &check; | &check; | &check; | &check; | &check; | &check; | | &check; | &check; | &check; | | | &check; | &check; | &check; | | | | | | | | |
115+
| ubuntu-20.04 | &check; | &check; | &check; | | &check; | &check; | &check; | &check; | &check; | &check; | &check; | &check; | &check; | &check; | &check; | &check; | &check; | &check; | &check; | &check; | &check; | | &check; | &check; | &check; | &check; | &check; | &check; | &check; | &check; | &check; | &check; | &check; | &check; | &check; | &check; | &check; | &check; | &check; | &check; | &check; | &check; | &check; |
116+
| ubuntu-22.04 | &check; | &check; | &check; | &check; | &check; | &check; | &check; | &check; | &check; | &check; | &check; | &check; | &check; | &check; | &check; | &check; | &check; | &check; | &check; | &check; | &check; | | &check; | &check; | &check; | &check; | &check; | &check; | &check; | &check; | &check; | &check; | &check; | &check; | &check; | &check; | &check; | &check; | &check; | &check; | &check; | &check; | &check; |
117+
| windows-2019 | &check; | &check; | &check; | &check; | &check; | | | | | | &check; | &check; | | | &check; | &check; | &check; | &check; | | | | | | | &check; | &check; | | | &check; | &check; | &check; | &check; | &check; | &check; | &check; | | | | | | | | |
118+
| windows-2022 | &check; | &check; | &check; | &check; | &check; | | | | | | &check; | &check; | | | &check; | &check; | &check; | &check; | | | | | | | &check; | &check; | | | &check; | &check; | &check; | &check; | &check; | &check; | &check; | | | | | | | | |
119119
<!-- compat ends -->
120120

121121
**Note:** Intel's `ifx` compiler is not supported on macOS, so the `intel` option redirects to `intel-classic` (`ifort`).

‎action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: "Setup Fortran and libraries"
1+
name: "Setup Fortran and math libraries"
22
description: "Setup Fortran compiler and toolchain"
33
inputs:
44
compiler:

‎requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
pandas
2-
tabulate
2+
tabulate

‎setup-fortran.sh

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -397,6 +397,11 @@ install_intel_apt()
397397
| sudo tee /etc/apt/sources.list.d/oneAPI.list
398398
sudo apt-get update
399399

400+
# first install mkl, then the compilers, to keep setvars clean
401+
if $install_mkl; then
402+
sudo apt-get install intel-oneapi-mkl-$mkl_version
403+
fi
404+
400405
# c/cpp compiler package names changed with 2024+
401406
case $version in
402407
2024*)
@@ -408,26 +413,7 @@ install_intel_apt()
408413
intel-oneapi-compiler-{fortran,dpcpp-cpp-and-cpp-classic}-$version
409414
;;
410415
esac
411-
if $install_mkl; then
412-
sudo apt-get install intel-oneapi-mkl-$mkl_version
413-
fi
414-
415416
source /opt/intel/oneapi/setvars.sh
416-
417-
if $classic; then
418-
export FC="ifort"
419-
export CC="icc"
420-
export CXX="icpc"
421-
else
422-
export FC="ifx"
423-
export CC="icx"
424-
export CXX="icpx"
425-
fi
426-
if $install_mkl; then
427-
export MKLLIB="$ONEAPI_ROOT/mkl/latest/lib/intel64"
428-
export MKLROOT="$ONEAPI_ROOT/mkl/latest"
429-
fi
430-
431417
export_intel_vars
432418
}
433419

0 commit comments

Comments
 (0)