compiler: clean-up redundants

devito/core/cpu.py

@@ -3,8 +3,8 @@
 from devito.core.operator import CoreOperator, CustomOperator
 from devito.exceptions import InvalidOperator
 from devito.passes.equations import buffering, collect_derivatives
-from devito.passes.clusters import (Blocking, Lift, cire, cse, eliminate_arrays, fuse,
-                                    extract_increments, factorize, optimize_pows, Skewing)
+from devito.passes.clusters import (Blocking, Skewing, Lift, cire, cse, eliminate_arrays,
+                                    fuse, extract_increments, factorize, optimize_pows)
 from devito.passes.iet import (CTarget, OmpTarget, avoid_denormals, mpiize,
                                optimize_halospots, hoist_prodders, relax_incr_dimensions)
 from devito.tools import timed_pass
@@ -354,8 +354,8 @@ def _make_iet_passes_mapper(cls, **kwargs):
         # Expressions
         'buffering',
         # Clusters
-        'blocking', 'topofuse', 'fuse', 'factorize', 'cire-sops', 'cire-divs',
-        'cse', 'lift', 'opt-pows', 'skewing',
+        'blocking', 'skewing', 'topofuse', 'fuse', 'factorize', 'cire-sops', 'cire-divs',
+        'cse', 'lift', 'opt-pows'
         # IET
         'denormals', 'optcomms', 'openmp', 'mpi', 'simd', 'prodders',
     )

devito/core/gpu.py

@@ -293,8 +293,8 @@ def _make_iet_passes_mapper(cls, **kwargs):
         # Expressions
         'buffering',
         # Clusters
-        'blocking', 'tasking', 'streaming', 'factorize', 'fuse', 'lift',
-        'cire-sops', 'cire-divs', 'cse', 'opt-pows', 'topofuse', 'skewing',
+        'blocking', 'skewing', 'tasking', 'streaming', 'factorize', 'fuse',
+        'lift', 'cire-sops', 'cire-divs', 'cse', 'opt-pows', 'topofuse',
         # IET
         'optcomms', 'orchestrate', 'parallel', 'mpi', 'prodders', 'gpu-direct'
     )

devito/passes/clusters/blocking.py

@@ -166,15 +166,11 @@ class Skewing(Queue):
 
     def __init__(self, options):
 
-        self.nskewed = Counter()
-
         super(Skewing, self).__init__()
 
     @timed_pass(name='skewing')
     def process(self, clusters):
-        processed = super(Skewing, self).process(clusters)
-
-        return processed
+        return super(Skewing, self).process(clusters)
 
     def _process_fdta(self, clusters, level, prefix=None):
 

tests/test_ir.py

@@ -539,7 +539,6 @@ def fa(self, grid):
         ('u[x + z,x + y,z*z]', (IRREGULAR, IRREGULAR, REGULAR)),
         ('u[x+1,u[2,2,2],z-1]', (AFFINE, IRREGULAR, AFFINE)),
         ('u[y,x,z]', (IRREGULAR, IRREGULAR, AFFINE)),
-        ('u[x-time, y-time, z]', (IRREGULAR, IRREGULAR, AFFINE)),
     ])
     def test_index_mode_detection(self, indexed, expected):
         """
@@ -550,7 +549,6 @@ def test_index_mode_detection(self, indexed, expected):
         """
         grid = Grid(shape=(4, 4, 4))
         x, y, z = grid.dimensions  # noqa
-        time = grid.time_dim  # noqa
 
         sx = SubDimension.middle('sx', x, 1, 1)  # noqa
 

tests/test_skewing.py

@@ -3,10 +3,7 @@
 from sympy import Add, cos, sin, sqrt  # noqa
 
 from devito.core.autotuning import options  # noqa
-from devito import (NODE, Eq, Inc, Constant, Function, TimeFunction, SparseTimeFunction,  # noqa
-                    Dimension, SubDimension, Grid, Operator, norm, grad, div, dimensions,
-                    switchconfig, configuration, centered, first_derivative, solve,
-                    transpose)
+from devito import TimeFunction, Grid, Operator, Eq # noqa
 from devito.ir import Expression, Iteration, FindNodes