[fix] fixes for building fpm with ifx (#1125)

Author: perazz

.github/actions/setup-intel/action.yml

@@ -0,0 +1,116 @@
+name: 'Setup Intel oneAPI Environment'
+description: 'Sets up Intel oneAPI C++, Fortran compilers and MPI on Windows or Ubuntu runners.'
+
+inputs:
+  os:
+    description: 'Operating system of the runner. Must contain "windows" or "ubuntu".'
+    required: true
+    type: string
+
+runs:
+  using: "composite"
+  steps:
+    - name: (Windows) Setup VS Build environment
+      if: contains(inputs.os, 'windows')
+      uses: seanmiddleditch/gha-setup-vsdevenv@v4
+
+    - name: (Windows) Retrieve and Install Intel toolchain
+      if: contains(inputs.os, 'windows')
+      shell: pwsh
+      run: |
+        $tempDir = "C:\TEMP\intel_install"
+        New-Item -ItemType Directory -Force -Path $tempDir
+        cd $tempDir
+        $installerName = "w_HPCKit_p_2023.0.0.25931_offline.exe" # Consider using inputs.intel_version_windows if added
+        $installerUrl = "https://registrationcenter-download.intel.com/akdlm/irc_nas/19085/$installerName"
+        Write-Host "Downloading Intel oneAPI installer..."
+        curl.exe --output $installerName --url $installerUrl --retry 5 --retry-delay 5 -L # Added -L for potential redirects
+        Write-Host "Extracting installer..."
+        Start-Process -FilePath ".\$installerName" -ArgumentList "-s -x -f oneAPI --log extract.log" -Wait -NoNewWindow
+        Remove-Item ".\$installerName" -Force
+        Write-Host "Installing oneAPI components..."
+        # Install C++, Fortran, and MPI development tools silently
+        Start-Process -FilePath ".\oneAPI\bootstrapper.exe" -ArgumentList "-s --action install --eula=accept --components=""intel.oneapi.win.cpp-compiler:intel.oneapi.win.ifort-compiler:intel.oneapi.win.mpi.devel"" -p=NEED_VS2017_INTEGRATION=0 -p=NEED_VS2019_INTEGRATION=0 -p=NEED_VS2022_INTEGRATION=0 --log-dir=." -Wait -NoNewWindow
+        Write-Host "Cleaning up extracted files..."
+        Remove-Item ".\oneAPI" -Force -Recurse
+        cd ..
+        Remove-Item $tempDir -Force -Recurse
+
+    - name: (Windows) Test that OneAPI is installed
+      if: contains(inputs.os, 'windows')
+      shell: pwsh
+      run: |
+        $setvarsPath = "C:\Program Files (x86)\Intel\oneAPI\setvars.bat"
+        $compilerVarsPath = "C:\Program Files (x86)\Intel\oneAPI\compiler\latest\env\vars.bat"
+        if (-not (Test-Path -Path $setvarsPath -PathType Leaf)) {
+          Write-Error "Intel oneAPI setvars.bat not found at $setvarsPath"
+          exit 1
+        }
+        if (-not (Test-Path -Path $compilerVarsPath -PathType Leaf)) {
+          Write-Warning "Intel oneAPI compiler vars.bat not found at $compilerVarsPath. MPI might still work."
+          # Depending on requirements, you might want to 'exit 1' here too
+        }
+        Write-Host "Intel oneAPI installation paths verified."
+
+    - name: (Windows) Load OneAPI environment variables
+      if: contains(inputs.os, 'windows')
+      shell: cmd
+      run: |
+        call "C:\Program Files (x86)\Intel\oneAPI\setvars.bat" > NUL
+        echo "Setting Intel environment variables..."
+        echo "PATH=%PATH%" >> %GITHUB_ENV%
+        echo "INCLUDE=%INCLUDE%" >> %GITHUB_ENV%
+        echo "LIB=%LIB%" >> %GITHUB_ENV%
+        REM Add any other specific vars if needed, e.g., for MPI
+        echo "I_MPI_ROOT=%I_MPI_ROOT%" >> %GITHUB_ENV%
+        echo "FI_PROVIDER_PATH=%FI_PROVIDER_PATH%" >> %GITHUB_ENV%
+        echo "MPI_BIN=%MPI_BIN%" >> %GITHUB_ENV%
+
+    # --- Ubuntu Intel Setup ---
+    - name: (Ubuntu) Install prerequisites and Intel GPG key
+      if: contains(inputs.os, 'ubuntu')
+      shell: bash
+      run: |
+        sudo apt-get update -y -qq
+        sudo apt-get install -y -qq gpg wget ca-certificates curl gpg-agent software-properties-common
+        wget -O- https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB | gpg --dearmor | sudo tee /usr/share/keyrings/oneapi-archive-keyring.gpg > /dev/null
+
+    - name: (Ubuntu) Add Intel oneAPI repository
+      if: contains(inputs.os, 'ubuntu')
+      shell: bash
+      run: |
+        echo "deb [signed-by=/usr/share/keyrings/oneapi-archive-keyring.gpg] https://apt.repos.intel.com/oneapi all main" | sudo tee /etc/apt/sources.list.d/oneAPI.list
+        sudo apt-get update -y -qq
+
+    - name: (Ubuntu) Install Intel oneAPI Compilers using fortran-lang action
+      if: contains(inputs.os, 'ubuntu')
+      uses: fortran-lang/setup-fortran@v1
+      with:
+        compiler: intel
+        version: 2024.1.0  # Pinned until issue #1090 is resolved
+
+    - name: (Ubuntu) Install Intel oneAPI MPI and build dependencies
+      if: contains(inputs.os, 'ubuntu')
+      shell: bash
+      run: |
+        # Install MPI devel package and common build tools
+        # The compilers (icc, ifort) should already be installed by setup-fortran action
+        sudo apt-get install -y -q intel-oneapi-mpi-devel ninja-build cmake libcurl4-gnutls-dev
+
+    - name: (Ubuntu) Source oneAPI environment and add to GITHUB_ENV
+      if: contains(inputs.os, 'ubuntu')
+      shell: bash
+      run: |
+        # Source the main setvars script to set up the environment for this step
+        # Use --force as we might be in a non-interactive shell
+        source /opt/intel/oneapi/setvars.sh --force > /dev/null 2>&1
+        echo "Sourced setvars.sh. Adding key variables to GITHUB_ENV..."
+        # Explicitly add key variables to GITHUB_ENV for subsequent steps
+        echo "PATH=$PATH" >> $GITHUB_ENV
+        echo "LD_LIBRARY_PATH=$LD_LIBRARY_PATH" >> $GITHUB_ENV
+        echo "LIBRARY_PATH=$LIBRARY_PATH" >> $GITHUB_ENV
+        echo "CPATH=$CPATH" >> $GITHUB_ENV
+        echo "CMPLR_ROOT=$CMPLR_ROOT" >> $GITHUB_ENV # Example compiler root
+        echo "MPI_ROOT=$MPI_ROOT" >> $GITHUB_ENV     # MPI root (check actual variable name if needed, e.g., I_MPI_ROOT)
+        echo "I_MPI_ROOT=$I_MPI_ROOT" >> $GITHUB_ENV # Common variable name for Intel MPI root
+        echo "FI_PROVIDER_PATH=$FI_PROVIDER_PATH" >> $GITHUB_ENV # Often needed for MPI

.github/workflows/CI.yml

@@ -28,10 +28,14 @@ jobs:
           - {compiler: gcc, version: 12}
           - {compiler: gcc, version: 13}
           - {compiler: gcc, version: 14}
+          - {compiler: intel, version: 2025.1}
         exclude:
-          # Not yet supported by setup-fortran
-          - os: windows-latest
-            toolchain: {compiler: gcc, version: 14}          
+          - os: macos-13  # No Intel on MacOS anymore since 2024
+            toolchain: {compiler: intel, version: '2025.1'}
+          - os: windows-latest  # Doesn't pass build and tests yet
+            toolchain: {compiler: intel, version: '2025.1'}
+          - os: windows-latest  # gcc 14 not available on Windows yet
+            toolchain: {compiler: gcc, version: 14}
         include:
           - os: ubuntu-latest
             os-arch: linux-x86_64
@@ -49,7 +53,7 @@ jobs:
       uses: actions/checkout@v4
 
     - name: Setup Fortran compiler
-      uses: fortran-lang/[email protected].1
+      uses: fortran-lang/[email protected].3
       id: setup-fortran
       with:
         compiler: ${{ matrix.toolchain.compiler }}
@@ -61,7 +65,7 @@ jobs:
       with:
         fpm-version: 'v0.8.0'
 
-    # Backport gfortran shared libraries to version 10 folder. This is necessary because the macOS release of fpm 
+    # Backport gfortran shared libraries to version 10 folder. This is necessary because the macOS release of fpm
     # 0.10.0 used for bootstrapping has these paths hardcoded in the executable.
     - name: MacOS patch libgfortran
       if: contains(matrix.os, 'macos') && !contains(matrix.toolchain.version, '10')
@@ -73,7 +77,7 @@ jobs:
         mkdir /usr/local/opt/gcc@10/lib/gcc
         mkdir /usr/local/opt/gcc@10/lib/gcc/10
         mkdir /usr/local/lib/gcc/10
-        ln -fs /usr/local/opt/gcc@${{ matrix.toolchain.version }}/lib/gcc/${{ matrix.toolchain.version }}/libquadmath.0.dylib /usr/local/opt/gcc@10/lib/gcc/10/libquadmath.0.dylib 
+        ln -fs /usr/local/opt/gcc@${{ matrix.toolchain.version }}/lib/gcc/${{ matrix.toolchain.version }}/libquadmath.0.dylib /usr/local/opt/gcc@10/lib/gcc/10/libquadmath.0.dylib
         ln -fs /usr/local/opt/gcc@${{ matrix.toolchain.version }}/lib/gcc/${{ matrix.toolchain.version }}/libgfortran.5.dylib /usr/local/opt/gcc@10/lib/gcc/10/libgfortran.5.dylib
         ln -fs /usr/local/lib/gcc/${{ matrix.toolchain.version }}/libgcc_s.1.dylib /usr/local/lib/gcc/10/libgcc_s.1.dylib
 
@@ -96,7 +100,7 @@ jobs:
     - name: Build Fortran fpm (bootstrap)
       shell: bash
       run: |
-        ${{ env.BOOTSTRAP }} build 
+        ${{ env.BOOTSTRAP }} build
 
     - name: Run Fortran fpm (bootstrap)
       shell: bash
@@ -193,7 +197,7 @@ jobs:
       fail-fast: false
       matrix:
         gcc_v: [11,12,13]
-    
+
     steps:
     - uses: actions/checkout@v4
 

.github/workflows/meta.yml

@@ -44,7 +44,6 @@ jobs:
           - os: macos-13
             mpi: mpich
 
-
     steps:
     - name: Checkout code
       uses: actions/checkout@v4
@@ -70,21 +69,6 @@ jobs:
           netcdf
           netcdf-fortran
 
-    - name: (Windows) Setup VS Build environment
-      if: contains(matrix.os,'windows') && contains(matrix.mpi,'intel')
-      uses: seanmiddleditch/gha-setup-vsdevenv@master
-
-    - name: (Windows) Retrieve Intel toolchain
-      if: contains(matrix.os,'windows') && contains(matrix.mpi,'intel')
-      shell: pwsh
-      working-directory: C:\TEMP
-      run: |
-        curl.exe --output webimage.exe --url https://registrationcenter-download.intel.com/akdlm/irc_nas/19085/w_HPCKit_p_2023.0.0.25931_offline.exe --retry 5 --retry-delay 5
-        Start-Process -FilePath "webimage.exe" -ArgumentList "-s -x -f oneAPI --log extract.log" -Wait
-        Remove-Item "webimage.exe" -Force
-        Start-Process -FilePath "oneAPI\bootstrapper.exe" -ArgumentList "-s --action install --eula=accept --components=""intel.oneapi.win.cpp-compiler:intel.oneapi.win.ifort-compiler:intel.oneapi.win.mpi.devel"" -p=NEED_VS2017_INTEGRATION=0 -p=NEED_VS2019_INTEGRATION=0 -p=NEED_VS2022_INTEGRATION=0 --log-dir=." -Wait
-        Remove-Item "oneAPI" -Force -Recurse
-
     - name: (Ubuntu) Install gfortran
       if: contains(matrix.os,'ubuntu')
       run: |
@@ -106,48 +90,66 @@ jobs:
         sudo apt install -y -q mpich hwloc fabric libhdf5-dev libhdf5-fortran-102 \
           libnetcdf-dev libnetcdff-dev
 
-    - name: (Ubuntu) Retrieve Intel toolchain
-      if: contains(matrix.os,'ubuntu') && contains(matrix.mpi,'intel')
-      timeout-minutes: 1
-      run: |
-        wget -O- https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB | gpg --dearmor | sudo tee /usr/share/keyrings/oneapi-archive-keyring.gpg > /dev/null
-        echo "deb [signed-by=/usr/share/keyrings/oneapi-archive-keyring.gpg] https://apt.repos.intel.com/oneapi all main" | sudo tee /etc/apt/sources.list.d/oneAPI.list
-        sudo apt-get update
+    # Intel
 
-    - name: (Ubuntu) Install Intel oneAPI
-      if: contains(matrix.os,'ubuntu') && contains(matrix.mpi,'intel')
-      uses: fortran-lang/[email protected]
-      id: setup-fortran
+    - name: Setup Intel Environment
+      if: contains(matrix.mpi, 'intel')
+      uses: ./.github/actions/setup-intel
       with:
-        compiler: intel
-        version: 2024.1.0
+        os: ${{ matrix.os }}
 
-    - name: (Ubuntu) finalize oneAPI environment
-      if: contains(matrix.os,'ubuntu') && contains(matrix.mpi,'intel')
+    - name: (Ubuntu) Build and Install HDF5 from source
+      if: contains(matrix.os, 'ubuntu') && contains(matrix.mpi, 'intel')
+      # Needs checkout if source code isn't available, adjust if needed
+      # Ensure compilers are available from the previous step's environment setup
+      shell: bash
       run: |
-        # Install MPI
-        sudo apt-get install -y -q intel-oneapi-mpi-devel ninja-build cmake libcurl4-gnutls-dev
+        # Source again just in case shell context is lost (shouldn't be, but safer)
         source /opt/intel/oneapi/setvars.sh --force
-        printenv >> $GITHUB_ENV
-        # To run HDF5 with oneAPI, we need to build it from source. Use CMake to generate pkg-config info
+        # Download HDF5
         curl -O -L https://github.com/HDFGroup/hdf5/archive/refs/tags/snapshot-1.14.tar.gz
         tar zxf snapshot-1.14.tar.gz
         cd hdf5-snapshot-1.14
+        # Configure HDF5 with Intel compilers
         cmake -B build -DCMAKE_Fortran_COMPILER=ifx -DCMAKE_C_COMPILER=icx -DCMAKE_CXX_COMPILER=icpx -DHDF5_BUILD_FORTRAN=ON -DCMAKE_INSTALL_PREFIX=/usr
         cd build
-        make -j
+        make -j $(nproc)
         sudo make install
+        cd ../.. # Go back to workspace directory
+        rm -rf hdf5-snapshot-1.14 snapshot-1.14.tar.gz # Clean up
+
+    - name: (Ubuntu) Build and Install NetCDF-C from source
+      if: contains(matrix.os, 'ubuntu') && contains(matrix.mpi, 'intel')
+      shell: bash
+      run: |
+        source /opt/intel/oneapi/setvars.sh --force
+        # Download NetCDF-C
         curl -L https://github.com/Unidata/netcdf-c/archive/refs/tags/v4.9.2.tar.gz -o - | tar xz
         cd netcdf-c-4.9.2
-        CC=icx CXX=icpx FC=ifx ./configure --prefix=/usr --with-hdf5=/usr
-        CC=icx CXX=icpx FC=ifx make -j
+        # Configure NetCDF-C with Intel Compilers, referencing installed HDF5
+        # Set CC/CXX/FC explicitly in environment for configure script
+        export CC=icx CXX=icpx FC=ifx
+        ./configure --prefix=/usr --enable-netcdf-4 --with-hdf5=/usr
+        make -j $(nproc)
         sudo make install
+        cd .. # Go back to workspace directory
+        rm -rf netcdf-c-4.9.2 # Clean up
+
+    - name: (Ubuntu) Build and Install NetCDF-Fortran from source
+      if: contains(matrix.os, 'ubuntu') && contains(matrix.mpi, 'intel')
+      shell: bash
+      run: |
+        source /opt/intel/oneapi/setvars.sh --force
+        # Download NetCDF-Fortran
         curl -L https://github.com/Unidata/netcdf-fortran/archive/refs/tags/v4.6.1.tar.gz -o - | tar xz
         cd netcdf-fortran-4.6.1
+        # Configure NetCDF-Fortran with Intel Compilers using CMake
         cmake -B build -DCMAKE_Fortran_COMPILER=ifx -DCMAKE_C_COMPILER=icx -DCMAKE_CXX_COMPILER=icpx -DCMAKE_INSTALL_PREFIX=/usr
         cd build
-        make -j
+        make -j $(nproc)
         sudo make install
+        cd ../.. # Go back to workspace directory
+        rm -rf netcdf-fortran-4.6.1 # Clean up
 
     - name: (Windows) Put MSYS2_MinGW64 on PATH
       if: contains(matrix.os,'windows') && (!contains(matrix.mpi,'intel'))
@@ -168,26 +170,13 @@ jobs:
       # can't use MSMPI_BIN as Actions doesn't update PATH from msmpisetup.exe
       run: Test-Path "C:\Program Files\Microsoft MPI\Bin\mpiexec.exe" -PathType leaf
 
-    - name: (Windows) test that OneAPI is installed
-      if: contains(matrix.os,'windows') && contains(matrix.mpi,'intel')
-      run: |
-        Test-Path -Path "C:\Program Files (x86)\Intel\oneAPI\setvars.bat" -PathType leaf
-        Test-Path -Path "C:\Program Files (x86)\Intel\oneAPI\compiler\latest\env\vars.bat" -PathType leaf
-
     - name: (Windows) put MSMPI_BIN on PATH (where mpiexec is)
       if: contains(matrix.os,'windows') && contains(matrix.mpi,'msmpi')
       run: |
         echo "C:\Program Files\Microsoft MPI\Bin\" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
         echo "/c/Program Files/Microsoft MPI/Bin/" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
         echo "MSMPI_BIN=C:\Program Files\Microsoft MPI\Bin\" | Out-File -FilePath $env:GITHUB_ENV -Append
 
-    - name: (Windows) load OneAPI environment variables
-      if: contains(matrix.os,'windows') && contains(matrix.mpi,'intel')
-      shell: cmd
-      run: |
-        "C:\Program Files (x86)\Intel\oneAPI\setvars.bat"
-        "C:\Program Files (x86)\Intel\oneAPI\compiler\latest\env\vars.bat"
-
     - name: (Windows) Install MSYS2 msmpi package
       if: contains(matrix.os,'windows') && contains(matrix.mpi,'msmpi')
       shell: msys2 {0}

ci/run_tests.sh

@@ -65,7 +65,7 @@ test -e demo1.txt
 test -e demo2.txt
 popd
 
-# Test building individual targets 
+# Test building individual targets
 pushd many_targets
 cases=( "1" "2" "3" )
 targets=( "run" "example" "test" )
@@ -75,16 +75,16 @@ do
    for i in {0..2}
    do
       rm -f *.txt
-      this=${cases[$i]}	
+      this=${cases[$i]}
       others=${cases[@]/$this}
       filename=${targets[$j]}$this
       echo "$filename"
-      "$fpm" ${cmdrun[$j]} $filename 
+      "$fpm" ${cmdrun[$j]} $filename
       test -e $filename.txt
       # non-i-th tests should not have run
       for k in ${others[@]}
       do
-         test ! -e ${targets[$k]}$k.txt   
+         test ! -e ${targets[$k]}$k.txt
       done
    done
 done
@@ -93,22 +93,22 @@ done
 if [[ "$(which time)" ]]; then
 targets=( "run" "run --example" "test" )
 names=( "run" "example" "test" )
-cmdrun=( " " " --runner time" ) 
+cmdrun=( " " " --runner time" )
 for j in {0..2}
 do
   for i in {0..1}
   do
     rm -f *.txt
-    "$fpm" ${targets[$j]}${cmdrun[$i]} 
+    "$fpm" ${targets[$j]}${cmdrun[$i]}
     # all targets should have run
     for k in ${cases[@]}
     do
-       test -e ${names[$j]}$k.txt   
+       test -e ${names[$j]}$k.txt
     done
   done
 done
 fi
-popd 
+popd
 
 
 pushd auto_discovery_off
@@ -259,7 +259,11 @@ test $EXIT_CODE -eq 3
 # not an integer -> error 2
 EXIT_CODE=0
 "$fpm" run -- 3.1415 || EXIT_CODE=$?
-test $EXIT_CODE -eq 2
+if [[ "$FPM_FC" == "ifx" ]]; then
+   test $EXIT_CODE -eq 0  # ifx does not return error code on non-integer input
+else
+   test $EXIT_CODE -eq 2
+fi
 
 # not a number -> error 2
 EXIT_CODE=0

fpm-docs

@@ -0,0 +1 @@
+Subproject commit 2bb2038142e926c55eeea961f55506903c5b6827