Merge pull request #23 from jchristopherson/v1.8.3

V1.8.3

.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/linalg' && ( startsWith( github.ref, 'refs/tags/' ) || github.ref == 'refs/heads/master' )
+      with:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        BRANCH: gh-pages
+        FOLDER: doc
+        CLEAN: true

.github/workflows/fpm.yml

@@ -9,7 +9,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        gcc_v: [10] # Version of GFortran we want to use.
+        gcc_v: [12] # Version of GFortran we want to use.
         include:
         - os: ubuntu-latest
           os-arch: linux-x86_64
@@ -29,6 +29,12 @@ jobs:
         --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@v5
       with:
@@ -79,8 +85,8 @@ jobs:
       fail-fast: false
 
     env:
-      FPM_FC: ifort
-      FC: ifort
+      FPM_FC: ifx
+      FC: ifx
 
     steps:
     - name: Checkout code
@@ -103,14 +109,21 @@ jobs:
         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: |
-        ifort --version
+        ifx --version
         fpm --version
         fpm build --profile debug --flag "-warn nointerfaces"
 

CMakeLists.txt

@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.24)
 project(
   linalg
   LANGUAGES Fortran C
-  VERSION 1.8.2
+  VERSION 1.8.3
 )
 
 # Get helper macros and functions
@@ -20,6 +20,18 @@ find_package(BLAS)
 find_package(LAPACK)
 add_subdirectory(dependencies)
 
+if (NOT BLAS_FOUND OR NOT LAPACK_FOUND)
+  message(STATUS "BLAS/LAPACK could not be found.  A reference version will be employed.")
+  include(FetchContent)
+  FetchContent_Declare(
+      lapack
+      GIT_REPOSITORY "https://github.com/Reference-LAPACK/lapack"
+  )
+  FetchContent_MakeAvailable(lapack)
+  set(BLAS_LIBRARIES blas)
+  set(LAPACK_LIBRARIES lapack)
+endif()
+
 # Source
 add_subdirectory(src)
 add_fortran_library(

dependencies/CMakeLists.txt

@@ -1,7 +1,3 @@
-# Get the macros and functions we'll need
-include("${PROJECT_SOURCE_DIR}/cmake/helper.cmake")
-include(FetchContent)
-
 # Get FERROR
 add_subdirectory(ferror)
 set(ferror_LIBRARY ${ferror_LIBRARY} PARENT_SCOPE)