Skip to content

Commit

Permalink
Merge pull request #480 from Goddard-Fortran-Ecosystem/develop
Browse files Browse the repository at this point in the history
GitFlow: Merge develop into main for 4.11.0 release
  • Loading branch information
tclune authored Feb 3, 2025
2 parents 26dadb1 + dc063c8 commit 66f77f2
Show file tree
Hide file tree
Showing 4 changed files with 78 additions and 13 deletions.
78 changes: 67 additions & 11 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,19 @@ jobs:
strategy:
matrix:
os: [ubuntu-22.04, ubuntu-24.04, macos-13, macos-14]
compiler: [gfortran-11, gfortran-12, gfortran-13]
# gfortran-10 is only on ubuntu-22.04
# gfortran-14 is available on ubuntu-24.04
compiler: [gfortran-12, gfortran-13, gfortran-14]
# gfortran-10 and -11 are only on ubuntu-22.04
# gfortran-13 and -14 are not on ubuntu-22.04
include:
- os: ubuntu-22.04
compiler: gfortran-10
- os: ubuntu-24.04
compiler: gfortran-14
exclude:
- os: ubuntu-24.04
- os: ubuntu-22.04
compiler: gfortran-11
exclude:
- os: ubuntu-22.04
compiler: gfortran-13
- os: ubuntu-22.04
compiler: gfortran-14

# fail-fast if set to 'true' here is good for production, but when
# debugging, set to 'false'. fail-fast means if *any* ci test in the matrix fails
Expand Down Expand Up @@ -68,7 +68,7 @@ jobs:
- name: Cache MPI
id: cache-mpi
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/local/openmpi
key: mpi-${{ runner.os }}-${{ matrix.os }}-${{ matrix.compiler }}
Expand Down Expand Up @@ -113,7 +113,7 @@ jobs:
build/**/*.log
Intel:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04

env:
FC: ifx
Expand Down Expand Up @@ -182,12 +182,68 @@ jobs:
build/**/*.log
Nvidia:
runs-on: ubuntu-20.04
container: nvcr.io/nvidia/nvhpc:24.1-devel-cuda12.3-ubuntu22.04
runs-on: ubuntu-22.04
container: nvcr.io/nvidia/nvhpc:24.7-devel-cuda12.5-ubuntu22.04
env:
FC: nvfortran

name: Nvidia HPC
steps:
- name: Versions
run: |
${FC} --version
cmake --version
- name: Checkout
uses: actions/checkout@v4
with:
fetch-depth: 1

- name: Set all directories as git safe
run: |
git config --global --add safe.directory '*'
- name: Add python-is-python3 package
run: |
apt-get update
apt-get install -y python-is-python3
- name: Configure pFUnit
run: cmake -B build -DSKIP_ROBUST=ON

- name: Build pfUnit
run: cmake --build build --parallel

- name: Build Tests
run: |
cmake --build build --parallel 4 --target build-tests
cmake --build build --parallel 4 --target tests
- name: Run Ctest
run: 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()
with:
name: logfiles
path: |
build/**/*.log
Flang:
runs-on: ubuntu-latest
container: gmao/llvm-flang-openmpi:latest
env:
FC: flang-new
LANGUAGE: en_US.UTF-8
LC_ALL: en_US.UTF-8
LANG: en_US.UTF-8
LC_TYPE: en_US.UTF-8
OMPI_ALLOW_RUN_AS_ROOT: 1
OMPI_ALLOW_RUN_AS_ROOT_CONFIRM: 1
OMPI_MCA_btl_vader_single_copy_mechanism: none

name: Flang
steps:
- name: Versions
run: |
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
cmake_minimum_required(VERSION 3.12)

project (PFUNIT
VERSION 4.10.0
VERSION 4.11.0
LANGUAGES Fortran C)

cmake_policy(SET CMP0077 NEW)
Expand Down
9 changes: 9 additions & 0 deletions ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [4.11.0] - 2025-02-03

### Changed

- Updated submodule for fArgParse
- Update CI to have `gfortran-10` and `gfortran-11` only on `ubuntu-22.04`
- Update CI NVIDIA to NVHPC 24.7
- Add Flang to CI

## [4.10.0] - 2024-07-10

### Changed
Expand Down
2 changes: 1 addition & 1 deletion extern/fArgParse

0 comments on commit 66f77f2

Please sign in to comment.