testing: switch to numpy.testing for array and value checks in tests

Author: mloubout

benchmarks/user/benchmark.py

@@ -402,7 +402,7 @@ def test(problem, **kwargs):
             last_res = res
         else:
             for i in range(len(res)):
-                assert np.isclose(res[i], last_res[i])
+                np.testing.assert_allclose(res[i], last_res[i])
 
 
 if __name__ == "__main__":

examples/cfd/01_convection.ipynb

@@ -322,7 +322,7 @@
     "\n",
     "# Some small sanity checks for the testing framework\n",
     "assert (u.data[0, 45:55, 45:55] > 1.8).all()\n",
-    "assert np.allclose(u.data[0], u_ref, rtol=3.e-2)"
+    "np.testing.assert_allclose(u.data[0], u_ref, rtol=3.e-2)"
    ]
   },
   {
@@ -390,7 +390,7 @@
     "\n",
     "# Some small sanity checks for the testing framework\n",
     "assert (u.data[0, 45:55, 45:55] > 1.8).all()\n",
-    "assert np.allclose(u.data[0], u_ref, rtol=3.e-2)"
+    "np.testing.assert_allclose(u.data[0], u_ref, rtol=3.e-2)"
    ]
   },
   {

examples/cfd/01_convection_revisited.ipynb

@@ -305,7 +305,7 @@
     "\n",
     "# Some small sanity checks for the testing framework\n",
     "assert (u.data[0, 45:55, 45:55] > 1.8).all()\n",
-    "assert np.allclose(u.data[0], u_ref, rtol=3.e-2)"
+    "np.testing.assert_allclose(u.data[0], u_ref, rtol=3.e-2)"
    ]
   },
   {
@@ -366,7 +366,7 @@
     "\n",
     "# Some small sanity checks for the testing framework\n",
     "assert (u.data[0, 45:55, 45:55] > 1.8).all()\n",
-    "assert np.allclose(u.data[0], u_ref, rtol=3.e-2)"
+    "np.testing.assert_allclose(u.data[0], u_ref, rtol=3.e-2)"
    ]
   },
   {

examples/cfd/02_convection_nonlinear.ipynb

@@ -467,7 +467,7 @@
    "outputs": [],
    "source": [
     "from devito import norm\n",
-    "assert np.isclose(norm(u), norm(U[0]), rtol=1e-2, atol=0)"
+    "np.testing.assert_allclose(norm(u), norm(U[0]), rtol=1e-2, atol=0)"
    ]
   }
  ],

examples/cfd/09_Darcy_flow_equation.ipynb

@@ -419,9 +419,9 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "assert np.isclose(LA.norm(output1), 1.0335084, atol=1e-3, rtol=0)\n",
-    "assert np.isclose(LA.norm(output2), 1.3038709, atol=1e-3, rtol=0)\n",
-    "assert np.isclose(LA.norm(output3), 1.3940924, atol=1e-3, rtol=0)"
+    "np.testing.assert_allclose(LA.norm(output1), 1.0335084, atol=1e-3, rtol=0)\n",
+    "np.testing.assert_allclose(LA.norm(output2), 1.3038709, atol=1e-3, rtol=0)\n",
+    "np.testing.assert_allclose(LA.norm(output3), 1.3940924, atol=1e-3, rtol=0)"
    ]
   },
   {

examples/seismic/abc_methods/01_introduction.ipynb

@@ -1103,7 +1103,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "assert np.isclose(np.linalg.norm(rec.data), 990, rtol=1)"
+    "np.testing.assert_allclose(np.linalg.norm(rec.data), 990, rtol=1)"
    ]
   },
   {

examples/seismic/abc_methods/02_damping.ipynb

@@ -1232,7 +1232,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "assert np.isclose(np.linalg.norm(rec.data), 990, rtol=1)"
+    "np.testing.assert_allclose(np.linalg.norm(rec.data), 990, rtol=1)"
    ]
   },
   {

examples/seismic/abc_methods/03_pml.ipynb

@@ -1410,7 +1410,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "assert np.isclose(np.linalg.norm(rec.data), 990, rtol=1)"
+    "np.testing.assert_allclose(np.linalg.norm(rec.data), 990, rtol=1)"
    ]
   },
   {

examples/seismic/abc_methods/04_habc.ipynb

@@ -1641,7 +1641,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "assert np.isclose(np.linalg.norm(rec.data), 990, rtol=1)"
+    "np.testing.assert_allclose(np.linalg.norm(rec.data), 990, rtol=1)"
    ]
   },
   {

examples/seismic/acoustic/accuracy.ipynb

@@ -552,7 +552,7 @@
     "# NBVAL_IGNORE_OUTPUT\n",
     "pf = np.polyfit(np.log([t for t in dt]), np.log(error_time), deg=1)\n",
     "print(f\"Convergence rate in time is: {pf[0]:.4f}\")\n",
-    "assert np.isclose(pf[0], 1.9, atol=0, rtol=.1)"
+    "np.testing.assert_allclose(pf[0], 1.9, atol=0, rtol=.1)"
    ]
   },
   {
@@ -742,7 +742,7 @@
     "        pf = np.polyfit(np.log([sc for sc in dx][1:]), np.log(errorl2[i, 1:]), deg=1)[0]\n",
     "    print(f\"Convergence rate for order {orders[i]} is {pf}\")\n",
     "    if i < 4:\n",
-    "        assert np.isclose(pf, orders[i], atol=0, rtol=.2)"
+    "        np.testing.assert_allclose(pf, orders[i], atol=0, rtol=.2)"
    ]
   }
  ],