compiler: Factor out Size namedtuple

Author: FabioLuporini

devito/passes/clusters/aliases.py

@@ -19,7 +19,7 @@
                           is_integer, generator, split, timed_pass)
 from devito.types import (Eq, Symbol, Temp, TempArray, TempFunction,
                           ModuloDimension, CustomDimension, IncrDimension,
-                          StencilDimension, Indexed, Hyperplane)
+                          StencilDimension, Indexed, Hyperplane, Size)
 from devito.types.grid import MultiSubDimension
 
 __all__ = ['cire']
@@ -1058,9 +1058,6 @@ def pick_best(variants):
 # Utilities
 
 
-Size = namedtuple('Size', 'left right')
-
-
 class Group(tuple):
 
     """

devito/types/basic.py

@@ -1,6 +1,5 @@
 import abc
 import inspect
-from collections import namedtuple
 from ctypes import POINTER, _Pointer, c_char_p, c_char, Structure
 from functools import reduce, cached_property
 from operator import mul
@@ -18,16 +17,12 @@
 from devito.types.args import ArgProvider
 from devito.types.caching import Cached, Uncached
 from devito.types.lazy import Evaluable
-from devito.types.utils import DimensionTuple
+from devito.types.utils import DimensionTuple, Offset, Size
 
 __all__ = ['Symbol', 'Scalar', 'Indexed', 'IndexedData', 'DeviceMap',
            'IrregularFunctionInterface']
 
 
-Size = namedtuple('Size', 'left right')
-Offset = namedtuple('Offset', 'left right')
-
-
 class CodeSymbol:
 
     """

devito/types/dense.py

@@ -25,8 +25,10 @@
 from devito.types.dimension import Dimension
 from devito.types.args import ArgProvider
 from devito.types.caching import CacheManager
-from devito.types.basic import AbstractFunction, Size
-from devito.types.utils import Buffer, DimensionTuple, NODE, CELL, host_layer, Staggering
+from devito.types.basic import AbstractFunction
+from devito.types.utils import (
+    Buffer, DimensionTuple, NODE, CELL, Size, Staggering, host_layer
+)
 
 __all__ = ['Function', 'TimeFunction', 'SubFunction', 'TempFunction']
 

devito/types/utils.py

@@ -1,12 +1,13 @@
+from collections import namedtuple
 from ctypes import POINTER, Structure
 from functools import cached_property
 
 from devito.tools import EnrichedTuple, Tag
 # Additional Function-related APIs
 
-__all__ = ['Buffer', 'DimensionTuple', 'NODE', 'CELL', 'IgnoreDimSort',
-           'HierarchyLayer', 'HostLayer', 'DeviceLayer', 'DiskLayer',
-           'host_layer', 'device_layer', 'disk_layer']
+__all__ = ['Buffer', 'DimensionTuple', 'NODE', 'CELL', 'Size', 'Offset',
+           'IgnoreDimSort', 'HierarchyLayer', 'HostLayer', 'DeviceLayer',
+           'DiskLayer', 'host_layer', 'device_layer', 'disk_layer']
 
 
 class Buffer(Tag):
@@ -23,6 +24,10 @@ class Stagger(Tag):
 CELL = Stagger('cell')
 
 
+Size = namedtuple('Size', 'left right')
+Offset = namedtuple('Offset', 'left right')
+
+
 class DimensionTuple(EnrichedTuple):
 
     def __getitem_hook__(self, dim):