compiler: Simplify get_printer

Author: FabioLuporini

devito/ir/cgen/printer.py

@@ -18,14 +18,13 @@
 from devito.arch.compiler import AOMPCompiler
 from devito.symbolics.inspection import has_integer_args, sympy_dtype
 from devito.symbolics.queries import q_leaf
-from devito.tools import ctypes_to_cstr, ctypes_vector_mapper, dtype_to_ctype
+from devito.tools import (
+    ctypes_to_cstr, ctypes_vector_mapper, dtype_to_ctype, memoized_func
+)
 from devito.types.basic import AbstractFunction
 
 __all__ = ['BasePrinter', 'ccode', 'get_printer']
 
-_preset_dtypes = (np.float32, np.float64, np.complex64, np.complex128)
-_printer_registry = {}
-
 
 class BasePrinter(CodePrinter):
 
@@ -452,22 +451,9 @@ def _print_Fallback(self, expr):
     sympy.printing.str.StrPrinter._print_Add = BasePrinter._print_Add
 
 
-def get_printer(printer, dtype=None):
-    try:
-        registry = _printer_registry[printer]
-    except KeyError:
-        default = printer()
-        registry = {None: default, default.dtype: default}
-        for i in _preset_dtypes:
-            registry.setdefault(i, printer(settings={'dtype': i}))
-        _printer_registry[printer] = registry
-
-    try:
-        return registry[dtype]
-    except KeyError:
-        handle = printer(settings={'dtype': dtype})
-        registry[dtype] = handle
-        return handle
+@memoized_func
+def get_printer(printer, dtype):
+    return printer(settings={'dtype': dtype})
 
 
 def ccode(expr, printer=None, dtype=None):
@@ -489,4 +475,5 @@ def ccode(expr, printer=None, dtype=None):
     if printer is None:
         from devito.passes.iet.languages.C import CPrinter
         printer = CPrinter
+    dtype = printer._default_settings['dtype'] if dtype is None else dtype
     return get_printer(printer, dtype).doprint(expr, None)

devito/ir/iet/visitors.py

@@ -257,6 +257,7 @@ def __init__(self, *args, printer=None, **kwargs):
         self.printer = printer
 
     def ccode(self, expr, dtype=None):
+        dtype = self.printer._default_settings['dtype'] if dtype is None else dtype
         return get_printer(self.printer, dtype).doprint(expr, None)
 
     @property

tests/test_dtypes.py

@@ -205,9 +205,8 @@ def test_math_functions(dtype: np.dtype[np.inexact],
 
 
 def test_printer_registry() -> None:
-    default = get_printer(CPrinter)
+    default = get_printer(CPrinter, np.float32)
 
-    assert get_printer(CPrinter) is default
     assert get_printer(CPrinter, np.float32) is default
 
     float64 = get_printer(CPrinter, np.float64)