mpi: better naming

Author: mloubout

devito/core/operator.py

@@ -318,7 +318,6 @@ def _specialize_clusters(cls, clusters, **kwargs):
 
         # Fetch passes to be called
         passes_mapper = cls._make_clusters_passes_mapper(**kwargs)
-        print(passes)
 
         # Call passes
         for i in passes:

devito/data/data.py

@@ -154,7 +154,7 @@ def _local(self):
 
     def _global(self, glb_idx, decomposition):
         """A "global" view of ``self`` over a given Decomposition."""
-        if self._is_mpi_distributed:
+        if self._is_decomposed:
             raise ValueError("Cannot derive a decomposed view from a decomposed Data")
         if len(decomposition) != self.ndim:
             raise ValueError("`decomposition` should have ndim=%d entries" % self.ndim)
@@ -180,9 +180,9 @@ def wrapper(data, *args, **kwargs):
             if is_gather and all(i == slice(None, None, 1) for i in glb_idx):
                 comm_type = gather
             elif len(args) > 1 and isinstance(args[1], Data) \
-                    and args[1]._is_mpi_distributed:
+                    and args[1]._is_decomposed:
                 comm_type = index_by_index
-            elif data._is_mpi_distributed:
+            elif data._is_decomposed:
                 for i in as_tuple(glb_idx):
                     if isinstance(i, slice) and i.step is not None and i.step < 0:
                         comm_type = index_by_index
@@ -196,7 +196,7 @@ def wrapper(data, *args, **kwargs):
         return wrapper
 
     @property
-    def _is_mpi_distributed(self):
+    def _is_decomposed(self):
         is_mpi = self._is_distributed and configuration['mpi']
         if is_mpi:
             is_mpi = is_mpi and self._distributor.comm.size > 2
@@ -344,7 +344,7 @@ def __setitem__(self, glb_idx, val, comm_type):
                 super().__setitem__(loc_idx, val)
             else:
                 super().__setitem__(glb_idx, val)
-        elif isinstance(val, Data) and val._is_mpi_distributed:
+        elif isinstance(val, Data) and val._is_decomposed:
             if comm_type is index_by_index:
                 glb_idx, val = self._process_args(glb_idx, val)
                 val_idx = as_tuple([slice(i.glb_min, i.glb_max+1, 1) for
@@ -364,14 +364,14 @@ def __setitem__(self, glb_idx, val, comm_type):
                         or data_global[j].size == 0
                     if not skip:
                         self.__setitem__(idx_global[j], data_global[j])
-            elif self._is_mpi_distributed:
+            elif self._is_decomposed:
                 # `val` is decomposed, `self` is decomposed -> local set
                 super().__setitem__(glb_idx, val)
             else:
                 # `val` is decomposed, `self` is replicated -> gatherall-like
                 raise NotImplementedError
         elif isinstance(val, np.ndarray):
-            if self._is_mpi_distributed:
+            if self._is_decomposed:
                 # `val` is replicated, `self` is decomposed -> `val` gets decomposed
                 glb_idx = self._normalize_index(glb_idx)
                 glb_idx, val = self._process_args(glb_idx, val)
@@ -404,7 +404,7 @@ def __setitem__(self, glb_idx, val, comm_type):
                 pass
             super().__setitem__(glb_idx, val)
         elif isinstance(val, Iterable):
-            if self._is_mpi_distributed:
+            if self._is_decomposed:
                 raise NotImplementedError("With MPI, data can only be set "
                                           "via scalars, numpy arrays or "
                                           "other data ")
@@ -481,7 +481,7 @@ def _index_glb_to_loc(self, glb_idx):
         if len(glb_idx) > self.ndim:
             # Maybe user code is trying to add a new axis (see np.newaxis),
             # so the resulting array will be higher dimensional than `self`
-            if self._is_mpi_distributed:
+            if self._is_decomposed:
                 raise ValueError("Cannot increase dimensionality of MPI-distributed Data")
             else:
                 # As by specification, we are forced to ignore modulo indexing
@@ -497,7 +497,7 @@ def _index_glb_to_loc(self, glb_idx):
                 try:
                     v = convert_index(i, dec, mode='glb_to_loc')
                 except TypeError:
-                    if self._is_mpi_distributed:
+                    if self._is_decomposed:
                         raise NotImplementedError("Unsupported advanced indexing with "
                                                   "MPI-distributed Data")
                     v = i

devito/finite_differences/differentiable.py

@@ -1088,7 +1088,7 @@ def _diff2sympy(obj):
 # Interpolation for finite differences
 @singledispatch
 def interp_for_fd(expr, x0, **kwargs):
-    return expr._evaluate(expand=True)
+    return expr
 
 
 @interp_for_fd.register(sympy.Derivative)