Merge branch 'main' into mumps

Author: jcapriot

.github/workflows/python-package-conda.yml

@@ -20,11 +20,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, macOS-13, windows-latest]
-        python-version: [3.9, "3.10", "3.11", "3.12"]
+        # NOTE: macOS-13 is the last Intel runner.
+        # When we move past that version we'll need to deal with Apple Silicon, likely using MUMPS.
+        os: [ubuntu-latest, windows-latest, macOS-13]
+        python-version: [3.8, 3.9, "3.10", "3.11", "3.12"]
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Setup Conda
       uses: conda-incubator/setup-miniconda@v3
       with:
@@ -56,7 +58,7 @@ jobs:
 
     - name: Upload coverage
       if: ${{ matrix.os == 'ubuntu-latest' }} and {{ matrix.python-version == '3.11' }}
-      uses: codecov/codecov-action@v2
+      uses: codecov/codecov-action@v4
       with:
         verbose: true # optional (default = false)
 
@@ -70,9 +72,9 @@ jobs:
         shell: bash -l {0}
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Setup Conda
-      uses: conda-incubator/setup-miniconda@v2
+      uses: conda-incubator/setup-miniconda@v3
       with:
         auto-update-conda: true
         activate-environment: dev

README.rst

@@ -9,10 +9,6 @@ pymatsolver
     :target: https://github.com/simpeg/pymatsolver/blob/master/LICENSE
     :alt: MIT license.
 
-.. image:: https://img.shields.io/travis/rowanc1/pymatsolver.svg
-    :target: https://travis-ci.org/simpeg/pymatsolver
-    :alt: Travis CI build status
-
 .. image:: https://codecov.io/gh/simpeg/pymatsolver/branch/master/graph/badge.svg
     :target: https://codecov.io/gh/simpeg/pymatsolver
     :alt: Coverage status

pymatsolver/iterative.py

@@ -1,19 +1,16 @@
 import numpy as np
+import scipy
 import scipy.sparse as sp
-from scipy.sparse.linalg import bicgstab, cg
-from .solvers import Base
+from scipy.sparse.linalg import bicgstab, cg, aslinearoperator
 from .wrappers import WrapIterative
 
+# The tol kwarg was removed from bicgstab in scipy 1.14.0.
+# See https://docs.scipy.org/doc/scipy-1.12.0/reference/generated/scipy.sparse.linalg.bicgstab.html
+RTOL_ARG_NAME = "rtol" if Version(scipy.__version__) >= Version("1.14.0") else "tol"
 
 SolverCG = WrapIterative(cg, name="SolverCG")
 SolverBiCG = WrapIterative(bicgstab, name="SolverBiCG")
 
-import scipy
-_rtol_call = False
-scipy_major, scipy_minor, scipy_patch = scipy.__version__.split(".")
-if int(scipy_major) >= 1 and int(scipy_minor) >= 12:
-    _rtol_call = True
-
 class BiCGJacobi(Base):
     """Bicg Solver with Jacobi preconditioner"""
 
@@ -34,15 +31,12 @@ def factor(self):
             return
         nSize = self.A.shape[0]
         Ainv = sp.spdiags(1./self.A.diagonal(), 0, nSize, nSize)
-        self.M = sp.linalg.interface.aslinearoperator(Ainv)
+        self.M = aslinearoperator(Ainv)
         self._factored = True
 
     @property
     def _tols(self):
-        if _rtol_call:
-            return {'rtol': self.rtol, 'atol': self.atol}
-        else:
-            return {'tol': self.rtol, 'atol': self.atol}
+        return {RTOL_ARG_NAME: self.rtol, 'atol': self.atol}
 
 
     def _solve1(self, rhs):
@@ -60,8 +54,7 @@ def _solveM(self, rhs):
         sol = []
         for icol in range(rhs.shape[1]):
             sol.append(self.solver(self.A, rhs[:, icol].flatten(),
-                       maxiter=self.maxiter, M=self.M,
-            **self._tols,)[0])
+                       maxiter=self.maxiter, M=self.M, **self._tols,)[0])
         out = np.hstack(sol)
         out.shape
         return out

requirements_docs.txt

@@ -1,3 +1,7 @@
 sphinx
 numpydoc
+
+# Restrict pydata-sphinx-theme on older versions of Python on Windows.
+# Otherwise we get doc build failures.
+pydata-sphinx-theme~=0.14.4,<0.15 ; python_version <= '3.9' and platform_system == "Windows"
 pydata-sphinx-theme

setup.py

@@ -32,7 +32,7 @@
     packages=find_packages(exclude=["tests"]),
     install_requires=[
         'numpy>=1.7',
-        'scipy>=0.13',
+        'scipy>=1.8',
     ],
     author="SimPEG Developers",
     author_email="[email protected]",