ci: update Intel OneAPI version (MODFLOW-USGS#973)

Hofer-Julian · Jul 14, 2022 · 4d98136 · 4d98136
1 parent 71adcde
commit 4d98136
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 51 deletions.
diff --git a/.github/intel-scripts/ifortvars_windows.bat → .github/intel-scripts/build_windows.bat b/.github/intel-scripts/ifortvars_windows.bat → .github/intel-scripts/build_windows.bat
@@ -2,15 +2,13 @@ REM SPDX-FileCopyrightText: 2020 Intel Corporation
 REM
 REM SPDX-License-Identifier: MIT
 
-set LANGUAGE=%1
-set VS_VER=%2
+@call "C:\Program Files (x86)\Intel\oneAPI\setvars-vcvarsall.bat" %VS_VER%
 
-IF "%VS_VER%"=="2017_build_tools" (
-@call "C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Auxiliary\Build\vcvars64.bat"
-)
-
-IF "%VS_VER%"=="2019_build_tools" (
-@call "C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\VC\Auxiliary\Build\vcvars64.bat"
-)
 for /f "tokens=* usebackq" %%f in (`dir /b "C:\Program Files (x86)\Intel\oneAPI\compiler\" ^| findstr /V latest ^| sort`) do @set "LATEST_VERSION=%%f"
 @call "C:\Program Files (x86)\Intel\oneAPI\compiler\%LATEST_VERSION%\env\vars.bat"
+
+echo "Visual Studio Version: %VS_VER%"
+echo "OneAPI version: %LATEST_VERSION%"
+echo "C:\Program Files (x86)\Intel\oneAPI\compiler\%LATEST_VERSION%\env\vars.bat"
+echo "OneAPI root directory: %ONEAPI_ROOT%"
+where ifort.exe
diff --git a/.github/intel-scripts/install_windows.bat b/.github/intel-scripts/install_windows.bat
@@ -1,15 +1,16 @@
-REM SPDX-FileCopyrightText: 2020 Intel Corporation
+REM SPDX-FileCopyrightText: 2022 Intel Corporation
 REM
 REM SPDX-License-Identifier: MIT
 
 set URL=%1
 set COMPONENTS=%2
 
-curl.exe --output webimage.exe --url %URL% --retry 5 --retry-delay 5
-start /b /wait webimage.exe -s -x -f webimage_extracted --log extract.log
-del webimage.exe
+curl.exe --output %TEMP%\webimage.exe --url %URL% --retry 5 --retry-delay 5
+start /b /wait %TEMP%\webimage.exe -s -x -f webimage_extracted --log extract.log
+del %TEMP%\webimage.exe
 if "%COMPONENTS%"=="" (
-  webimage_extracted\bootstrapper.exe -s --action install --eula=accept -p=NEED_VS2017_INTEGRATION=0 -p=NEED_VS2019_INTEGRATION=0 --log-dir=.
+  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=.
 ) else (
-  webimage_extracted\bootstrapper.exe -s --action install --components=%COMPONENTS% --eula=accept -p=NEED_VS2017_INTEGRATION=0 -p=NEED_VS2019_INTEGRATION=0 --log-dir=.
-)
+  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=.
+)
+rd /s/q "webimage_extracted"
diff --git a/.github/workflows/ci-check-warnings-gfortran.yml b/.github/workflows/ci-check-warnings-gfortran.yml
@@ -13,11 +13,9 @@ env:
 
 jobs:
   check_warnings:
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
-      matrix:
-        os: [ ubuntu-latest ]
     defaults:
       run:
         shell: bash
@@ -32,20 +30,11 @@ jobs:
           python-version: 3.9
 
       - name: Setup symbolic links on Linux
-        if: runner.os == 'Linux'
         run: |
           sudo ln -fs /usr/bin/gfortran-10 /usr/local/bin/gfortran
           sudo ln -fs /usr/bin/gcc-10 /usr/local/bin/gcc
           sudo ln -fs /usr/bin/g++-10 /usr/local/bin/g++
 
-      - name: Setup symbolic link to gfortran on macOS
-        if: runner.os == 'macOS'
-        shell: bash
-        run: |
-          sudo ln -fs /usr/local/bin/gfortran-10 /usr/local/bin/gfortran
-          sudo ln -fs /usr/local/bin/gcc-10 /usr/local/bin/gcc
-          sudo ln -fs /usr/local/bin/g++-10 /usr/local/bin/g++
-
       - name: Print GNU compiler versions
         run: |
           gfortran --version
@@ -69,11 +58,9 @@ jobs:
           meson compile -C builddir
 
   test_night_build_script:
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
-      matrix:
-        os: [ ubuntu-latest ]
     defaults:
       run:
         shell: bash
@@ -88,20 +75,11 @@ jobs:
           python-version: 3.9
 
       - name: Setup symbolic links on Linux
-        if: runner.os == 'Linux'
         run: |
           sudo ln -fs /usr/bin/gfortran-10 /usr/local/bin/gfortran
           sudo ln -fs /usr/bin/gcc-10 /usr/local/bin/gcc
           sudo ln -fs /usr/bin/g++-10 /usr/local/bin/g++
 
