compiler: fix std math func names

devitocodes · Jan 16, 2025 · 62f2deb · 62f2deb
1 parent 54cd1fc
commit 62f2deb
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/devito/passes/iet/languages/CXX.py b/devito/passes/iet/languages/CXX.py
@@ -71,12 +71,13 @@ class CXXDevitoPrinter(_DevitoPrinterBase, CXX11CodePrinter):
     _default_settings = {**_DevitoPrinterBase._default_settings,
                          **CXX11CodePrinter._default_settings}
     _ns = "std::"
+    _func_litterals = {}
 
     # These cannot go through _print_xxx because they are classes not
     # instances
     type_mappings = {**_DevitoPrinterBase.type_mappings,
                      c_complex: 'std::complex<float>',
-                     c_double_complex: 'std::complex<float>',
+                     c_double_complex: 'std::complex<double>',
                      **CXX11CodePrinter.type_mappings}
 
     def _print_ImaginaryUnit(self, expr):

diff --git a/devito/symbolics/inspection.py b/devito/symbolics/inspection.py
@@ -295,10 +295,13 @@ def has_integer_args(*args):
     return res
 
 
-def sympy_dtype(expr, base=None):
+def sympy_dtype(expr, base=None, default=None):
     """
     Infer the dtype of the expression.
     """
+    if expr is None:
+        return default
+
     dtypes = {base} - {None}
     for i in expr.free_symbols:
         try:
@@ -312,7 +315,7 @@ def sympy_dtype(expr, base=None):
     is_im = np.issubdtype(dtype, np.complexfloating)
     if expr.has(ImaginaryUnit) and not is_im:
         if dtype is None:
-            dtype = np.complex64
+            dtype = default or np.complex64
         else:
             dtype = np.promote_types(dtype, np.complex64).type
 

diff --git a/devito/symbolics/printer.py b/devito/symbolics/printer.py
@@ -25,7 +25,6 @@
 
 
 _prec_litterals = {np.float16: 'F16', np.float32: 'F', np.complex64: 'F'}
-_func_litterals = {np.float32: 'f', np.complex64: 'f', Real: 'f'}
 
 
 class _DevitoPrinterBase(C99CodePrinter):
@@ -42,6 +41,7 @@ class _DevitoPrinterBase(C99CodePrinter):
                          **C99CodePrinter._default_settings}
 
     _func_prefix = {np.float32: 'f', np.float64: 'f'}
+    _func_litterals = {np.float32: 'f', np.complex64: 'f', Real: 'f'}
 
     @property
     def dtype(self):
@@ -62,7 +62,7 @@ def doprint(self, expr, assign_to=None):
         return self._print(expr)
 
     def _prec(self, expr):
-        dtype = sympy_dtype(expr) if expr is not None else None
+        dtype = sympy_dtype(expr, default=self.dtype)
         if dtype is None or np.issubdtype(dtype, np.integer):
             real = any(isinstance(i, Float) for i in expr.atoms())
             stype = self.dtype if real else np.int32
@@ -74,7 +74,7 @@ def prec_literal(self, expr):
         return _prec_litterals.get(self._prec(expr), '')
 
     def func_literal(self, expr):
-        return _func_litterals.get(self._prec(expr), '')
+        return self._func_litterals.get(self._prec(expr), '')
 
     def func_prefix(self, expr, abs=False):
         prefix = self._func_prefix.get(self._prec(expr), '')

diff --git a/tests/test_gpu_common.py b/tests/test_gpu_common.py
@@ -94,7 +94,7 @@ def test_complex(self, dtype):
         xx, yy = np.meshgrid(np.linspace(0, 4, 5), np.linspace(0, 4, 5))
         npres = xx + 1j*yy + np.exp(1j + dx) * (1.0 + 2.0j)
 
-        assert np.allclose(u.data, npres.T, rtol=1e-7, atol=0)
+        assert np.allclose(u.data, npres.T, rtol=5e-7, atol=0)
 
 
 class TestPassesOptional: