Skip to content

Commit 52b206f

Browse files
wpbonelliwpbonelli
authored
feat: support intel 2024.0 on linux and windows (fortran-lang#64)
1 parent 82ccb70 commit 52b206f

File tree

5 files changed

+46
-34
lines changed

5 files changed

+46
-34
lines changed

‎.github/compat/compat.csv

+11-11
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
compiler,gcc,gcc,gcc,gcc,gcc,gcc,gcc,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,intel,intel,intel,intel,intel,intel,intel,intel,intel,intel,nvidia-hpc,nvidia-hpc,nvidia-hpc,nvidia-hpc,nvidia-hpc,nvidia-hpc,nvidia-hpc,nvidia-hpc
2-
version,10,11,12,13,7,8,9,2021.1,2021.10,2021.2,2021.3,2021.4,2021.5,2021.6,2021.7.1,2021.7,2021.8,2021.9,2021.1.2,2021.1.2,2021.1,2021.2,2021.4,2022.0,2022.1,2022.2.1,2022.2,2023.0,2023.1,2023.2,20.11,21.11,22.11,23.11,23.3,23.5,23.7,23.9
3-
runner,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
4-
macos-11,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,,,,,,,,,,,,,,,,,,,,
5-
macos-12,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,,,,,,,,,,,,,,,,,,,,
6-
macos-13,✓,✓,✓,✓,,,,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,,,,,,,,,,,,,,,,,,,,
7-
macos-14,,✓,✓,✓,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
8-
ubuntu-20.04,✓,✓,,✓,✓,✓,✓,✓,✓,✓,,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓
9-
ubuntu-22.04,✓,✓,✓,✓,,,✓,✓,✓,✓,,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓
10-
windows-2019,✓,✓,✓,✓,,✓,✓,,✓,,,,,✓,,✓,✓,✓,,,,,,,✓,,✓,✓,✓,✓,,,,,,,,
11-
windows-2022,✓,✓,✓,✓,,✓,✓,,✓,,,,,✓,,✓,✓,✓,,,,,,,✓,,✓,✓,✓,✓,,,,,,,,
1+
compiler,gcc,gcc,gcc,gcc,gcc,gcc,gcc,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,intel,intel,intel,intel,intel,intel,intel,intel,intel,intel,intel,nvidia-hpc,nvidia-hpc,nvidia-hpc,nvidia-hpc,nvidia-hpc,nvidia-hpc,nvidia-hpc,nvidia-hpc
2+
version,10,11,12,13,7,8,9,2021.1,2021.10,2021.2,2021.3,2021.4,2021.5,2021.6,2021.7.1,2021.7,2021.8,2021.9,2021.1.2,2021.1.2,2021.1,2021.2,2021.4,2022.0,2022.1,2022.2.1,2022.2,2023.0,2023.1,2023.2,2024.0,20.11,21.11,22.11,23.11,23.3,23.5,23.7,23.9
3+
runner,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
4+
macos-11,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,,,,,,,,,,,,,,,,,,,,,
5+
macos-12,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,,,,,,,,,,,,,,,,,,,,,
6+
macos-13,✓,✓,✓,✓,,,,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,,,,,,,,,,,,,,,,,,,,,
7+
macos-14,,✓,✓,✓,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
8+
ubuntu-20.04,✓,✓,,✓,✓,✓,✓,✓,✓,✓,,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓
9+
ubuntu-22.04,✓,✓,✓,✓,,,✓,✓,✓,✓,,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓
10+
windows-2019,✓,✓,✓,✓,,✓,✓,,✓,,,,,✓,,✓,✓,✓,,,,,,,✓,,✓,✓,✓,✓,✓,,,,,,,,
11+
windows-2022,✓,✓,✓,✓,,✓,✓,,✓,,,,,✓,,✓,✓,✓,,,,,,,✓,,✓,✓,✓,✓,✓,,,,,,,,

‎.github/compat/long_compat.csv

+4
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ ubuntu-20.04,intel,2022.2,✓
9393
ubuntu-20.04,intel,2023.0,✓
9494
ubuntu-20.04,intel,2023.1,✓
9595
ubuntu-20.04,intel,2023.2,✓
96+
ubuntu-20.04,intel,2024.0,✓
9697
ubuntu-20.04,nvidia-hpc,20.11,✓
9798
ubuntu-20.04,nvidia-hpc,20.7,
9899
ubuntu-20.04,nvidia-hpc,20.9,
@@ -136,6 +137,7 @@ ubuntu-22.04,intel,2022.2,✓
136137
ubuntu-22.04,intel,2023.0,✓
137138
ubuntu-22.04,intel,2023.1,✓
138139
ubuntu-22.04,intel,2023.2,✓
140+
ubuntu-22.04,intel,2024.0,✓
139141
ubuntu-22.04,nvidia-hpc,20.11,✓
140142
ubuntu-22.04,nvidia-hpc,20.7,
141143
ubuntu-22.04,nvidia-hpc,20.9,
@@ -179,6 +181,7 @@ windows-2019,intel,2022.2,✓
179181
windows-2019,intel,2023.0,✓
180182
windows-2019,intel,2023.1,✓
181183
windows-2019,intel,2023.2,✓
184+
windows-2019,intel,2024.0,✓
182185
windows-2022,gcc,10,✓
183186
windows-2022,gcc,11,✓
184187
windows-2022,gcc,12,✓
@@ -210,3 +213,4 @@ windows-2022,intel,2022.2,✓
210213
windows-2022,intel,2023.0,✓
211214
windows-2022,intel,2023.1,✓
212215
windows-2022,intel,2023.2,✓
216+
windows-2022,intel,2024.0,✓

‎.github/compat/matrix.yml

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ toolchain:
1414
- {compiler: gcc, version: 9}
1515
- {compiler: gcc, version: 8}
1616
- {compiler: gcc, version: 7}
17+
- {compiler: intel, version: '2024.0'}
1718
- {compiler: intel, version: '2023.2'}
1819
- {compiler: intel, version: '2023.1'}
1920
- {compiler: intel, version: '2023.0'}

‎install-intel-windows.bat

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ start /b /wait %TEMP%\webimage.exe -s -x -f %TEMP%\webimage_extracted --log %TEM
66
del %TEMP%\webimage.exe
77

88
:: run installer
9-
%TEMP%\webimage_extracted\bootstrapper.exe -s --action install --components=intel.oneapi.win.cpp-compiler:intel.oneapi.win.ifort-compiler --eula=accept -p=NEED_VS2017_INTEGRATION=0 -p=NEED_VS2019_INTEGRATION=0 -p=NEED_VS2022_INTEGRATION=0 --log-dir=%TEMP%
9+
%TEMP%\webimage_extracted\bootstrapper.exe -s --action install --components=%2 --eula=accept -p=NEED_VS2017_INTEGRATION=0 -p=NEED_VS2019_INTEGRATION=0 -p=NEED_VS2022_INTEGRATION=0 --log-dir=%TEMP%

‎setup-fortran.sh

+29-22
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,10 @@ intel_version_map_l()
227227
esac
228228
else
229229
case $actual_version in
230+
# 2024 versions omit patch version number in pkg name
231+
2024.0*)
232+
version=2024.0
233+
;;
230234
2022.0.0 | 2022.0)
231235
version=2022.0.2
232236
;;
@@ -304,6 +308,9 @@ intel_version_map_w()
304308
esac
305309
else
306310
case $actual_version in
311+
2024 | 2024.0 | 2024.0.1)
312+
version=2024.0.1
313+
;;
307314
2023.2 | 2023.1 | 2023.0)
308315
version=$actual_version.0
309316
;;
@@ -335,8 +342,17 @@ install_intel_apt()
335342
| sudo tee /etc/apt/sources.list.d/oneAPI.list
336343
sudo apt-get update
337344

338-
sudo apt-get install \
339-
intel-oneapi-compiler-{fortran,dpcpp-cpp-and-cpp-classic}-$version
345+
# c/cpp compiler package names changed with 2024+
346+
case $version in
347+
2024*)
348+
sudo apt-get install \
349+
intel-oneapi-compiler-{fortran,dpcpp-cpp}-$version
350+
;;
351+
*)
352+
sudo apt-get install \
353+
intel-oneapi-compiler-{fortran,dpcpp-cpp-and-cpp-classic}-$version
354+
;;
355+
esac
340356

341357
source /opt/intel/oneapi/setvars.sh
342358
export_intel_vars
@@ -419,49 +435,40 @@ install_intel_win()
419435
intel_version_map_w $version $classic
420436

421437
case $version in
438+
2024.0.1)
439+
WINDOWS_HPCKIT_URL=https://registrationcenter-download.intel.com/akdlm/IRC_NAS/7a6db8a1-a8b9-4043-8e8e-ca54b56c34e4/w_HPCKit_p_2024.0.1.35_offline.exe
440+
WINDOWS_HPCKIT_COMPONENTS=intel.oneapi.win.ifort-compiler:intel.oneapi.win.cpp-dpcpp-common
441+
;;
422442
2023.2.0)
423443
WINDOWS_HPCKIT_URL=https://registrationcenter-download.intel.com/akdlm/IRC_NAS/438527fc-7140-422c-a851-389f2791816b/w_HPCKit_p_2023.2.0.49441_offline.exe
444+
WINDOWS_HPCKIT_COMPONENTS=intel.oneapi.win.ifort-compiler:intel.oneapi.win.cpp-compiler
424445
;;
425446
2023.1.0)
426447
WINDOWS_HPCKIT_URL=https://registrationcenter-download.intel.com/akdlm/IRC_NAS/2a13d966-fcc5-4a66-9fcc-50603820e0c9/w_HPCKit_p_2023.1.0.46357_offline.exe
448+
WINDOWS_HPCKIT_COMPONENTS=intel.oneapi.win.ifort-compiler:intel.oneapi.win.cpp-compiler
427449
;;
428450
2023.0.0)
429451
WINDOWS_HPCKIT_URL=https://registrationcenter-download.intel.com/akdlm/irc_nas/19085/w_HPCKit_p_2023.0.0.25931_offline.exe
452+
WINDOWS_HPCKIT_COMPONENTS=intel.oneapi.win.ifort-compiler:intel.oneapi.win.cpp-compiler
430453
;;
431454
2022.3.1)
432455
WINDOWS_HPCKIT_URL=https://registrationcenter-download.intel.com/akdlm/irc_nas/18976/w_HPCKit_p_2022.3.1.19755_offline.exe
456+
WINDOWS_HPCKIT_COMPONENTS=intel.oneapi.win.ifort-compiler:intel.oneapi.win.cpp-compiler
433457
;;
434458
2022.3.0)
435459
WINDOWS_HPCKIT_URL=https://registrationcenter-download.intel.com/akdlm/irc_nas/18857/w_HPCKit_p_2022.3.0.9564_offline.exe
460+
WINDOWS_HPCKIT_COMPONENTS=intel.oneapi.win.ifort-compiler:intel.oneapi.win.cpp-compiler
436461
;;
437462
2022.2.0)
438463
WINDOWS_HPCKIT_URL=https://registrationcenter-download.intel.com/akdlm/IRC_NAS/18680/w_HPCKit_p_2022.2.0.173_offline.exe
464+
WINDOWS_HPCKIT_COMPONENTS=intel.oneapi.win.ifort-compiler:intel.oneapi.win.cpp-compiler
439465
;;
440-
# the installer versions below fail
441-
# 2022.1.2)
442-
# WINDOWS_HPCKIT_URL=https://registrationcenter-download.intel.com/akdlm/irc_nas/18529/w_HPCKit_p_2022.1.2.116_offline.exe
443-
# ;;
444-
# 2022.1.0)
445-
# WINDOWS_HPCKIT_URL=https://registrationcenter-download.intel.com/akdlm/irc_nas/18417/w_HPCKit_p_2022.1.0.93_offline.exe
446-
# ;;
447-
# 2021.4.0)
448-
# WINDOWS_HPCKIT_URL=https://registrationcenter-download.intel.com/akdlm/irc_nas/18247/w_HPCKit_p_2021.4.0.3340_offline.exe
449-
# ;;
450-
# 2021.3.0)
451-
# WINDOWS_HPCKIT_URL=https://registrationcenter-download.intel.com/akdlm/irc_nas/17940/w_HPCKit_p_2021.3.0.3227_offline.exe
452-
# ;;
453-
# 2021.2.0)
454-
# WINDOWS_HPCKIT_URL=https://registrationcenter-download.intel.com/akdlm/irc_nas/17762/w_HPCKit_p_2021.2.0.2901_offline.exe
455-
# ;;
456-
# 2021.1.0)
457-
# WINDOWS_HPCKIT_URL=https://registrationcenter-download.intel.com/akdlm/irc_nas/17392/w_HPCKit_p_2021.1.0.2682_offline.exe
458-
# ;;
459466
*)
460467
exit 1
461468
;;
462469
esac
463470

464-
"$GITHUB_ACTION_PATH/install-intel-windows.bat" $WINDOWS_HPCKIT_URL
471+
"$GITHUB_ACTION_PATH/install-intel-windows.bat" $WINDOWS_HPCKIT_URL $WINDOWS_HPCKIT_COMPONENTS
465472

466473
# don't call export_intel_vars here because the install may have
467474
# been restored from cache. export variables in action.yml after

0 commit comments

Comments
 (0)