From 32d7b64b1d35eb3bf9cc5f5983821c853131fabc Mon Sep 17 00:00:00 2001 From: Gilles Grospellier Date: Tue, 1 Jul 2025 10:21:57 +0200 Subject: [PATCH 1/5] Use IntelMPI 2021.16 for Win32 version. --- _build/download_intel_mpi_2021.bat | 5 +++-- vcpkg_overlays/win32-intelmpi/intel-mpi/portfile.cmake | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/_build/download_intel_mpi_2021.bat b/_build/download_intel_mpi_2021.bat index b8b87bf..bebd4ac 100644 --- a/_build/download_intel_mpi_2021.bat +++ b/_build/download_intel_mpi_2021.bat @@ -1,6 +1,7 @@ -C:\msys64\usr\bin\wget.exe "https://registrationcenter-download.intel.com/akdlm/IRC_NAS/e9f49ab3-babd-4753-a155-ceeb87e36674/intel-mpi-2021.14.1.8_offline.exe" +rem C:\msys64\usr\bin\wget.exe "https://registrationcenter-download.intel.com/akdlm/IRC_NAS/e9f49ab3-babd-4753-a155-ceeb87e36674/intel-mpi-2021.14.1.8_offline.exe" +C:\msys64\usr\bin\wget.exe "https://registrationcenter-download.intel.com/akdlm/IRC_NAS/c7b82926-172a-4943-8612-fcbc4625b17a/intel-mpi-2021.16.0.441_offline.exe" echo "Download finished" -.\intel-mpi-2021.14.1.8_offline.exe -s -a --silent --eula=accept +.\intel-mpi-2021.16.0.441_offline.exe -s -a --silent --eula=accept dir "C:\Program Files (x86)" dir "C:\Program Files (x86)\Intel" dir "C:\Program Files (x86)\Intel\OneAPI" diff --git a/vcpkg_overlays/win32-intelmpi/intel-mpi/portfile.cmake b/vcpkg_overlays/win32-intelmpi/intel-mpi/portfile.cmake index d27d94d..8961299 100644 --- a/vcpkg_overlays/win32-intelmpi/intel-mpi/portfile.cmake +++ b/vcpkg_overlays/win32-intelmpi/intel-mpi/portfile.cmake @@ -1,6 +1,6 @@ # The last digit in the version is not used in the path -# For example, use '2021.14' for version '2021.14.1' -set(INTELMPI_VERSION "2021.14") +# For example, use '2021.16' for version '2021.16.0' +set(INTELMPI_VERSION "2021.16") set(SOURCE_PATH "${CURRENT_BUILDTREES_DIR}/src/intel-mpi-${INTELMPI_VERSION}") file(TO_NATIVE_PATH "C:/Program Files (x86)/Intel/oneAPI" SDK_SOURCE_DIR) From c030f0b9aa869f1c475c506f43266eca98f27995 Mon Sep 17 00:00:00 2001 From: Gilles Grospellier Date: Tue, 1 Jul 2025 10:25:23 +0200 Subject: [PATCH 2/5] Remove support for 'windows-2019' and 'ubuntu-20.04' These platforms are no longer supported for github actions. --- .github/workflows/install_vcpkg_packages.yml | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/.github/workflows/install_vcpkg_packages.yml b/.github/workflows/install_vcpkg_packages.yml index 0fc325e..6937de1 100644 --- a/.github/workflows/install_vcpkg_packages.yml +++ b/.github/workflows/install_vcpkg_packages.yml @@ -26,31 +26,12 @@ jobs: fail-fast: false matrix: include: - - os: 'windows-2019' - full_name: 'windows-2019-msmpi' - triplet: x64-windows - nugetexe: nuget.exe - vcpkg_overlay: none - mono: '' - - os: 'windows-2019' - full_name: 'windows-2019-intelmpi' - triplet: x64-windows - nugetexe: nuget.exe - vcpkg_overlay: win32-intelmpi - mono: '' - os: 'windows-2022' full_name: 'windows-2022-intelmpi' triplet: x64-windows nugetexe: nuget.exe vcpkg_overlay: win32-intelmpi mono: '' - - os: 'ubuntu-20.04' - full_name: 'ubuntu-20.04' - triplet: 'x64-linux-dynamic' - nugetexe: /usr/local/bin/nuget.exe - vcpkg_overlay: none - # To run `nuget.exe` on non-Windows platforms, we must use `mono`. - mono: 'mono' - os: 'ubuntu-22.04' full_name: 'ubuntu-22.04' triplet: 'x64-linux-dynamic' From 83775d8d6e28525dfd76d5140d5ce58acf6ee076 Mon Sep 17 00:00:00 2001 From: Gilles Grospellier Date: Tue, 1 Jul 2025 10:26:07 +0200 Subject: [PATCH 3/5] Update package version to 1.8.1. --- .github/workflows/install_vcpkg_packages.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/install_vcpkg_packages.yml b/.github/workflows/install_vcpkg_packages.yml index 6937de1..0326597 100644 --- a/.github/workflows/install_vcpkg_packages.yml +++ b/.github/workflows/install_vcpkg_packages.yml @@ -16,8 +16,8 @@ jobs: VCPKG_OVERLAY_PORTS: ${{ github.workspace }}/../../build_base/framework-ci/vcpkg_overlays/${{ matrix.vcpkg_overlay }} VCPKG_DISABLE_METRICS: 1 VCPKG_BUILD_DIR: '${{ github.workspace }}/../../build_base/framework-ci/vcpkg' - VCPKG_PREINSTALL_HASH_PACKAGE_NAME: '1.7.2-${{ matrix.full_name }}-${{ matrix.triplet }}' - VCPKG_PUSH_HASH_PACKAGE_NAME: '1.7.3-${{ matrix.full_name }}-${{ matrix.triplet }}' + VCPKG_PREINSTALL_HASH_PACKAGE_NAME: '1.8.0-${{ matrix.full_name }}-${{ matrix.triplet }}' + VCPKG_PUSH_HASH_PACKAGE_NAME: '1.8.1-${{ matrix.full_name }}-${{ matrix.triplet }}' DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true DOTNET_CLI_TELEMETRY_OPTOUT: true DOTNET_VERSION: '6.x' From 9d5eb846e8813e4a2650db1602512db236d1a5c2 Mon Sep 17 00:00:00 2001 From: Gilles Grospellier Date: Tue, 1 Jul 2025 11:39:43 +0200 Subject: [PATCH 4/5] Fix name of the copyright for IntelMPI. --- vcpkg_overlays/win32-intelmpi/intel-mpi/portfile.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vcpkg_overlays/win32-intelmpi/intel-mpi/portfile.cmake b/vcpkg_overlays/win32-intelmpi/intel-mpi/portfile.cmake index 8961299..c088736 100644 --- a/vcpkg_overlays/win32-intelmpi/intel-mpi/portfile.cmake +++ b/vcpkg_overlays/win32-intelmpi/intel-mpi/portfile.cmake @@ -106,6 +106,6 @@ endif() file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/mpi-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") # Handle copyright -# C:\Program Files (x86)\Intel\oneAPI\licensing\2025.0\licensing\2025.0 -file(COPY "${SDK_SOURCE_DIR}/licensing/2025.0/licensing/2025.0/license.htm" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +# C:\Program Files (x86)\Intel\oneAPI\licensing\2025.2\licensing\2025.2 +file(COPY "${SDK_SOURCE_DIR}/licensing/2025.2/licensing/2025.2/license.htm" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" "See the accompanying 'licence.htm'") From cb36764ba6678addaec6d5ff5de2e12a52c2d488 Mon Sep 17 00:00:00 2001 From: Gilles Grospellier Date: Tue, 1 Jul 2025 14:32:08 +0200 Subject: [PATCH 5/5] Add workflow for ubuntu 24.04. --- .github/workflows/install_vcpkg_packages.yml | 26 +++++++++++++------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/.github/workflows/install_vcpkg_packages.yml b/.github/workflows/install_vcpkg_packages.yml index 0326597..c72bfe0 100644 --- a/.github/workflows/install_vcpkg_packages.yml +++ b/.github/workflows/install_vcpkg_packages.yml @@ -16,8 +16,8 @@ jobs: VCPKG_OVERLAY_PORTS: ${{ github.workspace }}/../../build_base/framework-ci/vcpkg_overlays/${{ matrix.vcpkg_overlay }} VCPKG_DISABLE_METRICS: 1 VCPKG_BUILD_DIR: '${{ github.workspace }}/../../build_base/framework-ci/vcpkg' - VCPKG_PREINSTALL_HASH_PACKAGE_NAME: '1.8.0-${{ matrix.full_name }}-${{ matrix.triplet }}' - VCPKG_PUSH_HASH_PACKAGE_NAME: '1.8.1-${{ matrix.full_name }}-${{ matrix.triplet }}' + VCPKG_PREINSTALL_HASH_PACKAGE_NAME: '1.8.1-${{ matrix.full_name }}-${{ matrix.triplet }}' + VCPKG_PUSH_HASH_PACKAGE_NAME: '1.8.2-${{ matrix.full_name }}-${{ matrix.triplet }}' DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true DOTNET_CLI_TELEMETRY_OPTOUT: true DOTNET_VERSION: '6.x' @@ -39,13 +39,13 @@ jobs: vcpkg_overlay: none # To run `nuget.exe` on non-Windows platforms, we must use `mono`. mono: 'mono' - # - os: 'ubuntu-24.04' - # full_name: 'ubuntu-24.04' - # triplet: 'x64-linux-dynamic' - # nugetexe: /usr/local/bin/nuget.exe - # vcpkg_overlay: none - # # To run `nuget.exe` on non-Windows platforms, we must use `mono`. - # mono: 'mono' + - os: 'ubuntu-24.04' + full_name: 'ubuntu-24.04' + triplet: 'x64-linux-dynamic' + nugetexe: /usr/local/bin/nuget.exe + vcpkg_overlay: none + # To run `nuget.exe` on non-Windows platforms, we must use `mono`. + mono: 'mono' steps: @@ -62,6 +62,14 @@ jobs: cd '${{ github.workspace }}' && mv _build docs nuget.config vcpkg vcpkg_overlays '${{ env.FRAMEWORKCI_ROOT_PATH }}' ls -lart '${{ env.FRAMEWORKCI_ROOT_PATH }}' + - name: Install mono + shell: 'bash' + # Mono is needed for 'ubuntu-24.04' because it is no longer installed on the runner + # WARNING: The installation has to be done after 'setup-dotnet' + if: ${{ matrix.os == 'ubuntu-24.04' }} + run: | + sudo apt-get install -y mono-devel + - name: Setup environment shell: 'bash' run: |