Skip to content

Commit 71a62e9

Browse files
jdhughes-devHofer-Julian
jdhughes-dev
authored and
Hofer-Julian
committed
ci: update Intel OneAPI version (MODFLOW-ORG#973)
1 parent 7c35daa commit 71a62e9

6 files changed

Lines changed: 36 additions & 51 deletions

File tree

.github/intel-scripts/ifortvars_windows.bat renamed to .github/intel-scripts/build_windows.bat

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,13 @@ REM SPDX-FileCopyrightText: 2020 Intel Corporation
22
REM
33
REM SPDX-License-Identifier: MIT
44

5-
set LANGUAGE=%1
6-
set VS_VER=%2
5+
@call "C:\Program Files (x86)\Intel\oneAPI\setvars-vcvarsall.bat" %VS_VER%
76

8-
IF "%VS_VER%"=="2017_build_tools" (
9-
@call "C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Auxiliary\Build\vcvars64.bat"
10-
)
11-
12-
IF "%VS_VER%"=="2019_build_tools" (
13-
@call "C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\VC\Auxiliary\Build\vcvars64.bat"
14-
)
157
for /f "tokens=* usebackq" %%f in (`dir /b "C:\Program Files (x86)\Intel\oneAPI\compiler\" ^| findstr /V latest ^| sort`) do @set "LATEST_VERSION=%%f"
168
@call "C:\Program Files (x86)\Intel\oneAPI\compiler\%LATEST_VERSION%\env\vars.bat"
9+
10+
echo "Visual Studio Version: %VS_VER%"
11+
echo "OneAPI version: %LATEST_VERSION%"
12+
echo "C:\Program Files (x86)\Intel\oneAPI\compiler\%LATEST_VERSION%\env\vars.bat"
13+
echo "OneAPI root directory: %ONEAPI_ROOT%"
14+
where ifort.exe

‎.github/intel-scripts/install_windows.bat‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
1-
REM SPDX-FileCopyrightText: 2020 Intel Corporation
1+
REM SPDX-FileCopyrightText: 2022 Intel Corporation
22
REM
33
REM SPDX-License-Identifier: MIT
44

55
set URL=%1
66
set COMPONENTS=%2
77

8-
curl.exe --output webimage.exe --url %URL% --retry 5 --retry-delay 5
9-
start /b /wait webimage.exe -s -x -f webimage_extracted --log extract.log
10-
del webimage.exe
8+
curl.exe --output %TEMP%\webimage.exe --url %URL% --retry 5 --retry-delay 5
9+
start /b /wait %TEMP%\webimage.exe -s -x -f webimage_extracted --log extract.log
10+
del %TEMP%\webimage.exe
1111
if "%COMPONENTS%"=="" (
12-
webimage_extracted\bootstrapper.exe -s --action install --eula=accept -p=NEED_VS2017_INTEGRATION=0 -p=NEED_VS2019_INTEGRATION=0 --log-dir=.
12+
webimage_extracted\bootstrapper.exe -s --action install --eula=accept -p=NEED_VS2017_INTEGRATION=0 -p=NEED_VS2019_INTEGRATION=0 -p=NEED_VS2022_INTEGRATION=0 --log-dir=.
1313
) else (
14-
webimage_extracted\bootstrapper.exe -s --action install --components=%COMPONENTS% --eula=accept -p=NEED_VS2017_INTEGRATION=0 -p=NEED_VS2019_INTEGRATION=0 --log-dir=.
15-
)
14+
webimage_extracted\bootstrapper.exe -s --action install --components=%COMPONENTS% --eula=accept -p=NEED_VS2017_INTEGRATION=0 -p=NEED_VS2019_INTEGRATION=0 -p=NEED_VS2022_INTEGRATION=0 --log-dir=.
15+
)
16+
rd /s/q "webimage_extracted"

‎.github/workflows/ci-check-warnings-gfortran.yml‎

Lines changed: 8 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,9 @@ env:
1313

1414
jobs:
1515
check_warnings:
16-
runs-on: ${{ matrix.os }}
16+
runs-on: ubuntu-latest
1717
strategy:
1818
fail-fast: false
19-
matrix:
20-
os: [ ubuntu-latest ]
2119
defaults:
2220
run:
2321
shell: bash
@@ -32,20 +30,11 @@ jobs:
3230
python-version: 3.9
3331

3432
- name: Setup symbolic links on Linux
35-
if: runner.os == 'Linux'
3633
run: |
3734
sudo ln -fs /usr/bin/gfortran-10 /usr/local/bin/gfortran
3835
sudo ln -fs /usr/bin/gcc-10 /usr/local/bin/gcc
3936
sudo ln -fs /usr/bin/g++-10 /usr/local/bin/g++
4037
41-
- name: Setup symbolic link to gfortran on macOS
42-
if: runner.os == 'macOS'
43-
shell: bash
44-
run: |
45-
sudo ln -fs /usr/local/bin/gfortran-10 /usr/local/bin/gfortran
46-
sudo ln -fs /usr/local/bin/gcc-10 /usr/local/bin/gcc
47-
sudo ln -fs /usr/local/bin/g++-10 /usr/local/bin/g++
48-
4938
- name: Print GNU compiler versions
5039
run: |
5140
gfortran --version
@@ -69,11 +58,9 @@ jobs:
6958
meson compile -C builddir
7059
7160
test_night_build_script:
72-
runs-on: ${{ matrix.os }}
61+
runs-on: ubuntu-latest
7362
strategy:
7463
fail-fast: false
75-
matrix:
76-
os: [ ubuntu-latest ]
7764
defaults:
7865
run:
7966
shell: bash
@@ -88,20 +75,11 @@ jobs:
8875
python-version: 3.9
8976

