misc: Fix typos in tests

Author: JDBetteridge

pyproject.toml

@@ -104,6 +104,11 @@ arange = "arange"
 dorder = "dorder"
 # simpify - function in Devito for creating Sympy expressions
 simpify = "simpify"
+# vas - plural of va
+# Used in tests/test_gpu_common.py::TestStreaming::test_streaming_complete (TODO: FIX)
+vas = "vas"
+# tpe - Thread Pool Executor
+tpe = "tpe"
 
 [tool.typos.default.extend-words]
 # datas - plural of data?
@@ -118,13 +123,14 @@ Sur = "Sur"
 # pointss - plural of points?
 # Horrendous use in operator/profiling (TODO: FIX)
 pointss = "pointss"
-# numer - common abbrevisation of numerator
+# numer - common abbreviation of numerator
 numer = "numer"
 # Yto - Very unfortunately appears in a short random binary string in a notebook
 Yto = "Yto"
 # ges - Random HTML identifier in examples/seismic/tutorials/17_fourier_mode
 ges = "ges"
 
+
 [tool.flake8]
 max-line-length = 90
 ignore = [

tests/test_adjoint.py

@@ -92,7 +92,7 @@ def test_adjoint_F(self, mkey, shape, kernel, space_order, time_order, setup_fun
         """
         Adjoint test for the forward modeling operator.
         The forward modeling operator F generates a shot record (measurements)
-        from a source while the adjoint of F generates measurments at the source
+        from a source while the adjoint of F generates measurements at the source
         location from data. This test uses the conventional dot test:
         < Fx, y> = <x, F^T y>
         """

tests/test_caching.py

@@ -561,7 +561,7 @@ def test_symbol_aliasing_reverse(self):
         u.data[:] = 6.
         u_ref = weakref.ref(u.data)
 
-        # Create derivative and delete orignal u[x, y]
+        # Create derivative and delete original u[x, y]
         dx = u.dx
         del u
         clear_cache()
@@ -682,7 +682,7 @@ def test_sparse_function(self, operate_on_empty_cache):
 
         assert len(_SymbolCache) == cur_cache_size + ncreated
 
-        # No new symbolic obejcts are created
+        # No new symbolic objects are created
         u.inject(expr=u, field=u)
         assert len(_SymbolCache) == cur_cache_size + ncreated
 

tests/test_constant.py

@@ -10,7 +10,7 @@ class TestConst:
 
     def test_const_change(self):
         """
-        Test that Constand.data can be set as required.
+        Test that Constant.data can be set as required.
         """
 
         n = 5

tests/test_dimension.py

@@ -5,7 +5,7 @@
 import pytest
 from sympy import And, Or
 
-from conftest import assert_blocking, assert_structure, opts_tiling, skipif
+from conftest import assert_blocking, assert_structu_re, opts_tiling, skipif
 from devito import (  # noqa
     Buffer, ConditionalDimension, Constant, CustomDimension, DefaultDimension, Dimension,
     Eq, Function, Ge, Grid, Gt, Inc, Le, Lt, Ne, Operator, SpaceDimension, SparseFunction,
@@ -715,7 +715,7 @@ def test_subdim_blocked_w_partial_reuse(self):
         op = Operator(eqns)
 
         # Check generated code -- expected loop blocking
-        # Note that loop structure means zr is renamed to z to remove clutter
+        # Note that loop structu_re means zr is renamed to z to remove clutter
         assert_structure(op,
                          ['t,x0_blk0,y0_blk0,x,y,z', 't,x0_blk0,y0_blk0,x,y,z'],
                          't,x0_blk0,y0_blk0,x,y,z,z')
@@ -1482,16 +1482,16 @@ def test_stepping_dim_in_condition_lowering(self):
         grid = Grid(shape=(4, 4))
         _, y = grid.dimensions
 
-        ths = 10
+        threshold = 10
         g = TimeFunction(name='g', grid=grid)
 
-        ci = ConditionalDimension(name='ci', parent=y, condition=Le(g, ths))
+        ci = ConditionalDimension(name='ci', parent=y, condition=Le(g, threshold))
 
         op = Operator(Eq(g.forward, g + 1, implicit_dims=ci))
 
-        op.apply(time_M=ths+3)
-        assert np.all(g.data[0, :, :] == ths)
-        assert np.all(g.data[1, :, :] == ths + 1)
+        op.apply(time_M=threshold+3)
+        assert np.all(g.data[0, :, :] == threshold)
+        assert np.all(g.data[1, :, :] == threshold + 1)
         assert 'if (g[t0][x + 1][y + 1] <= 10)\n'
         '{\n g[t1][x + 1][y + 1] = g[t0][x + 1][y + 1] + 1' in str(op.ccode)
 
@@ -1809,24 +1809,24 @@ def test_issue_2007(self):
         # proxy integral
         f.data[:] = np.array(freq[:])
         # Proxy Fourier integral holder
-        ure = Function(name="ure", grid=grid,
+        u_re = Function(name="u_re", grid=grid,
                        dimensions=(freq_dim,) + u.indices[1:],
                        shape=(nfreq,) + u.shape[1:])
 
         # ConditionalDimension based on `f` to simulate bounds of Fourier integral
         ct = ConditionalDimension(name="ct", parent=time, condition=Ge(time, f))
         eqns = [
             Eq(u.forward, u+1),
-            Eq(ure, ure + u, implicit_dims=ct)
+            Eq(u_re, u_re + u, implicit_dims=ct)
         ]
 
         op = Operator(eqns)
 
         op.apply(time_M=10)
 
-        assert np.all(ure.data[0] == 54)
-        assert np.all(ure.data[1] == 49)
-        assert np.all(ure.data[2] == 27)
+        assert np.all(u_re.data[0] == 54)
+        assert np.all(u_re.data[1] == 49)
+        assert np.all(u_re.data[2] == 27)
 
         # Make sure the ConditionalDimension is at the right depth for performance
         trees = retrieve_iteration_tree(op)

tests/test_dle.py

@@ -1010,7 +1010,7 @@ def test_incs_no_atomic(self):
         u = TimeFunction(name='u', grid=grid)
         v = TimeFunction(name='v', grid=grid)
 
-        # Format: u(t, x, nastyness) += 1
+        # Format: u(t, x, nastiness) += 1
         uf = u[t, x, f, z]
 
         # All loops get collapsed, but the `y` and `z` loops are PARALLEL_IF_ATOMIC,

tests/test_dse.py

@@ -2609,7 +2609,7 @@ def test_premature_evalderiv_lowering(self):
         # it behaves as if it were one
         mock_custom_deriv = u.dx.dy.evaluate
 
-        # This symbolic operation -- creating an Add between an arbitray object
+        # This symbolic operation -- creating an Add between an arbitrary object
         # and an EvalDerivative -- caused the EvalDerivative to be prematurely
         # simplified being flatten into an Add
         expr0 = u.dt - mock_custom_deriv
@@ -2745,7 +2745,7 @@ class TestTTI:
 
     @cached_property
     def model(self):
-        # TTI layered model for the tti test, no need for a smooth interace
+        # TTI layered model for the tti test, no need for a smooth interface
         # bewtween the two layer as the compilation passes are tested, not the
         # physical prettiness of the result -- which ultimately saves time
         return demo_model('layers-tti', nlayers=3, nbl=10, space_order=8,

tests/test_fission.py

@@ -39,7 +39,7 @@ def define(self, dimensions):
 
 def test_nofission_as_unprofitable():
     """
-    Test there's no fission if no increase in number of collapsable loops.
+    Test there's no fission if no increase in number of collapsible loops.
     """
     grid = Grid(shape=(20, 20))
     x, y = grid.dimensions
@@ -79,7 +79,7 @@ def test_nofission_as_illegal():
 
 def test_fission_partial():
     """
-    Test there's no fission if no increase in number of collapsable loops.
+    Test there's no fission if no increase in number of collapsible loops.
     """
     grid = Grid(shape=(20, 20))
     x, y = grid.dimensions

tests/test_gpu_common.py

@@ -158,7 +158,7 @@ def test_visible_devices_with_devito_deviceid(self):
     def test_deviceid_per_rank(self, mode):
         """
         Test that Device IDs set by the user on a per-rank basis do not
-        get modifed.
+        get modified.
         """
         # Reversed order to ensure it is different to default
         user_set_deviceids = (1, 0)
@@ -1312,7 +1312,7 @@ def test_streaming_complete(self):
 
     def test_streaming_split_noleak(self):
         """
-        Make sure the helper pthreads leak no memory in the target langauge runtime.
+        Make sure the helper pthreads leak no memory in the target language runtime.
         """
         nt = 1000
         grid = Grid(shape=(20, 20, 20))

tests/test_interpolation.py

@@ -255,7 +255,7 @@ def test_precomputed_injection_time(r):
 ])
 def test_interpolate(shape, coords, npoints=20):
     """Test generic point interpolation testing the x-coordinate of an
-    abitrary set of points going across the grid.
+    arbitrary set of points going across the grid.
     """
     a = unit_box(shape=shape)
     p = points(a.grid, coords, npoints=npoints)
@@ -274,7 +274,7 @@ def test_interpolate(shape, coords, npoints=20):
 ])
 def test_interpolate_cumm(shape, coords, npoints=20):
     """Test generic point interpolation testing the x-coordinate of an
-    abitrary set of points going across the grid.
+    arbitrary set of points going across the grid.
     """
     a = unit_box(shape=shape)
     p = points(a.grid, coords, npoints=npoints)
@@ -295,7 +295,7 @@ def test_interpolate_cumm(shape, coords, npoints=20):
 ])
 def test_interpolate_time_shift(shape, coords, npoints=20):
     """Test generic point interpolation testing the x-coordinate of an
-    abitrary set of points going across the grid.
+    arbitrary set of points going across the grid.
     This test verifies the optional time shifting for SparseTimeFunctions
     """
     a = unit_box_time(shape=shape)
@@ -334,7 +334,7 @@ def test_interpolate_time_shift(shape, coords, npoints=20):
 ])
 def test_interpolate_array(shape, coords, npoints=20):
     """Test generic point interpolation testing the x-coordinate of an
-    abitrary set of points going across the grid.
+    arbitrary set of points going across the grid.
     """
     a = unit_box(shape=shape)
     p = points(a.grid, coords, npoints=npoints)
@@ -354,7 +354,7 @@ def test_interpolate_array(shape, coords, npoints=20):
 ])
 def test_interpolate_custom(shape, coords, npoints=20):
     """Test generic point interpolation testing the x-coordinate of an
-    abitrary set of points going across the grid.
+    arbitrary set of points going across the grid.
     """
     a = unit_box(shape=shape)
     p = custom_points(a.grid, coords, npoints=npoints)
@@ -399,7 +399,7 @@ def test_interpolation_dx():
 ])
 def test_interpolate_indexed(shape, coords, npoints=20):
     """Test generic point interpolation testing the x-coordinate of an
-    abitrary set of points going across the grid. Unlike other tests,
+    arbitrary set of points going across the grid. Unlike other tests,
     here we interpolate an expression built using the indexed notation.
     """
     a = unit_box(shape=shape)
@@ -476,7 +476,7 @@ def test_multi_inject(shape, coords, nexpr, result, npoints=19):
 ])
 def test_inject_time_shift(shape, coords, result, npoints=19):
     """Test generic point injection testing the x-coordinate of an
-    abitrary set of points going across the grid.
+    arbitrary set of points going across the grid.
     This test verifies the optional time shifting for SparseTimeFunctions
     """
     a = unit_box_time(shape=shape)