Gitflow for release

.github/workflows/main.yml

@@ -18,19 +18,11 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-20.04, ubuntu-22.04, macos-11, macos-12]
-        compiler: [gfortran-9, gfortran-10, gfortran-11, gfortran-12]
+        os: [ubuntu-22.04, macos-11, macos-12]
+        compiler: [gfortran-10, gfortran-11, gfortran-12, gfortran-13]
         exclude:
-          - os: ubuntu-20.04
-            compiler: gfortran-11
-          - os: ubuntu-20.04
-            compiler: gfortran-12
-          - os: ubuntu-22.04
-            compiler: gfortran-9
           - os: macos-11
-            compiler: gfortran-9
-          - os: macos-12
-            compiler: gfortran-9
+            compiler: gfortran-13
           - os: macos-12
             compiler: gfortran-10
 
@@ -53,51 +45,58 @@ jobs:
 
     name: ${{ matrix.os }} / ${{ matrix.compiler }}
     steps:
-      - name: Install GCC 12 on Ubuntu 22.04
-        if: matrix.os == 'ubuntu-22.04' && matrix.compiler == 'gfortran-12'
-        run: |
-          sudo apt-get install gfortran-12 -y
       - name: Compiler Versions
         run: |
           ${FC} --version
           cmake --version
+
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 1
+
       - name: Set all directories as git safe
         run: |
           git config --global --add safe.directory '*'
+
       - name: Cache MPI
         id: cache-mpi
         uses: actions/cache@v3
         with:
           path: ~/local/openmpi
           key: mpi-${{ runner.os }}-${{ matrix.os }}-${{ matrix.compiler }}
+
       - name: Build MPI
         if: steps.cache-mpi.outputs.cache-hit != 'true'
         run: |
           sh ${GITHUB_WORKSPACE}/tools/ci-install-mpi.sh openmpi 4.1.4
+
       - name: Set MPI Environment
         run: |
           echo "${HOME}/local/openmpi/bin" >> $GITHUB_PATH
           echo "LD_LIBRARY_PATH=${HOME}/local/openmpi/lib" >> $GITHUB_ENV
           echo "DYLD_LIBRARY_PATH=${HOME}/local/openmpi/lib" >> $GITHUB_ENV
+
       - name: MPI Versions
         run: |
           ${FC} --version
           mpirun --version
           mpifort --show
+
       - name: Configure pFUnit
-        run: cmake -Bbuild
+        run: cmake -B build
+
       - name: Build pfUnit
         run: cmake --build build --parallel
+
       - name: Build Tests
         run: cmake --build build --parallel -t build-tests
+
       - name: Run Tests
         run: ctest --test-dir build --parallel 1 --output-on-failure --repeat until-pass:4 --schedule-random
+
       - name: Archive log files on failure
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: logfiles
@@ -108,42 +107,113 @@ jobs:
     runs-on: ubuntu-20.04
 
     env:
-      FC: ifort
-      CC: icc
+      FC: ifx
+      CC: icx
 
     name: Intel Fortran
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
-      - name: Install Intel compilers
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 1
+
+      - name: Set all directories as git safe
+        run: |
+          git config --global --add safe.directory '*'
+
+      - name: Setup Intel oneAPI repository
         run: |
-          cd /tmp
           wget https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB
           sudo apt-key add GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB
-          rm GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB
           sudo add-apt-repository "deb https://apt.repos.intel.com/oneapi all main"
-          sudo apt install --no-install-recommends intel-oneapi-compiler-fortran intel-oneapi-mpi \
-            intel-oneapi-compiler-dpcpp-cpp-and-cpp-classic intel-oneapi-mpi-devel
+          sudo apt-get update
+
+      - name: Install Intel oneAPI compilers
+        timeout-minutes: 5
+        run: sudo apt-get install intel-oneapi-compiler-fortran intel-oneapi-compiler-dpcpp-cpp
+
+      # optional
+      - name: Install Intel MPI
+        timeout-minutes: 5
+        run: sudo apt-get install intel-oneapi-mpi intel-oneapi-mpi-devel
+
+      - name: Setup Intel oneAPI environment
+        run: |
           source /opt/intel/oneapi/setvars.sh
           printenv >> $GITHUB_ENV
+          printenv | grep intel
+
       - name: Versions
         run: |
           ${FC} --version
           ${CC} --version
           mpirun --version
           cmake --version
+
+      - name: Configure pFUnit
+        run: cmake -B build
+
+      - name: Build pfUnit
+        run: cmake --build build --parallel
+
+      - name: Build Tests
+        run: cmake --build build --parallel -t build-tests
+
+      - name: Run Tests
+        run: ctest --test-dir build --parallel 1 --output-on-failure --repeat until-pass:4 --schedule-random
+
+      - name: Archive log files on failure
+        uses: actions/upload-artifact@v4
+        if: failure()
+        with:
+          name: logfiles
+          path: |
+            build/**/*.log
+
+  Nvidia:
+    runs-on: ubuntu-20.04
+    container: nvcr.io/nvidia/nvhpc:24.1-devel-cuda12.3-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 -Bbuild
+        run: cmake -B build
+
       - name: Build pfUnit
         run: cmake --build build --parallel
+
       - name: Build Tests
         run: cmake --build build --parallel -t build-tests
+
       - name: Run Tests
         run: ctest --test-dir build --parallel 1 --output-on-failure --repeat until-pass:4 --schedule-random
+
       - name: Archive log files on failure
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: logfiles
           path: |
             build/**/*.log
+

ChangeLog.md

@@ -5,11 +5,21 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+
+- Fujitsu compiler support
+
 ### Fixed
 
+- This fixes a small CMake bug which can lead to posix_predefined.x being built in the wrong build subdirectory when CMAKE_RUNTIME_OUTPUT_DIRECTORY is set*.
 - Missing implementation of `assertIsFinite_real80()`.  Apparently undetected until recent attempt to port to flang.
 
-## [4.8.0] -2023-11-29
+### Changed
+
+- Updated the CI to use Intel LLVM compilers
+- Removed obsolete documentation
+
+## [4.8.0] - 2023-11-29
 
 ### Changed
 

cmake/Fujitsu.cmake

@@ -0,0 +1,14 @@
+if (CMAKE_Fortran_COMPILER_ID MATCHES Fujitsu)
+    if (CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 4.10.0)
+      message(FATAL_ERROR "${CMAKE_Fortran_COMPILER_ID} version must be at least 4.10.0!")
+    endif ()
+endif ()
+
+# Compiler specific flags for Fujitsu Fortran compiler
+
+set(check_all "-Nquickdbg")
+set(cpp "-Cfpp")
+
+set(CMAKE_Fortran_FLAGS_DEBUG "-O0 ${check_all}")
+set(CMAKE_Fortran_FLAGS_RELEASE "-O3")
+set(CMAKE_Fortran_FLAGS "-g ${cpp} -Nalloc_assign -Free")