lambdify accepts kwargs and lambdadouble rejects opt_level

Author: ichumuh

symengine/lib/symengine_wrapper.pxd

@@ -37,7 +37,7 @@ cdef class _Lambdify(object):
     cdef vector[int] accum_out_sizes
     cdef object numpy_dtype
 
-    cdef _init(self, symengine.vec_basic& args_, symengine.vec_basic& outs_, cppbool cse, int opt_level)
+    cdef _init(self, symengine.vec_basic& args_, symengine.vec_basic& outs_, cppbool cse)
     cdef _load(self, const string &s)
     cpdef unsafe_real(self,
                       double[::1] inp, double[::1] out,
@@ -50,16 +50,17 @@ cdef class _Lambdify(object):
 cdef class LambdaDouble(_Lambdify):
     cdef vector[symengine.LambdaRealDoubleVisitor] lambda_double
     cdef vector[symengine.LambdaComplexDoubleVisitor] lambda_double_complex
-    cdef _init(self, symengine.vec_basic& args_, symengine.vec_basic& outs_, cppbool cse, int opt_level)
+    cdef _init(self, symengine.vec_basic& args_, symengine.vec_basic& outs_, cppbool cse)
     cpdef unsafe_real(self, double[::1] inp, double[::1] out, int inp_offset=*, int out_offset=*)
     cpdef unsafe_complex(self, double complex[::1] inp, double complex[::1] out, int inp_offset=*, int out_offset=*)
     cpdef as_scipy_low_level_callable(self)
     cpdef as_ctypes(self)
 
 IF HAVE_SYMENGINE_LLVM:
     cdef class LLVMDouble(_Lambdify):
+        cdef int opt_level
         cdef vector[symengine.LLVMDoubleVisitor] lambda_double
-        cdef _init(self, symengine.vec_basic& args_, symengine.vec_basic& outs_, cppbool cse, int opt_level)
+        cdef _init(self, symengine.vec_basic& args_, symengine.vec_basic& outs_, cppbool cse)
         cdef _load(self, const string &s)
         cpdef unsafe_real(self, double[::1] inp, double[::1] out, int inp_offset=*, int out_offset=*)
         cpdef as_scipy_low_level_callable(self)

symengine/lib/symengine_wrapper.pyx

@@ -4469,7 +4469,7 @@ def has_symbol(obj, symbol=None):
 
 
 cdef class _Lambdify(object):
-    def __init__(self, args, *exprs, cppbool real=True, order='C', cppbool cse=False, cppbool _load=False, int opt_level=3):
+    def __init__(self, args, *exprs, cppbool real=True, order='C', cppbool cse=False, cppbool _load=False, **kwargs):
         cdef:
             Basic e_
             size_t ri, ci, nr, nc
@@ -4516,9 +4516,9 @@ cdef class _Lambdify(object):
                 for e in np.ravel(curr_expr, order=self.order):
                     e_ = _sympify(e)
                     outs_.push_back(e_.thisptr)
-        self._init(args_, outs_, cse, opt_level)
+        self._init(args_, outs_, cse)
 
-    cdef _init(self, symengine.vec_basic& args_, symengine.vec_basic& outs_, cppbool cse, int opt_level):
+    cdef _init(self, symengine.vec_basic& args_, symengine.vec_basic& outs_, cppbool cse):
         raise ValueError("Not supported")
 
     cdef _load(self, const string &s):
@@ -4706,7 +4706,11 @@ def create_low_level_callable(lambdify, *args):
 
 
 cdef class LambdaDouble(_Lambdify):
-    cdef _init(self, symengine.vec_basic& args_, symengine.vec_basic& outs_, cppbool cse, int opt_level):
+    def __cinit__(self, args, *exprs, cppbool real=True, order='C', cppbool cse=False, cppbool _load=False):
+        # reject additional arguments
+        pass
+
+    cdef _init(self, symengine.vec_basic& args_, symengine.vec_basic& outs_, cppbool cse):
         if self.real:
             self.lambda_double.resize(1)
             self.lambda_double[0].init(args_, outs_, cse)
@@ -4751,9 +4755,12 @@ cdef class LambdaDouble(_Lambdify):
 
 IF HAVE_SYMENGINE_LLVM:
     cdef class LLVMDouble(_Lambdify):
-        cdef _init(self, symengine.vec_basic& args_, symengine.vec_basic& outs_, cppbool cse, int opt_level):
+        def __cinit__(self, args, *exprs, cppbool real=True, order='C', cppbool cse=False, cppbool _load=False, opt_level=0):
+            self.opt_level = opt_level
+
+        cdef _init(self, symengine.vec_basic& args_, symengine.vec_basic& outs_, cppbool cse):
             self.lambda_double.resize(1)
-            self.lambda_double[0].init(args_, outs_, cse, opt_level)
+            self.lambda_double[0].init(args_, outs_, cse, self.opt_level)
 
         cdef _load(self, const string &s):
             self.lambda_double.resize(1)
@@ -4801,7 +4808,7 @@ IF HAVE_SYMENGINE_LLVM:
     def llvm_loading_func(*args):
         return LLVMDouble(args, _load=True)
 
-def Lambdify(args, *exprs, cppbool real=True, backend=None, order='C', as_scipy=False, cse=False, opt_level=3):
+def Lambdify(args, *exprs, cppbool real=True, backend=None, order='C', as_scipy=False, cse=False, **kwargs):
     """
     Lambdify instances are callbacks that numerically evaluate their symbolic
     expressions from user provided input (real or complex) into (possibly user
@@ -4851,7 +4858,7 @@ def Lambdify(args, *exprs, cppbool real=True, backend=None, order='C', as_scipy=
         backend = os.getenv('SYMENGINE_LAMBDIFY_BACKEND', "lambda")
     if backend == "llvm":
         IF HAVE_SYMENGINE_LLVM:
-            ret = LLVMDouble(args, *exprs, real=real, order=order, cse=cse, opt_level=opt_level)
+            ret = LLVMDouble(args, *exprs, real=real, order=order, cse=cse, **kwargs)
             if as_scipy:
                 return ret.as_scipy_low_level_callable()
             return ret
@@ -4862,7 +4869,7 @@ def Lambdify(args, *exprs, cppbool real=True, backend=None, order='C', as_scipy=
         pass
     else:
         warnings.warn("Unknown SymEngine backend: %s\nUsing backend='lambda'" % backend)
-    ret = LambdaDouble(args, *exprs, real=real, order=order, cse=cse)
+    ret = LambdaDouble(args, *exprs, real=real, order=order, cse=cse, **kwargs)
     if as_scipy:
         return ret.as_scipy_low_level_callable()
     return ret