Merge V2.4 into master

build-hypre/action.yml

@@ -26,11 +26,33 @@ inputs:
     description: 'A key to identify the desired hypre config (int32, int64)'
     required: false
     default: int32
+  build-system:
+    description: 'identify the build system to use (make,cmake)'
+    required: false
+    default: make
 
 runs:
   using: "composite"
   steps:
-    - name: Install Hypre
+    - name: Get Hypre (Windows)
+      if: runner.os == 'Windows'
+      run: |
+        $URI_HYPRE = "${{ inputs.url }}/${{ inputs.archive }}"
+        Invoke-WebRequest -Uri $URI_HYPRE -OutFile ${{ inputs.archive }}
+        Remove-Item ${{ inputs.dir }} -Force -Recurse -ErrorAction Ignore;
+        tar -xzf ${{ inputs.archive }};
+      shell: pwsh
+
+    - name: Get Hypre (Linux/macOS)
+      if: runner.os != 'Windows'
+      run: |
+        wget --no-verbose ${{ inputs.url }}/${{ inputs.archive }};
+        rm -rf ${{ inputs.dir }};
+        tar -xzf ${{ inputs.archive }};
+      shell: bash
+
+    - name: Install Hypre (make)
+      if: inputs.build-system == 'make'
       run: |
         echo "Map target to options"
         if [[ "${{ inputs.target }}" == "int32" ]]
@@ -44,11 +66,36 @@ runs:
           exit 1;
         fi
         echo "Installing Hypre"
-        wget --no-verbose ${{ inputs.url }}/${{ inputs.archive }};
-        rm -rf ${{ inputs.dir }};
-        tar -xzf ${{ inputs.archive }};
-        cd ${{ inputs.dir }}/src;
-        ./configure ${hypre_options} CC=mpicc CXX=mpic++;
+        cd ${{ inputs.dir }};
+        install_prefix="$(pwd)/install";
+        cd src;
+        ./configure --prefix=${install_prefix} ${hypre_options} CC=mpicc CXX=mpic++;
         make -j3;
+        make install;
+        cd ../..;
+      shell: bash
+
+    - name: Install Hypre (cmake)
+      if: inputs.build-system == 'cmake'
+      run: |
+        echo "Map target to options"
+        if [[ "${{ inputs.target }}" == "int32" ]]
+        then
+          export hypre_options="";
+        elif [[ "${{ inputs.target }}" == "int64" ]]
+        then
+          export hypre_options="-DHYPRE_ENABLE_BIGINT=ON";
+        else
+          echo "Hypre target not recognized";
+          exit 1;
+        fi
+        echo "Installing Hypre"
+        cd ${{ inputs.dir }};
+        cmake -Hsrc -Bbuild \
+          ${hypre_options} \
+          -DCMAKE_BUILD_TYPE=Release \
+          -DCMAKE_INSTALL_PREFIX=install
+        cmake --build build --config Release --parallel 3
+        cmake --install build --config Release
         cd ../..;
       shell: bash

build-mfem/action.yml

@@ -48,6 +48,14 @@ inputs:
     description: 'identify the build system to use (make,cmake)'
     required: false
     default: make
+  library-only:
+    description: 'only build the mfem library, without examples/tests/miniapps'
+    required: false
+    default: 'false'
+  config-options:
+    description: 'extra options to pass to build configuration'
+    required: false
+    default: ''
 
 runs:
   using: "composite"
@@ -73,10 +81,15 @@ runs:
         MPI="NO"
         if [[ ${{ inputs.mpi }} == 'par' ]]; then
           MPI="YES"
-          echo "[INFO] Hypre symlink: hypre -> ${{ inputs.hypre-dir }}"
-          ln -s -f ${{ inputs.hypre-dir }} hypre;
-          echo "[INFO] Metis symlink: metis -> ${{ inputs.metis-dir }}"
-          ln -s -f ${{ inputs.metis-dir }} metis-4.0;
+          # If the directory does not exist, we assume it was installed elsewhere and don’t create the link
+          if [[ -d ${{ inputs.hypre-dir }} ]]; then
+            ln -s -f ${{ inputs.hypre-dir }} hypre;
+            echo "[INFO] Hypre symlink: hypre -> ${{ inputs.hypre-dir }}"
+          fi
+          if [[ -d ${{ inputs.metis-dir }} ]]; then
+            ln -s -f ${{ inputs.metis-dir }} metis-4.0;
+            echo "[INFO] Metis symlink: metis -> ${{ inputs.metis-dir }}"
+          fi
         fi
         echo "[STATUS] MPI: ${MPI}"
         CPPFLAGS=""
@@ -90,6 +103,9 @@ runs:
               ${{ inputs.target }} == 'dbg' ]]; then
           CPPFLAGS+=" -pedantic -Wall -Werror";
         fi
+        if [[ ${{ runner.os }} != 'Linux' ]]; then
+          CPPFLAGS+=" -Wshadow";
+        fi
         echo "[STATUS] DEBUG: ${DEBUG}"
         echo "[STATUS] BUILD_TYPE: ${BUILD_TYPE}"
         if [[ ${{ inputs.codecov }} == 'YES' ]]; then
@@ -100,30 +116,54 @@ runs:
         echo "--- Configure mfem ---"
         cd ${{ inputs.mfem-dir }};
         if [[ ${{ inputs.build-system }} == 'cmake' ]]; then
