check if rtol is available for python 3.8/scipy 1.8.0

pyamg/krylov/tests/test_scipy.py

@@ -1,4 +1,5 @@
 """Test scipy methods."""
+import inspect
 from functools import partial
 
 import numpy as np
@@ -37,20 +38,24 @@ def cb(x, normb):
             x0 = case['x0']
             tol = case['tol']
 
+            kwargs = dict(tol=tol, restart=3, maxiter=2)
+
             mgsres = []
-            _ = gmres_mgs(A, b, x0, residuals=mgsres,
-                          tol=tol, restart=3, maxiter=2)
+            _ = gmres_mgs(A, b, x0, residuals=mgsres, **kwargs)
 
             hhres = []
-            _ = gmres_householder(A, b, x0, residuals=hhres,
-                                  tol=tol, restart=3, maxiter=2)
+            _ = gmres_householder(A, b, x0, residuals=hhres, **kwargs)
 
             scipyres = []
             normb = np.linalg.norm(b)
             callback = partial(cb, normb=normb)
 
-            _ = sla.gmres(A, b, x0, callback=callback, callback_type='pr_norm',
-                          rtol=tol, atol=0, restart=3, maxiter=2)
+            # check if scipy gmres has rtol
+            kwargs['atol'] = 0
+            if 'rtol' in inspect.getfullargspec(sla.gmres).args:
+                kwargs['rtol'] = kwargs.pop(tol)
+
+            _ = sla.gmres(A, b, x0, callback=callback, callback_type='pr_norm', **kwargs)
 
             assert_array_almost_equal(mgsres[1:], scipyres)
             assert_array_almost_equal(hhres[1:], scipyres)

pyamg/multilevel.py

@@ -1,4 +1,5 @@
 """Generic AMG solver."""
+import inspect
 
 from warnings import warn
 
@@ -483,8 +484,14 @@ def callback_wrapper(x):
                             callback(x)
                 else:
                     callback_wrapper = callback
-
-                x, info = accel(A, b, x0=x0, rtol=tol, maxiter=maxiter, M=M,
+
+                # for scipy solvers, see if rtol is available
+                kwargs['tol'] = tol
+                kwargs['atol'] = 0
+                if 'rtol' in inspect.getfullargspec(accel).args:
+                    kwargs['rtol'] = kwargs.pop(tol)
+
+                x, info = accel(A, b, x0=x0, maxiter=maxiter, M=M,
                                 callback=callback_wrapper, **kwargs)
                 if return_info:
                     return x, info

pyamg/tests/test_multilevel.py

@@ -1,4 +1,6 @@
 """Test MultilevelSolver class."""
+import inspect
+
 import numpy as np
 from numpy.testing import TestCase, assert_almost_equal, assert_equal
 from scipy import sparse
@@ -53,9 +55,13 @@ def test_aspreconditioner(self):
 
         ml = smoothed_aggregation_solver(A)
 
+        kwargs = dict(tol=1e-8, maxiter=30, atol=0)
+        if 'rtol' in inspect.getfullargspec(cg).args:
+            kwargs['rtol'] = kwargs.pop('tol')
+
         for cycle in ['V', 'W', 'F']:
             M = ml.aspreconditioner(cycle=cycle)
-            x, info = cg(A, b, rtol=1e-8, maxiter=30, M=M)
+            x, info = cg(A, b, M=M, **kwargs)
             # cg satisfies convergence in the preconditioner norm
             assert precon_norm(b - A*x, ml) < 1e-8*precon_norm(b, ml)
 

pyamg/util/tests/test_utils.py

@@ -169,12 +169,12 @@ def test_profile_solver(self):
 
         opts = []
         opts.append({})
-        opts.append({'accel': cg, 'atol': 0})
 
         # does cg have rtol?
-        opts.append({'accel': cg, 'tol': 1e-10, 'atol': 0})
+        nextopt = dict(accel=cg, tol=1e-10, atol=0)
         if 'rtol' in inspect.getfullargspec(cg).args:
-            opts.append({'accel': cg, 'rtol': 1e-10, 'atol': 0})
+            nextopt['rtol'] = nextopt.pop('tol')
+        opts.append(nextopt)
 
         for kwargs in opts:
             residuals = profile_solver(ml, **kwargs)
@@ -1200,12 +1200,12 @@ def test_profile_solver(self):
 
         opts = []
         opts.append({})
-        opts.append({'accel': cg, 'atol': 0})
 
         # does cg have rtol?
-        opts.append({'accel': cg, 'tol': 1e-10, 'atol': 0})
+        nextopt = dict(accel=cg, tol=1e-10, atol=0)
         if 'rtol' in inspect.getfullargspec(cg).args:
-            opts.append({'accel': cg, 'rtol': 1e-10, 'atol': 0})
+            nextopt['rtol'] = nextopt.pop('tol')
+        opts.append(nextopt)
 
         for kwargs in opts:
             residuals = profile_solver(ml, **kwargs)