9077
- name: Setup symbolic links on Linux
91-
if: runner.os == 'Linux'
9278
run: |
9379
sudo ln -fs /usr/bin/gfortran-10 /usr/local/bin/gfortran
9480
sudo ln -fs /usr/bin/gcc-10 /usr/local/bin/gcc
9581
sudo ln -fs /usr/bin/g++-10 /usr/local/bin/g++
9682
97-
- name: Setup symbolic link to gfortran on macOS
98-
if: runner.os == 'macOS'
99-
shell: bash
100-
run: |
101-
sudo ln -fs /usr/local/bin/gfortran-10 /usr/local/bin/gfortran
102-
sudo ln -fs /usr/local/bin/gcc-10 /usr/local/bin/gcc
103-
sudo ln -fs /usr/local/bin/g++-10 /usr/local/bin/g++
104-
10583
- name: Print GNU compiler versions
10684
run: |
10785
gfortran --version
@@ -125,3 +103,9 @@ jobs:
125103
working-directory: distribution
126104
run: |
127105
pytest -v -s build_nightly.py
106+
107+
- name: Move the build zip file
108+
run: |
109+
ls -l ./distribution/*
110+
mv ./distribution/temp_zip/linux.zip ./linux.zip
111+
ls -l ./

‎.github/workflows/ci-large-tests.yml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ on:
2121
- cron: '0 6 * * *' # run at 6 AM UTC every day
2222

2323
env:
24-
WINDOWS_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/18417/w_HPCKit_p_2022.1.0.93_offline.exe
25-
LINUX_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/18438/l_HPCKit_p_2022.1.1.97_offline.sh
26-
MACOS_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/18341/m_HPCKit_p_2022.1.0.86_offline.dmg
24+
WINDOWS_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/IRC_NAS/18680/w_HPCKit_p_2022.2.0.173_offline.exe
25+
LINUX_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/18679/l_HPCKit_p_2022.2.0.191_offline.sh
26+
MACOS_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/IRC_NAS/18681/m_HPCKit_p_2022.2.0.158_offline.dmg
2727
WINDOWS_FORTRAN_COMPONENTS: intel.oneapi.win.ifort-compiler
2828
LINUX_FORTRAN_COMPONENTS_WEB: intel.oneapi.lin.ifort-compiler
2929
MACOS_FORTRAN_COMPONENTS: intel.oneapi.mac.ifort-compiler
@@ -54,6 +54,7 @@ jobs:
5454
if: matrix.FC == 'ifort'
5555
run: |
5656
echo "FC=ifort" >> $GITHUB_ENV
57+
echo "VS_VER=vs2022" >> $GITHUB_ENV
5758
5859
- name: cache install ifort on linux
5960
if: matrix.FC == 'ifort'

‎.github/workflows/ci-tests-gfortran-latest.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ jobs:
4747
if: runner.os == 'macOS'
4848
shell: bash
4949
run: |
50-
sudo ln -fs /usr/local/bin/gfortran-10 /usr/local/bin/gfortran
51-
sudo ln -fs /usr/local/bin/gcc-10 /usr/local/bin/gcc
52-
sudo ln -fs /usr/local/bin/g++-10 /usr/local/bin/g++
50+
sudo ln -fs /usr/local/bin/gfortran-11 /usr/local/bin/gfortran
51+
sudo ln -fs /usr/local/bin/gcc-11 /usr/local/bin/gcc
52+
sudo ln -fs /usr/local/bin/g++-11 /usr/local/bin/g++
5353
5454
- name: Print GNU compiler versions
5555
run: |

‎.github/workflows/ci-tests-ifort.yml‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,14 @@ on:
1717
- develop
1818

1919
env:
20-
WINDOWS_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/18417/w_HPCKit_p_2022.1.0.93_offline.exe
21-
LINUX_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/18438/l_HPCKit_p_2022.1.1.97_offline.sh
22-
MACOS_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/18341/m_HPCKit_p_2022.1.0.86_offline.dmg
20+
WINDOWS_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/IRC_NAS/18680/w_HPCKit_p_2022.2.0.173_offline.exe
21+
LINUX_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/18679/l_HPCKit_p_2022.2.0.191_offline.sh
22+
MACOS_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/IRC_NAS/18681/m_HPCKit_p_2022.2.0.158_offline.dmg
2323
WINDOWS_FORTRAN_COMPONENTS: intel.oneapi.win.ifort-compiler
2424
LINUX_FORTRAN_COMPONENTS_WEB: intel.oneapi.lin.ifort-compiler
2525
MACOS_FORTRAN_COMPONENTS: intel.oneapi.mac.ifort-compiler
2626
FC: ifort
27+
VS_VER: vs2022
2728

2829
jobs:
2930
test:
@@ -34,7 +35,7 @@ jobs:
3435
include:
3536
- os: ubuntu-latest
3637
- os: macos-latest
37-
- os: windows-2019
38+
- os: windows-latest
3839
defaults:
3940
run:
4041
shell: bash
@@ -132,7 +133,7 @@ jobs:
132133
if: runner.os == 'Windows'
133134
shell: cmd
134135
run: |
135-
call ".github/intel-scripts/ifortvars_windows.bat"
136+
call ".github/intel-scripts/build_windows.bat"
136137
meson setup builddir -Ddebug=false --prefix=%CD% --libdir=bin
137138
meson install -C builddir
138139
cd autotest

0 commit comments

Comments
 (0)