From c23d0d89429d10f9e515ea44c499386a186cec6c Mon Sep 17 00:00:00 2001 From: Marc Fehling Date: Sat, 9 Nov 2024 13:32:07 +0100 Subject: [PATCH 1/4] github-actions: specify ifx as environment variable. --- .github/workflows/linux.yml | 6 ++---- .github/workflows/windows.yml | 3 ++- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index f6ebba9723..fe150485a8 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -42,17 +42,15 @@ jobs: - name: build fds debug run: | source /opt/intel/oneapi/setvars.sh - cd ./Build/impi_intel_linux_db export INTEL_IFORT=ifx - echo "INTEL_IFORT =" $INTEL_IFORT + cd ./Build/impi_intel_linux_db sh ./make_fds.sh ./fds_impi_intel_linux_db - name: build fds release run: | source /opt/intel/oneapi/setvars.sh - cd ./Build/impi_intel_linux export INTEL_IFORT=ifx - echo "INTEL_IFORT =" $INTEL_IFORT + cd ./Build/impi_intel_linux sh ./make_fds.sh ./fds_impi_intel_linux diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 578e1c5670..8c1651e644 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -84,13 +84,14 @@ jobs: - name: build fds debug run: | call "C:\Program Files (x86)\Intel\oneAPI\setvars.bat" --config="oneapi_config.txt" - cd Build\impi_intel_win_db set INTEL_IFORT=ifx + cd Build\impi_intel_win_db call make_fds.bat fds_impi_intel_win_db.exe - name: build fds release run: | call "C:\Program Files (x86)\Intel\oneAPI\setvars.bat" --config="oneapi_config.txt" + set INTEL_IFORT=ifx cd Build\impi_intel_win call make_fds.bat fds_impi_intel_win.exe From 3599204970cf8fe9f787ecb3cf135eed202fc7b6 Mon Sep 17 00:00:00 2001 From: Marc Fehling Date: Sat, 9 Nov 2024 13:20:44 +0100 Subject: [PATCH 2/4] github-actions: windows: no need to specify config anymore. Build/Scripts/setup_intel_compilers.bat does the job. --- .github/workflows/windows.yml | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 8c1651e644..d7d5ac5e71 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -71,26 +71,14 @@ jobs: webimage_hpc_extracted\bootstrapper.exe -s --action install --components=%WINDOWS_HPCKIT_COMPONENTS% --eula=accept -p=NEED_VS2017_INTEGRATION=0 -p=NEED_VS2019_INTEGRATION=0 --log-dir=. rd /s/q "webimage_hpc_extracted" - # github-actions does not cache windows symlinks, so we need to specify the version of each component explicitly - # https://www.intel.com/content/www/us/en/develop/documentation/oneapi-programming-guide/top/oneapi-development-environment-setup/use-the-setvars-script-with-windows/use-a-config-file-for-setvars-bat-on-windows.html - # https://oneapi-src.github.io/oneapi-ci/ - - name: specify oneapi version - run: | - ( - echo compiler=2024.2.1 - echo mkl=2024.2.1 - echo mpi=2021.13.1 - ) > oneapi_config.txt - name: build fds debug run: | - call "C:\Program Files (x86)\Intel\oneAPI\setvars.bat" --config="oneapi_config.txt" set INTEL_IFORT=ifx cd Build\impi_intel_win_db call make_fds.bat fds_impi_intel_win_db.exe - name: build fds release run: | - call "C:\Program Files (x86)\Intel\oneAPI\setvars.bat" --config="oneapi_config.txt" set INTEL_IFORT=ifx cd Build\impi_intel_win call make_fds.bat From dd0345455db65a7f950c98094a431724a347139a Mon Sep 17 00:00:00 2001 From: Marc Fehling Date: Sat, 9 Nov 2024 13:29:35 +0100 Subject: [PATCH 3/4] github-actions: windows: update oneapi to 2025.0. --- .github/workflows/windows.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index d7d5ac5e71..af55c7ffba 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -26,9 +26,9 @@ permissions: env: # update urls for oneapi packages according to # https://github.com/oneapi-src/oneapi-ci/blob/master/.github/workflows/build_all.yml - WINDOWS_BASEKIT_URL: https://registrationcenter-download.intel.com/akdlm/IRC_NAS/d91caaa0-7306-46ea-a519-79a0423e1903/w_BaseKit_p_2024.2.1.101_offline.exe + WINDOWS_BASEKIT_URL: https://registrationcenter-download.intel.com/akdlm/IRC_NAS/b380d914-366b-4b77-a74a-05e3c38b3514/intel-oneapi-base-toolkit-2025.0.0.882_offline.exe WINDOWS_BASEKIT_COMPONENTS: intel.oneapi.win.mkl.devel - WINDOWS_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/IRC_NAS/745e923a-3f85-4e1e-b6dd-637c0e9ccba6/w_HPCKit_p_2024.2.1.80_offline.exe + WINDOWS_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/IRC_NAS/f07e32fa-b505-4b90-8a79-e328ce9ad9d6/intel-oneapi-hpc-toolkit-2025.0.0.822_offline.exe WINDOWS_HPCKIT_COMPONENTS: intel.oneapi.win.ifort-compiler:intel.oneapi.win.mpi.devel From 32e4e2193d7b6640bebe1ddda3486acef9a372c1 Mon Sep 17 00:00:00 2001 From: Marc Fehling Date: Sat, 9 Nov 2024 13:30:09 +0100 Subject: [PATCH 4/4] github-actions: macos: update to gfortran-14. --- .github/workflows/osx.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/osx.yml b/.github/workflows/osx.yml index 0e7b59402c..474cef23dc 100644 --- a/.github/workflows/osx.yml +++ b/.github/workflows/osx.yml @@ -38,7 +38,7 @@ jobs: - name: install openmpi run: | brew install open-mpi - echo "OMPI_FC=gfortran-13" >> $GITHUB_ENV + echo "OMPI_FC=gfortran-14" >> $GITHUB_ENV - name: build fds debug run: |