-      - name: Setup symbolic link to gfortran on macOS
-        if: runner.os == 'macOS'
-        shell: bash
-        run: |
-          sudo ln -fs /usr/local/bin/gfortran-10 /usr/local/bin/gfortran
-          sudo ln -fs /usr/local/bin/gcc-10 /usr/local/bin/gcc
-          sudo ln -fs /usr/local/bin/g++-10 /usr/local/bin/g++
-
       - name: Print GNU compiler versions
         run: |
           gfortran --version
@@ -125,3 +103,9 @@ jobs:
         working-directory: distribution
         run: |
           pytest -v -s build_nightly.py
+
+      - name: Move the build zip file
+        run: |
+          ls -l ./distribution/*
+          mv ./distribution/temp_zip/linux.zip ./linux.zip
+          ls -l ./
diff --git a/.github/workflows/ci-large-tests.yml b/.github/workflows/ci-large-tests.yml
@@ -21,9 +21,9 @@ on:
     - cron: '0 6 * * *' # run at 6 AM UTC every day
 
 env:
-  WINDOWS_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/18417/w_HPCKit_p_2022.1.0.93_offline.exe
-  LINUX_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/18438/l_HPCKit_p_2022.1.1.97_offline.sh
-  MACOS_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/18341/m_HPCKit_p_2022.1.0.86_offline.dmg
+  WINDOWS_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/IRC_NAS/18680/w_HPCKit_p_2022.2.0.173_offline.exe
+  LINUX_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/18679/l_HPCKit_p_2022.2.0.191_offline.sh
+  MACOS_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/IRC_NAS/18681/m_HPCKit_p_2022.2.0.158_offline.dmg
   WINDOWS_FORTRAN_COMPONENTS: intel.oneapi.win.ifort-compiler
   LINUX_FORTRAN_COMPONENTS_WEB: intel.oneapi.lin.ifort-compiler
   MACOS_FORTRAN_COMPONENTS: intel.oneapi.mac.ifort-compiler
@@ -54,6 +54,7 @@ jobs:
         if: matrix.FC == 'ifort'
         run: |
           echo "FC=ifort" >> $GITHUB_ENV
+          echo "VS_VER=vs2022" >> $GITHUB_ENV
 
       - name: cache install ifort on linux
         if: matrix.FC == 'ifort'

diff --git a/.github/workflows/ci-tests-gfortran-latest.yml b/.github/workflows/ci-tests-gfortran-latest.yml
@@ -47,9 +47,9 @@ jobs:
         if: runner.os == 'macOS'
         shell: bash
         run: |
-          sudo ln -fs /usr/local/bin/gfortran-10 /usr/local/bin/gfortran
-          sudo ln -fs /usr/local/bin/gcc-10 /usr/local/bin/gcc
-          sudo ln -fs /usr/local/bin/g++-10 /usr/local/bin/g++
+          sudo ln -fs /usr/local/bin/gfortran-11 /usr/local/bin/gfortran
+          sudo ln -fs /usr/local/bin/gcc-11 /usr/local/bin/gcc
+          sudo ln -fs /usr/local/bin/g++-11 /usr/local/bin/g++
 
       - name: Print GNU compiler versions
         run: |

diff --git a/.github/workflows/ci-tests-ifort.yml b/.github/workflows/ci-tests-ifort.yml
@@ -17,13 +17,14 @@ on:
       - develop
 
 env:
-  WINDOWS_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/18417/w_HPCKit_p_2022.1.0.93_offline.exe
-  LINUX_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/18438/l_HPCKit_p_2022.1.1.97_offline.sh
-  MACOS_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/18341/m_HPCKit_p_2022.1.0.86_offline.dmg
+  WINDOWS_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/IRC_NAS/18680/w_HPCKit_p_2022.2.0.173_offline.exe
+  LINUX_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/18679/l_HPCKit_p_2022.2.0.191_offline.sh
+  MACOS_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/IRC_NAS/18681/m_HPCKit_p_2022.2.0.158_offline.dmg
   WINDOWS_FORTRAN_COMPONENTS: intel.oneapi.win.ifort-compiler
   LINUX_FORTRAN_COMPONENTS_WEB: intel.oneapi.lin.ifort-compiler
   MACOS_FORTRAN_COMPONENTS: intel.oneapi.mac.ifort-compiler
   FC: ifort
+  VS_VER: vs2022
 
 jobs:
   test:
@@ -34,7 +35,7 @@ jobs:
         include:
           - os: ubuntu-latest
           - os: macos-latest
-          - os: windows-2019
+          - os: windows-latest
     defaults:
       run:
         shell: bash
@@ -132,7 +133,7 @@ jobs:
         if: runner.os == 'Windows'
         shell: cmd
         run: |
-          call ".github/intel-scripts/ifortvars_windows.bat"
+          call ".github/intel-scripts/build_windows.bat"
           meson setup builddir -Ddebug=false --prefix=%CD% --libdir=bin
           meson install -C builddir
           cd autotest