Clean up

jchristopherson · Jan 22, 2025 · 24d56d1 · 24d56d1
1 parent c534f2c
commit 24d56d1
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 15 deletions.
diff --git a/.github/workflows/fpm.yml b/.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
@@ -22,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 the library
+    - name: Build LINALG
       run: |
         gfortran --version
         fpm build
@@ -86,8 +85,8 @@ jobs:
       fail-fast: false
 
     env:
-      FPM_FC: ifort
-      FC: ifort
+      FPM_FC: ifx
+      FC: ifx
 
     steps:
     - name: Checkout code
@@ -110,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"
 

diff --git a/src/nonlin_constants.f90 b/src/nonlin_constants.f90
@@ -6,7 +6,8 @@
 !! To provide various constants used by the NONLIN library.
 module nonlin_constants
     use, intrinsic :: iso_fortran_env, only : int32
-    use linalg
+    use linalg_errors, only : LA_OUT_OF_MEMORY_ERROR, LA_CONVERGENCE_ERROR, &
+        LA_INVALID_OPERATION_ERROR
     implicit none
 
 ! ******************************************************************************