From bbc88f67e094260b28d9a37c26e28a5219ee3486 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Fri, 17 May 2024 10:15:53 -0400 Subject: [PATCH 1/5] Move from spread to reshape in MockMPI --- ChangeLog.md | 4 ++++ src/MockMpi.F90 | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog.md b/ChangeLog.md index 5829d18..d3624f3 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +### Changed + +- Change use of `spread` in `MockMPI.F90` initialization to `reshape` to avoid NVHPC issue + ## [1.14.0] - 2024-03-26 ### Changed diff --git a/src/MockMpi.F90 b/src/MockMpi.F90 index 5c549e8..d14b746 100644 --- a/src/MockMpi.F90 +++ b/src/MockMpi.F90 @@ -20,7 +20,7 @@ module mpi integer, parameter :: MPI_ADDRESS_KIND = INT64 integer, parameter :: MPI_STATUS_SIZE = 6 - integer, parameter :: MPI_STATUS_IGNORE(MPI_STATUS_SIZE) = spread(0, dim=1, ncopies=MPI_STATUS_SIZE) + integer, parameter :: MPI_STATUS_IGNORE(MPI_STATUS_SIZE) = reshape([0], shape=[MPI_STATUS_SIZE], pad=[0]) integer, parameter :: MPI_LOGICAL = 9 integer, parameter :: MPI_SUCCESS = 0 integer, parameter :: MPI_INFO_NULL = 0 From 60c5a27e85a5763ed60b3a308c44345909d01ac1 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Fri, 17 May 2024 10:39:42 -0400 Subject: [PATCH 2/5] Update changelog and cmakelists for 1.15 release --- CMakeLists.txt | 2 +- ChangeLog.md | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9ef0a6b..163be8f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,7 +20,7 @@ # ------------------------------------------------------------------------ # cmake_minimum_required (VERSION 3.12) project (PFLOGGER - VERSION 1.14.0 + VERSION 1.15.0 LANGUAGES Fortran) set (CMAKE_MODULE_PATH diff --git a/ChangeLog.md b/ChangeLog.md index 080c9e0..e34883a 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [1.15.0] - 2024-05-17 + ### Changed - Change use of `spread` in `MockMPI.F90` initialization to `reshape` to avoid NVHPC issue From 4ad54b8b7c3cd5e24ededd021c6822d86750ed3d Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Tue, 28 May 2024 09:13:19 -0400 Subject: [PATCH 3/5] Update CI to remove macos-12, add macos-14 and ubuntu-24 --- .github/workflows/main.yml | 26 ++++++++++++++++---------- ChangeLog.md | 4 ++++ 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1fc7df9..ed0a1a6 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -15,13 +15,19 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-22.04, macos-11, macos-12] + os: [ubuntu-22.04, ubuntu-24.04, macos-13, macos-14] compiler: [gfortran-10, gfortran-11, gfortran-12, gfortran-13] exclude: - - os: macos-11 - compiler: gfortran-13 - - os: macos-12 + - os: macos-13 + compiler: gfortran-10 + - os: macos-14 compiler: gfortran-10 + - os: ubuntu-24.04 + compiler: gfortran-10 + - os: ubuntu-24.04 + compiler: gfortran-11 + - os: ubuntu-22.04 + compiler: gfortran-13 # 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 @@ -65,12 +71,12 @@ jobs: mkdir -p build cd build cmake .. -DCMAKE_Fortran_COMPILER=${FC} -DCMAKE_INSTALL_PREFIX=${HOME}/Software/pFlogger -DCMAKE_PREFIX_PATH=${HOME}/Software/GFE - make -j$(nproc) + make -j4 - name: Build Tests run: | cd build - make -j$(nproc) tests + make -j4 tests - name: Run Tests run: | @@ -141,12 +147,12 @@ jobs: mkdir -p build cd build cmake .. -DCMAKE_Fortran_COMPILER=${FC} -DCMAKE_INSTALL_PREFIX=${HOME}/Software/pFlogger -DCMAKE_PREFIX_PATH=${HOME}/Software/GFE - make -j$(nproc) + make -j4 - name: Build Tests run: | cd build - make -j$(nproc) tests + make -j4 tests - name: Run Tests run: | @@ -197,12 +203,12 @@ jobs: mkdir -p build cd build cmake .. -DCMAKE_Fortran_COMPILER=${FC} -DCMAKE_INSTALL_PREFIX=${HOME}/Software/pFlogger -DCMAKE_PREFIX_PATH=${HOME}/Software/GFE - make -j$(nproc) + make -j4 - name: Build Tests run: | cd build - make -j$(nproc) tests + make -j4 tests - name: Run Tests run: | diff --git a/ChangeLog.md b/ChangeLog.md index e34883a..7bd2147 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +### Changed + +- Update CI to remove `macos-12`, add `macos-14` and `ubuntu-24.04` + ## [1.15.0] - 2024-05-17 ### Changed From c1a8356569a55b244908fe5e4477798874342eb1 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Tue, 28 May 2024 09:16:47 -0400 Subject: [PATCH 4/5] Use 4 procs --- tools/ci-install-gfe.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/ci-install-gfe.bash b/tools/ci-install-gfe.bash index 859deda..143041d 100644 --- a/tools/ci-install-gfe.bash +++ b/tools/ci-install-gfe.bash @@ -17,6 +17,6 @@ do cd ${GFE_DIR}/${repo} mkdir build && cd build cmake .. -DCMAKE_INSTALL_PREFIX=${GFE_INSTALL_DIR} -DCMAKE_PREFIX_PATH=${GFE_INSTALL_DIR} - make -j$(nproc) install + make -j4 install done From 234cfb782835ed7f6007786499ef40f295147afc Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Mon, 8 Jul 2024 12:41:43 -0400 Subject: [PATCH 5/5] CI: Make consistent with pFUnit CI --- .github/workflows/main.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ed0a1a6..0ac2033 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -16,14 +16,15 @@ jobs: strategy: matrix: os: [ubuntu-22.04, ubuntu-24.04, macos-13, macos-14] - compiler: [gfortran-10, gfortran-11, gfortran-12, gfortran-13] - exclude: - - os: macos-13 - compiler: gfortran-10 - - os: 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 + include: + - os: ubuntu-22.04 compiler: gfortran-10 - os: ubuntu-24.04 - compiler: gfortran-10 + compiler: gfortran-14 + exclude: - os: ubuntu-24.04 compiler: gfortran-11 - os: ubuntu-22.04