mpi: Rebase on latest master

devito/mpi/routines.py

@@ -1039,23 +1039,6 @@ def __init__(self, name, body, parameters):
         super().__init__(name, body, parameters)
 
 
-class ComputeFunction(ElementalFunction):
-
-    def make_call(self, dynamic_args_mapper=None, incr=False, retobj=None,
-                  is_indirect=False):
-        return ComputeCall(self.name, list(self.parameters), dict(self._mapper),
-                           dynamic_args_mapper, incr, retobj, is_indirect)
-
-
-def make_compute_func(name, iet, dynamic_parameters=None, retval='void', prefix='static'):
-    """
-    Shortcut to create a ComputeFunction.
-    """
-    return ComputeFunction(name, iet, retval=retval,
-                           parameters=derive_parameters(iet), prefix=prefix,
-                           dynamic_parameters=dynamic_parameters)
-
-
 class Remainder(ElementalFunction):
     pass
 
@@ -1100,10 +1083,6 @@ class HaloWaitCall(MPICall):
     pass
 
 
-class ComputeCall(ElementalCall):
-    pass
-
-
 class RemainderCall(MPICall):
     pass
 

devito/passes/clusters/cse.py

@@ -10,7 +10,7 @@
 from devito.symbolics import estimate_cost, q_leaf
 from devito.symbolics.manipulation import _uxreplace
 from devito.tools import as_list
-from devito.types import Eq, Temp
+from devito.types import Eq, Temp, Symbol
 
 __all__ = ['cse']