Merge pull request #24 from jchristopherson/v1.7.2

V1.7.2

Author: jchristopherson

.github/workflows/cmake.yml

@@ -24,7 +24,7 @@ jobs:
             toolchain: {compiler: intel, version: '2023.2'}
 
     steps:
-      - uses: awvwgk/setup-fortran@v1
+      - uses: awvwgk/setup-fortran@v1.6.1
         id: setup-fortran
         with:
           compiler: ${{ matrix.toolchain.compiler }}

.github/workflows/doc-deployment.yml

@@ -0,0 +1,26 @@
+name: doc-deployment
+
+on: [push, pull_request]
+
+jobs:
+  build-and-deploy:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/setup-python@v1
+      with:
+        python-version: '3.x'
+
+    - name: Install dependencies
+      run: pip install -v ford==6.1.17
+
+    - name: Build Documentation
+      run: ford docs.md
+
+    - uses: JamesIves/[email protected]
+      if: github.event_name == 'push' && github.repository == 'jchristopherson/fstats' && ( startsWith( github.ref, 'refs/tags/' ) || github.ref == 'refs/heads/main' )
+      with:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        BRANCH: gh-pages
+        FOLDER: doc
+        CLEAN: true

.github/workflows/doxygen-gh-pages.yml

@@ -8,15 +8,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, macos-11]
-        gcc_v: [10] # Version of GFortran we want to use.
+        os: [ubuntu-latest]
+        gcc_v: [12] # Version of GFortran we want to use.
         include:
         - os: ubuntu-latest
           os-arch: linux-x86_64
 
-        - os: macos-11
-          os-arch: macos-x86_64
-
     env:
       FC: gfortran
       GCC_V: ${{ matrix.gcc_v }}
@@ -25,26 +22,25 @@ jobs:
     - name: Checkout code
       uses: actions/checkout@v1
 
-    - name: Install GFortran macOS
-      if: contains(matrix.os, 'macos')
-      run: |
-        ln -s /usr/local/bin/gfortran-${GCC_V} /usr/local/bin/gfortran
-        which gfortran-${GCC_V}
-        which gfortran
-
     - name: Install GFortran Linux
       if: contains(matrix.os, 'ubuntu')
       run: |
         sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-${GCC_V} 100 \
         --slave /usr/bin/gfortran gfortran /usr/bin/gfortran-${GCC_V} \
         --slave /usr/bin/gcov gcov /usr/bin/gcov-${GCC_V}
     
+    - name: Install BLAS & LAPACK
+      if: contains(matrix.os, 'ubuntu')
+      run: |
+        sudo apt-get update
+        sudo apt-get install libopenblas-dev liblapack-dev
+
     - name: Install fpm
-      uses: fortran-lang/setup-fpm@v3
+      uses: fortran-lang/setup-fpm@v5
       with:
-        fpm-version: 'v0.8.2'
+        fpm-version: 'v0.10.1'
 
-    - name: Build FERROR
+    - name: Build LINALG
       run: |
         gfortran --version
         fpm build
@@ -70,6 +66,8 @@ jobs:
           install: |
             mingw-w64-x86_64-gcc-fortran
             mingw-w64-x86_64-fpm
+            mingw-w64-x86_64-openblas
+            mingw-w64-x86_64-lapack
 
       - name: fpm build
         run: |
@@ -81,47 +79,54 @@ jobs:
         run: |
           fpm test
 
-  intel-build:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-
-    env:
-      FPM_FC: ifort
-      FC: ifort
-
-    steps:
-    - name: Checkout code
-      uses: actions/checkout@v3
-
-    - name: Add Intel repository (Linux)
-      run: |
-        wget https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB
-        sudo apt-key add GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB
-        rm GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB
-        echo "deb https://apt.repos.intel.com/oneapi all main" | sudo tee /etc/apt/sources.list.d/oneAPI.list
-        sudo apt-get update
-
-    - name: Install Intel oneAPI compiler (Linux)
-      run: |
-        sudo apt-get install intel-oneapi-compiler-fortran
-
-    - name: Setup Intel oneAPI environment
-      run: |
-        source /opt/intel/oneapi/setvars.sh
-        printenv >> $GITHUB_ENV
-
-    - name: Install fpm
-      uses: fortran-lang/setup-fpm@v3
-      with:
-        fpm-version: 'v0.8.2'
-
-    - name: fpm build
-      run: |
-        ifort --version
-        fpm --version
-        fpm build --profile debug --flag "-warn nointerfaces"
-
-    - name: fpm test
-      run: |
-        fpm test --profile debug --flag "-warn nointerfaces"
+  # intel-build:
+  #   runs-on: ubuntu-latest
+  #   strategy:
+  #     fail-fast: false
+
+  #   env:
+  #     FPM_FC: ifx
+  #     FC: ifx
+
+  #   steps:
+  #   - name: Checkout code
+  #     uses: actions/checkout@v3
+
+  #   - name: Add Intel repository (Linux)
+  #     run: |
+  #       wget https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB
+  #       sudo apt-key add GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB
+  #       rm GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB
+  #       echo "deb https://apt.repos.intel.com/oneapi all main" | sudo tee /etc/apt/sources.list.d/oneAPI.list
+  #       sudo apt-get update
+
+  #   - name: Install Intel oneAPI compiler (Linux)
+  #     run: |
+  #       sudo apt-get install intel-oneapi-compiler-fortran
+
+  #   - name: Setup Intel oneAPI environment
+  #     run: |
+  #       source /opt/intel/oneapi/setvars.sh
+  #       printenv >> $GITHUB_ENV
+
+  #   - name: Install MKL
+  #     run: |
+  #       sudo apt-get update
+  #       sudo apt-get -y install intel-mkl
+  #       sudo apt update
+  #       sudo apt -y install intel-mkl
+
+  #   - name: Install fpm
+  #     uses: fortran-lang/setup-fpm@v3
+  #     with:
+  #       fpm-version: 'v0.8.2'
+
+  #   - name: fpm build
+  #     run: |
+  #       ifx --version
+  #       fpm --version
+  #       fpm build --profile debug --flag "-warn nointerfaces"
+
+  #   - name: fpm test
+  #     run: |
+  #       fpm test --profile debug --flag "-warn nointerfaces"

.github/workflows/fpm.yml

@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.24)
 project(
     fplot 
     LANGUAGES Fortran
-    VERSION 1.7.1
+    VERSION 1.7.2
 )
 
 # Get helper macros and functions