+            if [[ ${{ runner.os }} == "Windows" ]]; then
+              toolchain_file="${VCPKG_INSTALLATION_ROOT}\\scripts\\buildsystems\\vcpkg.cmake"
+              vcpkg_triplet="x64-windows-static"
+            fi
+            # Use the MPI wrapper on Ubuntu (at least on v22.04) to avoid slow
+            # linking times due to LTO compile flags.
+            USE_MPI_WRAPPER="-DMPICXX=mpicxx"
+            [[ ${{ runner.os }} != 'Linux' ]] && USE_MPI_WRAPPER=""
             mkdir build && cd build;
             cmake \
+              -D CMAKE_TOOLCHAIN_FILE:STRING=${toolchain_file} \
+              -D VCPKG_TARGET_TRIPLET=${vcpkg_triplet} \
               -D CMAKE_BUILD_TYPE=${BUILD_TYPE} \
               -D MFEM_USE_MPI=${MPI} \
               -D MFEM_MPI_NP=2 \
-              -D HYPRE_DIR=../../hypre/src/hypre \
+              -D HYPRE_DIR=../../hypre/install \
+              ${USE_MPI_WRAPPER} \
+              ${{ inputs.config-options }} \
               ..
         else
-            make config MFEM_USE_MPI=${MPI} MFEM_MPI_NP=2 MFEM_DEBUG=${DEBUG} CPPFLAGS="${CPPFLAGS}";
+            make config \
+              MFEM_USE_MPI=${MPI} \
+              MFEM_MPI_NP=2 \
+              MFEM_DEBUG=${DEBUG} \
+              CPPFLAGS="${CPPFLAGS}" \
+              HYPRE_DIR=@MFEM_DIR@/../hypre/install \
+              ${{ inputs.config-options }}
         fi
       shell: bash
 
     - name: build mfem
       run: |
         echo "------------------"
         echo "--- Build mfem ---"
+        BUILD_TYPE="Release"
+        [[ ${{ inputs.target }} == 'dbg' ]] && BUILD_TYPE="Debug";
         cd ${{ inputs.mfem-dir }}
         if [[ ${{ inputs.build-system }} == 'cmake' ]]; then
+            CMAKE_TARGET="exec"
+            [[ ${{ inputs.library-only }} == 'true' ]] && CMAKE_TARGET="mfem";
             cd build
-            make -j3 mfem examples
-            cd tests/unit
-            make -j3
+            cmake --build . --parallel 3 --target ${CMAKE_TARGET} --config "${BUILD_TYPE}"
+            if [[ ${{ inputs.library-only }} == 'false' ]]; then
+              cmake --build tests/unit --parallel 3 --config "${BUILD_TYPE}"
+            fi
         else
-            make all -j3
+            MAKE_TARGET="all"
+            [[ ${{ inputs.library-only }} == 'true' ]] && MAKE_TARGET="";
+            make ${MAKE_TARGET} -j3
         fi
       shell: bash
-

upload-coverage/action.yml

@@ -30,20 +30,29 @@ runs:
     - run: |
         cd ${{ inputs.project_dir }}
         # Restrict search to directories listed, if any.
-        directory_list="${{ inputs.directories }}";
-        dirs_opts="";
+        directory_list="${{ inputs.directories }}"
+        dirs_opts=""
         if [[ -n "${directory_list}" ]]; then
           for dir in ${directory_list}; do dirs_opts+=" --directory=${dir}"; done
         fi
+        keep_going_flag=""
+        if [[ "$(lcov --version)" =~ "lcov: LCOV version 2" ]]; then
+          keep_going_flag="--keep-going"
+        fi
         # Generate the coverage report.
-        lcov --no-external --gcov-tool gcov ${dirs_opts} --capture --output-file lcov.info;
+        lcov ${keep_going_flag} --no-external --gcov-tool gcov ${dirs_opts} --capture --output-file lcov.info
         # The variable $RUNNER_OS should be either "Linux" or "macOS"
         os_lowercase=$(echo $RUNNER_OS | awk '{print tolower($0)}')
         # The prefix will end with "linux" or "macos" depending on the runner OS
         prefix="https://uploader.codecov.io/latest/$os_lowercase"
         curl -Os "$prefix/codecov"
+        # Workaround for GPG issue: need to create the GNUPGHOME (with proper
+        # permissions) otherwise the trustedkeys file is not created.
+        export GNUPGHOME="$HOME/gnupg"
+        mkdir "$GNUPGHOME"
+        chmod 700 "$GNUPGHOME"
         # Check integrity of the binary uploader (cf. https://docs.codecov.com/docs/codecov-uploader#integrity-checking-the-uploader)
-        curl https://keybase.io/codecovsecurity/pgp_keys.asc | gpg --no-default-keyring --keyring trustedkeys.gpg --import # One-time step
+        curl https://keybase.io/codecovsecurity/pgp_keys.asc | gpg --no-default-keyring --keyring trustedkeys.kbx --import # One-time step
         curl -Os "$prefix/codecov.SHA256SUM"
         curl -Os "$prefix/codecov.SHA256SUM.sig"
         gpgv codecov.SHA256SUM.sig codecov.SHA256SUM