fix: adapted tests for scipy v1.14

Author: mrava87

environment-dev-arm.yml

@@ -8,7 +8,7 @@ dependencies:
   - python>=3.6.4
   - pip
   - numpy>=1.21.0,<2.0.0
-  - scipy>=1.4.0,<=1.13.0
+  - scipy>=1.14.0
   - pytorch>=1.2.0
   - cpuonly
   - pyfftw

environment-dev.yml

@@ -8,7 +8,7 @@ dependencies:
   - python>=3.6.4
   - pip
   - numpy>=1.21.0,<2.0.0
-  - scipy>=1.4.0,<=1.13.0
+  - scipy>=1.14.0
   - pytorch>=1.2.0
   - cpuonly
   - pyfftw

environment.yml

@@ -4,4 +4,4 @@ channels:
 dependencies:
   - python>=3.6.4
   - numpy>=1.21.0,<2.0.0
-  - scipy>=1.4.0,<=1.13.0
+  - scipy>=1.14.0

pyproject.toml

@@ -31,7 +31,7 @@ classifiers = [
 ]
 dependencies = [
     "numpy >= 1.21.0 , < 2.0.0",
-    "scipy >= 1.4.0 , <= 1.13.0",
+    "scipy >= 1.14.0",
 ]
 dynamic = ["version"]
 

pytests/test_solver.py

@@ -86,7 +86,7 @@ def test_cg(par):
         x0 = None
 
     y = Aop * x
-    xinv = cg(Aop, y, x0=x0, niter=par["nx"], tol=1e-5, show=True)[0]
+    xinv = cg(Aop, y, x0=x0, niter=par["nx"], atol=1e-5, show=True)[0]
     assert_array_almost_equal(x, xinv, decimal=4)
 
 
@@ -114,7 +114,7 @@ def test_cg_ndarray(par):
         x0 = None
 
     y = Aop * x
-    xinv = cg(Aop, y, x0=x0, niter=2 * x.size, tol=1e-5, show=True)[0]
+    xinv = cg(Aop, y, x0=x0, niter=2 * x.size, atol=1e-5, show=True)[0]
     assert xinv.shape == x.shape
     assert_array_almost_equal(x, xinv, decimal=4)
 
@@ -143,7 +143,7 @@ def test_cg_forceflat(par):
         x0 = None
 
     y = Aop * x
-    xinv = cg(Aop, y, x0=x0, niter=2 * x.size, tol=1e-5, show=True)[0]
+    xinv = cg(Aop, y, x0=x0, niter=2 * x.size, atol=1e-5, show=True)[0]
     assert xinv.shape == x.ravel().shape
     assert_array_almost_equal(x.ravel(), xinv, decimal=4)
 
@@ -169,7 +169,7 @@ def test_cgls(par):
         x0 = None
 
     y = Aop * x
-    xinv = cgls(Aop, y, x0=x0, niter=par["nx"], tol=1e-5, show=True)[0]
+    xinv = cgls(Aop, y, x0=x0, niter=par["nx"], atol=1e-5, show=True)[0]
     assert_array_almost_equal(x, xinv, decimal=4)
 
 

requirements-dev.txt

@@ -1,5 +1,5 @@
 numpy>=1.21.0,<2.0.0
-scipy>=1.4.0,<=1.13.0
+scipy>=1.14.0
 --extra-index-url https://download.pytorch.org/whl/cpu
 torch>=1.2.0
 numba