Merge pull request #215 from isuruf/lambdify

Simplify lambdify

Author: isuruf

symengine/__init__.py

@@ -22,21 +22,10 @@
     from .lib.symengine_wrapper import ComplexMPC
 
 if have_numpy:
-    from .lib.symengine_wrapper import Lambdify, LambdifyCSE
-
-    def lambdify(args, exprs, real=True, backend=None, as_scipy=False):
-        try:
-            len(args)
-        except TypeError:
-            args = [args]
-        if as_scipy:
-            return Lambdify(args, *exprs, real=real, backend=backend, as_scipy=True)
-        lmb = Lambdify(args, *exprs, real=real, backend=backend)
-        def f(*inner_args):
-            if len(inner_args) != len(args):
-                raise TypeError("Incorrect number of arguments")
-            return lmb(inner_args)
-        return f
+    from .lib.symengine_wrapper import (Lambdify, LambdifyCSE)
+
+    def lambdify(args, exprs, **kwargs):
+        return Lambdify(args, *exprs, **kwargs)
 
 
 __version__ = "0.3.0"

symengine/lib/symengine_wrapper.pyx

@@ -4447,7 +4447,7 @@ cdef class _Lambdify(object):
             raise ValueError("Size of out incompatible with number of exprs.")
         self.unsafe_complex(inp, out)
 
-    def __call__(self, inp, *, out=None):
+    def __call__(self, *args, out=None):
         """
         Parameters
         ----------
@@ -4473,10 +4473,13 @@ cdef class _Lambdify(object):
         if self.order not in ('C', 'F'):
             raise NotImplementedError("Only C & F order supported for now.")
 
+        if len(args) == 1:
+            args = args[0]
+
         try:
-            inp = np.asanyarray(inp, dtype=self.numpy_dtype)
+            inp = np.asanyarray(args, dtype=self.numpy_dtype)
         except TypeError:
-            inp = np.fromiter(inp, dtype=self.numpy_dtype)
+            inp = np.fromiter(args, dtype=self.numpy_dtype)
 
         if self.real:
             real_inp = np.ascontiguousarray(inp.ravel(order=self.order))