Merge branch 'develop' into feature/mathomp4/llvmflang

Goddard-Fortran-Ecosystem · Jul 12, 2024 · ab2b023 · ab2b023
2 parents 75a8012 + 3cf5969
commit ab2b023
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 14 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -15,13 +15,20 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-22.04, macos-11, macos-12]
-        compiler: [gfortran-10, gfortran-11, gfortran-12, gfortran-13]
+        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
+        include:
+          - os: ubuntu-22.04
+            compiler: gfortran-10
+          - os: ubuntu-24.04
+            compiler: gfortran-14
         exclude:
-          - os: macos-11
+          - os: ubuntu-24.04
+            compiler: gfortran-11
+          - os: ubuntu-22.04
             compiler: gfortran-13
-          - os: macos-12
-            compiler: gfortran-10
 
       # 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 +72,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 +148,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 +204,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/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
@@ -11,6 +11,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - LLVMFlang compiler support
 
+### Changed
+
+- Update CI to remove `macos-12`, add `macos-14` and `ubuntu-24.04`
+
+## [1.15.0] - 2024-05-17
+
+### Changed
+
+- Change use of `spread` in `MockMPI.F90` initialization to `reshape` to avoid NVHPC issue
+
 ## [1.14.0] - 2024-03-26
 
 ### Fixed

diff --git 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

diff --git 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