compiler: add padded_dimensions property

Author: mloubout

devito/passes/clusters/buffering.py

@@ -376,8 +376,7 @@ def generate_buffers(clusters, key, sregistry, options, **kwargs):
             assert len(buffers) == 1, "Unexpected form of multi-level buffering"
             buffer, = buffers
             xd = buffer.indices[dim]
-            # The new buffer is fed by `buffer`, so it inherits its padding
-            # policy regardless of `f`'s
+            # The new buffer is derived from `buffer`, so it inherits its padding policy
             extra_kwargs = {'is_autopaddable': buffer.is_autopaddable}
         else:
             size = infer_buffer_size(f, dim, clusters)

devito/passes/iet/linearization.py

@@ -70,7 +70,7 @@ def key1(f, d):
     if f.is_regular:
         # For paddable objects the following holds:
         # `same dim + same halo + same padding_dtype => same (auto-)padding`
-        pad_key = f.__padding_dtype__ if d is f.dimensions[-1] else None
+        pad_key = f.__padding_dtype__ if d in f._padded_dimensions else None
 
         return (d, f._size_halo[d], pad_key)
     else:

devito/types/basic.py

@@ -907,36 +907,26 @@ def __padding_dtype__(self):
             return np.float32
 
     def __padding_setup_smart__(self, **kwargs):
-        nopadding = ((0, 0),)*self.ndim
-
-        if not self.__padding_dtype__:
-            return nopadding
-
-        # The padded Dimension
-        if not self.space_dimensions:
-            return nopadding
-        d = self.space_dimensions[-1]
+        padding = [(0, 0)]*self.ndim
 
-        # Last space Dimension is not the most inner Dimension
-        if d != self.dimensions[-1]:
-            return nopadding
+        if not self.__padding_dtype__ or not self._padded_dimensions:
+            return tuple(padding)
 
         mmts = configuration['platform'].max_mem_trans_size(self.__padding_dtype__)
 
-        snp = self._size_nopad[d]
-        remainder = snp % mmts
-        if remainder == 0:
-            # Already a multiple of `mmts`, no need to pad
-            return nopadding
-        else:
+        for d in self._padded_dimensions:
+            snp = self._size_nopad[d]
+            remainder = snp % mmts
+            if remainder == 0:
+                # Already a multiple of `mmts`, no need to pad
+                continue
+
             from devito.symbolics import RoundUp  # noqa
             v = RoundUp(snp, mmts) - snp
             if v.is_Integer:
                 v = int(v)
 
-        dpadding = (0, v)
-        padding = [(0, 0)]*self.ndim
-        padding[self.dimensions.index(d)] = dpadding
+            padding[self.dimensions.index(d)] = (0, v)
 
         return tuple(padding)
 
@@ -987,6 +977,18 @@ def dimensions(self):
         """Tuple of Dimensions representing the object indices."""
         return DimensionTuple(*self._dimensions, getters=self._dimensions)
 
+    @property
+    def _padded_dimensions(self):
+        try:
+            d = self.space_dimensions[-1]
+        except IndexError:
+            return ()
+
+        if d is self.dimensions[-1]:
+            return (d,)
+        else:
+            return ()
+
     @cached_property
     def space_dimensions(self):
         """Tuple of Dimensions defining the physical space."""