Merge pull request #45 from Goddard-Fortran-Ecosystem/feature/update-to-pfunit-4.14

Author: mathomp4

.github/workflows/main.yml

@@ -18,7 +18,7 @@ jobs:
         os: [ubuntu-22.04, ubuntu-24.04, macos-14, macos-15]
         compiler: [gfortran-12, gfortran-13, gfortran-14, gfortran-15]
         # gfortran-10 and -11 are only on ubuntu-22.04
-        # gfortran-13 and -14 and -15 are not on ubuntu-22.04
+        # gfortran-13, -14, and -15 are not on ubuntu-22.04
         # gfortran-15 is only on macos
         include:
           - os: ubuntu-22.04
@@ -60,7 +60,7 @@ jobs:
           cmake --version
 
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 1
           submodules: true
@@ -126,7 +126,7 @@ jobs:
     name: Intel Fortran
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 1
           submodules: true
@@ -187,52 +187,92 @@ jobs:
           path: |
             build/**/*.log
 
-  Nvidia:
-    runs-on: ubuntu-22.04
-    container: nvcr.io/nvidia/nvhpc:24.7-devel-cuda12.5-ubuntu22.04
+  # NOTE: This is weird because the NVHPC image is so large (~8GB) that
+  #      we have to do some tricks to get it to run in GitHub Actions.
+  Nvidia-Build-Only:
+    runs-on: ubuntu-24.04
     env:
       FC: nvfortran
+      NVHPC_IMAGE: nvcr.io/nvidia/nvhpc:25.7-devel-cuda12.9-ubuntu24.04
 
-    name: Nvidia HPC
     steps:
-      - name: Versions
+      # Reclaim lots of space
+      - name: Free disk space
+        uses: jlumbroso/free-disk-space@v1.3.1
+        with:
+          tool-cache: true
+          android: true
+          dotnet: true
+          haskell: true
+          large-packages: true
+          swap-storage: true
+
+      # Move /var/lib/docker onto the larger ephemeral disk (do this before any docker pulls)
+      - name: Maximize build space (move Docker storage)
+        uses: easimon/maximize-build-space@v10
+        with:
+          root-reserve-mb: 4096
+          remove-dotnet: 'true'
+          remove-android: 'true'
+          remove-haskell: 'true'
+          remove-codeql: 'true'
+          build-mount-path: '/var/lib/docker'
+
+      - name: Reset Docker daemon & prune
         run: |
-          ${FC} --version
-          cmake --version
+          sudo systemctl restart docker
+          docker system prune -af || true
 
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 1
           submodules: true
 
-      - name: Set all directories as git safe
-        run: |
-          git config --global --add safe.directory '*'
+      - name: Pull NVHPC image
+        run: docker pull "$NVHPC_IMAGE"
 
-      - name: Add python-is-python3 package
+      # Run everything inside the NVHPC container
+      - name: Build (inside NVHPC)
         run: |
-          apt-get update
-          apt-get install -y python-is-python3
+          docker run --rm \
+            -v "$GITHUB_WORKSPACE:/workspace" \
+            -w /workspace \
+            -e FC="$FC" \
+            "$NVHPC_IMAGE" \
+            bash -lc '
+              set -euo pipefail
 
-      - name: Build and Install GFE
-        run: |
-          cmake -B build -DSKIP_OPENMP=ON -DCMAKE_INSTALL_PREFIX=../install -DCMAKE_PREFIX_PATH=../install -DSKIP_ROBUST=YES
-          cmake --build build --parallel 4 --target install
-          cmake -B build -DSKIP_OPENMP=ON -DCMAKE_INSTALL_PREFIX=../install -DCMAKE_PREFIX_PATH=../install -DSKIP_ROBUST=YES
-          cmake --build build --parallel 4 --target install
+              echo "== Versions =="
+              ${FC} --version || true
 
-      - name: Build and Run Tests target
-        run: |
-          cmake --build build --parallel 4 --target build-tests
-          cmake --build build --parallel 4 --target tests || ctest --test-dir build --parallel 1 --output-on-failure --repeat until-pass:4
+              # Base NVHPC images are minimal; install what you need
+              apt-get update
+              DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
+                cmake git python-is-python3 ca-certificates pkg-config make
 
-      - name: Run Ctest
-        run: ctest --test-dir build --parallel 1 --output-on-failure --repeat until-pass:4
+              cmake --version
+
+              echo "== Git safe.directory =="
+              git config --global --add safe.directory "*"
+
+              echo "== Build pFUnit =="
+              cmake -B build -DSKIP_OPENMP=ON -DCMAKE_INSTALL_PREFIX=../install -DCMAKE_PREFIX_PATH=../install -DSKIP_ROBUST=YES
+              cmake --build build --parallel 4 --target install
+              cmake -B build -DSKIP_OPENMP=ON -DCMAKE_INSTALL_PREFIX=../install -DCMAKE_PREFIX_PATH=../install -DSKIP_ROBUST=YES
+              cmake --build build --parallel 4 --target install
+
+              echo "== Build Tests (CURRENTLY TURNED OFF DUE TO PFUNIT ISSUES) =="
+              #cmake --build build --parallel 4 --target build-tests
+              #cmake --build build --parallel 4 --target tests || ctest --test-dir build --parallel 1 --output-on-failure --repeat until-pass:4
+
+              echo "== Run Tests (CURRENTLY TURNED OFF DUE TO PFUNIT ISSUES) =="
+              #ctest --test-dir build --parallel 1 --output-on-failure --repeat until-pass:4
+            '
 
       - name: Archive log files on failure
-        uses: actions/upload-artifact@v4
         if: failure()
+        uses: actions/upload-artifact@v4
         with:
           name: logfiles-Nvidia
           path: |
@@ -259,7 +299,7 @@ jobs:
           cmake --version
 
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 1
           submodules: true

CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.24)
 project (GFE
-  VERSION 1.20.0
+  VERSION 1.21.0
   LANGUAGES Fortran
 )
 cmake_policy(SET CMP0074 NEW)

ChangeLog.md

@@ -5,6 +5,22 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.21.0] - 2025-10-14
+
+### Changed
+
+- Update pFUnit to v4.14.0
+  - Add an enclosing `<testsuites>` element an xml version/encoding element in the funit xml output. Makes the output readable by more CI systems (Jenkins, GitLab-CI).
+  - Change CMake from using `PARENT_SCOPE` to `CACHE INTERNAL` as it seems in some setups using
+    pFUnit via `FetchContent` the former does not work as expected.
+  - Update some `COMMENT` lines in functions with double-quotes to avoid warnings
+  - Fix parser on Windows for paths with different drive letters
+  - Updates for CMake versions newer than 3.30.
+  - Update NVHPC CI (build only)
+  - Fix CMake for LLVM Flang
+  - Update object library dependency handling
+- Update NVHPC CI build
+
 ## [1.20.0] - 2025-09-30
 
 ### Changed

README.md

@@ -9,7 +9,7 @@ This repo is intended to be a single fixture for the [Goddard Fortran Ecosystem]
 | gFTL        | v1.16.0    |
 | gFTL-shared | v1.11.0    |
 | fArgParse   | v1.10.0    |
-| pFUnit      | v4.13.0    |
+| pFUnit      | v4.14.0    |
 | yaFyaml     | v1.6.0     |
 | pFlogger    | v1.17.0    |