tests: minor fixes and flake8

devito/passes/clusters/__init__.py

@@ -5,3 +5,4 @@
 from .blocking import *  # noqa
 from .asynchrony import *  # noqa
 from .misc import *  # noqa
+from .temporal import * # noqa

devito/passes/clusters/blocking.py

@@ -6,7 +6,6 @@
 from devito.tools import timed_pass
 from devito.types import IncrDimension
 
-
 __all__ = ['Blocking']
 
 
@@ -65,6 +64,7 @@ def callback(self, clusters, prefix):
             return clusters
 
         d = prefix[-1].dim
+
         # Create the block Dimensions (in total `self.levels` Dimensions)
         name = self.template % (d.name, self.nblocked[d], '%d')
 
@@ -81,7 +81,6 @@ def callback(self, clusters, prefix):
 
         processed = []
         for c in clusters:
-
             if TILABLE in c.properties[d]:
                 ispace = decompose(c.ispace, d, block_dims)
 

examples/seismic/acoustic/acoustic_example.py

@@ -38,8 +38,6 @@ def run(shape=(50, 50, 50), spacing=(20.0, 20.0, 20.0), tn=1000.0,
     save = full_run and not checkpointing
     # Define receiver geometry (spread across x, just below surface)
     rec, u, summary = solver.forward(save=save, autotune=autotune)
-    print(norm(rec))
-    print(norm(u))
 
     if preset == 'constant':
         # With  a new m as Constant
@@ -48,11 +46,9 @@ def run(shape=(50, 50, 50), spacing=(20.0, 20.0, 20.0), tn=1000.0,
         # With a new vp as a scalar value
         solver.forward(save=save, vp=2.0)
 
-
     if not full_run:
         return summary.gflopss, summary.oi, summary.timings, [rec, u.data]
 
-
     # Smooth velocity
     initial_vp = Function(name='v0', grid=solver.model.grid, space_order=space_order)
     smooth(initial_vp, solver.model.vp)

tests/test_dse.py

@@ -230,8 +230,8 @@ def test_makeit_ssa(exprs, exp_u, exp_v):
     assert np.all(v.data == exp_v)
 
 
-@pytest.mark.parametrize('opt, expected', (['noop', 2], ['advanced', 2]))
-def test_time_dependent_split(opt, expected):
+@pytest.mark.parametrize('opt', ['noop', 'advanced'])
+def test_time_dependent_split(opt):
     grid = Grid(shape=(10, 10))
     u = TimeFunction(name='u', grid=grid, time_order=2, space_order=2, save=3)
     v = TimeFunction(name='v', grid=grid, time_order=2, space_order=0, save=3)
@@ -243,7 +243,8 @@ def test_time_dependent_split(opt, expected):
     op = Operator(eq, opt=opt)
 
     trees = retrieve_iteration_tree(op)
-    assert len(trees) == expected
+    assert len(trees) == 2
+
     op()
 
     assert np.allclose(u.data[2, :, :], 3.0)
@@ -494,7 +495,6 @@ def test_full_shape(self, rotate):
         # Check numerical output
         op0(time_M=1)
         op1(time_M=1, u=u1)
-
         assert np.all(u.data == u1.data)
 
     @pytest.mark.parametrize('rotate', [False, True])