Merge pull request #2412 from devitocodes/change-default-bs

compiler: Bump default block size

Author: FabioLuporini

devito/types/dimension.py

@@ -1307,10 +1307,8 @@ def _arg_names(self):
             return ()
 
     def _arg_defaults(self, **kwargs):
-        # TODO: need a heuristic to pick a default incr size
-        # TODO: move default value to __new__
         try:
-            return {self.step.name: 8}
+            return {self.step.name: 16}
         except AttributeError:
             # `step` not a Symbol
             return {}

tests/test_dse.py

@@ -2447,8 +2447,6 @@ def test_ftemps_option(self):
         t = grid.stepping_dim
 
         nthreads = 2
-        x0_blk0_size = 8
-        y0_blk0_size = 8
 
         u = TimeFunction(name='u', grid=grid, space_order=3)
         u1 = TimeFunction(name="u", grid=grid, space_order=3)
@@ -2475,6 +2473,12 @@ def test_ftemps_option(self):
         with pytest.raises(InvalidArgument):
             op1(time_M=1, u=u1)
 
+        block_dims = [i for i in op1.dimensions if i.is_Block and i._depth == 1]
+        assert len(block_dims) == 2
+        mapper = {d.root: d for d in block_dims}
+        x0_blk0_size = mapper[x]._arg_defaults()[mapper[x].step.name]
+        y0_blk0_size = mapper[y]._arg_defaults()[mapper[y].step.name]
+
         # Prepare to run op1
         shape = [nthreads, x0_blk0_size, y0_blk0_size, grid.shape[-1]]
         ofuncs = [i.make(shape) for i in op1.temporaries]
@@ -2845,7 +2849,7 @@ def test_fullopt(self):
 
         # Check expected opcount/oi
         assert summary[('section1', None)].ops == 92
-        assert np.isclose(summary[('section1', None)].oi, 2.072, atol=0.001)
+        assert np.isclose(summary[('section1', None)].oi, 1.99, atol=0.001)
 
         # With optimizations enabled, there should be exactly four BlockDimensions
         op = wavesolver.op_fwd()