compiler: fix real dtype

Author: mloubout

devito/ir/cgen/printer.py

@@ -77,7 +77,11 @@ def _prec(self, expr):
         if dtype is None or np.issubdtype(dtype, np.integer):
             real = any(isinstance(i, Float) for i in expr.atoms())
             if real:
-                return self.dtype
+                try:
+                    return np.promote_types(self.dtype, np.float32).type
+                except np.exceptions.DTypePromotionError:
+                    # Corner cases, e.g. Void, cannot (shouldn't) be promoted
+                    return self.dtype
             else:
                 return dtype or self.dtype
         else:
@@ -89,9 +93,9 @@ def prec_literal(self, expr):
     def func_literal(self, expr):
         return self._func_litterals.get(self._prec(expr), '')
 
-    def func_prefix(self, expr, abs=False):
+    def func_prefix(self, expr, mfunc=False):
         prefix = self._func_prefix.get(self._prec(expr), '')
-        if abs:
+        if mfunc:
             return prefix
         else:
             return '' if prefix == 'f' else prefix
@@ -235,7 +239,7 @@ def _print_Mul(self, expr):
 
     def _print_fmath_func(self, name, expr):
         args = ",".join([self._print(i) for i in expr.args])
-        func = f'{self.func_prefix(expr, abs=True)}{name}{self.func_literal(expr)}'
+        func = f'{self.func_prefix(expr, mfunc=True)}{name}{self.func_literal(expr)}'
         return f"{self._ns}{func}({args})"
 
     def _print_Min(self, expr):

devito/operator/operator.py

@@ -32,7 +32,7 @@
 from devito.tools import (DAG, OrderedSet, Signer, ReducerMap, as_mapper, as_tuple,
                           flatten, filter_sorted, frozendict, is_integer,
                           split, timed_pass, timed_region, contains_val)
-from devito.types import (Buffer, Grid, Evaluable, host_layer, device_layer,
+from devito.types import (Buffer, Evaluable, host_layer, device_layer,
                           disk_layer)
 from devito.types.dimension import Thickness
 

devito/types/grid.py

@@ -193,12 +193,7 @@ def __init__(self, shape, extent=None, origin=None, dimensions=None,
         extent = as_tuple(extent or tuple(1. for _ in self.shape))
         self._extent = tuple(dtype(e) for e in extent)
 
-        # Initialize SubDomains
-        subdomains = tuple(i for i in (Domain(), Interior(), *as_tuple(subdomains)))
-        for i in subdomains:
-            i.__subdomain_finalize__(self)
-        self._subdomains = subdomains
-
+        # The origin of the grid
         origin = as_tuple(origin or tuple(0. for _ in self.shape))
         self._origin = tuple(dtype(o) for o in origin)
         self._origin_symbols = tuple(Scalar(name='o_%s' % d.name, dtype=dtype,

tests/test_builtins.py

@@ -155,7 +155,7 @@ def test_gs_1d_float(self, sigma):
     def test_gs_2d_int(self, sigma):
         """Test the Gaussian smoother in 2d."""
 
-        a = ascent()
+        a = ascent().astype(np.int32)
         sp_smoothed = gaussian_filter(a, sigma=sigma)
         dv_smoothed = gaussian_smooth(a, sigma=sigma)
 
@@ -169,8 +169,7 @@ def test_gs_2d_int(self, sigma):
     def test_gs_2d_float(self, sigma):
         """Test the Gaussian smoother in 2d."""
 
-        a = ascent()
-        a = a+0.1
+        a = ascent()+0.1
         sp_smoothed = gaussian_filter(a, sigma=sigma)
         dv_smoothed = gaussian_smooth(a, sigma=sigma)