Fix conversions

Author: isuruf

sumpy/codegen.py

@@ -32,7 +32,7 @@
 
 from pytools import memoize_method
 
-from sumpy.symbolic import (SympyToPymbolicMapper as SympyToPymbolicMapperBase)
+from sumpy.symbolic import SympyToPymbolicMapper
 
 import logging
 logger = logging.getLogger(__name__)
@@ -49,27 +49,6 @@
 """
 
 
-# {{{ sympy -> pymbolic mapper
-
-import sumpy.symbolic as sym
-_SPECIAL_FUNCTION_NAMES = frozenset(dir(sym.functions))
-
-
-class SympyToPymbolicMapper(SympyToPymbolicMapperBase):
-
-    def not_supported(self, expr):
-        if isinstance(expr, int):
-            return expr
-        elif getattr(expr, "is_Function", False):
-            func_name = SympyToPymbolicMapperBase.function_name(self, expr)
-            return prim.Variable(func_name)(
-                    *tuple(self.rec(arg) for arg in expr.args))
-        else:
-            return SympyToPymbolicMapperBase.not_supported(self, expr)
-
-# }}}
-
-
 # {{{ bessel -> loopy codegen
 
 BESSEL_PREAMBLE = """//CL//

sumpy/symbolic.py

@@ -313,12 +313,16 @@ def map_Mul(self, expr):  # noqa: N802
 
         return math.prod(num_args) / math.prod(den_args)
 
-    def map_FunctionSymbol(self, expr):
-        if expr.get_name() == "ExpI":
-            arg = self.rec(expr.args[0])
-            return prim.Variable("cos")(arg) + 1j * prim.Variable("sin")(arg)
+    def not_supported(self, expr):
+        if getattr(expr, "is_Function", False):
+            if self.function_name(expr) == "ExpI":
+                arg = self.rec(expr.args[0])
+                return prim.Variable("cos")(arg) + 1j * prim.Variable("sin")(arg)
+            else:
+                return prim.Variable(self.function_name(expr))(
+                    *[self.rec(arg) for arg in expr.args])
         else:
-            return SympyToPymbolicMapperBase.map_FunctionSymbol(self, expr)
+            return SympyToPymbolicMapperBase.not_supported(self, expr)
 
 
 class PymbolicToSympyMapperWithSymbols(PymbolicToSympyMapper):