Add symengine.have_numpy, handle defines in setup.py

Author: bjodah

setup.py

@@ -61,6 +61,21 @@ def get_build_dir(dist):
      'options to cmake <var>:<type>=<value>'),
 ]
 
+def _process_define(arg):
+    (defs, one), = getattr(arg, 'define', ['', '1'])
+    assert one == '1'
+    defs = defs.split(';')
+    if not any(define.startswith('WITH_NUMPY') for define in defs):
+        try:
+            import numpy as np
+        except ImportError:
+            defs.append('WITH_NUMPY=False')
+        else:
+            defs.append('WITH_NUMPY=True')
+    return [(s.strip(), None) if '=' not in s else
+            tuple(ss.strip() for ss in s.split('='))
+            for s in defs]
+
 
 class BuildWithCmake(_build):
     sub_commands = [('build_ext', None)]
@@ -83,12 +98,8 @@ def finalize_options(self):
         # The argument parsing will result in self.define being a string, but
         # it has to be a list of 2-tuples.
         # Multiple symbols can be separated with semi-colons.
-        if self.define:
-            defines = self.define.split(';')
-            self.define = [(s.strip(), None) if '=' not in s else
-                           tuple(ss.strip() for ss in s.split('='))
-                           for s in defines]
-            cmake_opts.extend(self.define)
+        self.define = _process_define(self)
+        cmake_opts.extend(self.define)
         if self.symengine_dir:
             cmake_opts.extend([('SymEngine_DIR', self.symengine_dir)])
 
@@ -160,21 +171,8 @@ def finalize_options(self):
         # The argument parsing will result in self.define being a string, but
         # it has to be a list of 2-tuples.
         # Multiple symbols can be separated with semi-colons.
-        if self.define:
-            defines = self.define.split(';')
-            if not any(define.startswith('WITH_NUMPY') for define in defines):
-                try:
-                    import numpy as np
-                except ImportError:
-                    defines.append('WITH_NUMPY=False')
-                else:
-                    defines.append('WITH_NUMPY=True')
-                defines.append()
-            self.define = [(s.strip(), None) if '=' not in s else
-                           tuple(ss.strip() for ss in s.split('='))
-                           for s in defines]
-            cmake_opts.extend(self.define)
-
+        self.define = _process_define(self)
+        cmake_opts.extend(self.define)
         cmake_build_type[0] = self.build_type
         cmake_opts.extend([('PYTHON_INSTALL_PATH', self.install_platlib)])
         cmake_opts.extend([('PYTHON_INSTALL_HEADER_PATH',

symengine/__init__.py

@@ -4,10 +4,10 @@
         have_llvm, Integer, Rational, Float, Number, RealNumber,
         RealDouble, ComplexDouble, Max, Min, DenseMatrix, Matrix,
         ImmutableMatrix, ImmutableDenseMatrix, MutableDenseMatrix,
-        MatrixBase, Basic, Lambdify, LambdifyCSE, Lambdify as lambdify,
-        DictBasic, symarray, series, diff, zeros, eye, diag, ones,
-        Derivative, Subs, add, expand, has_symbol, UndefFunction,
-        Function, FunctionSymbol as AppliedUndef)
+        MatrixBase, Basic, DictBasic, symarray, series, diff, zeros,
+        eye, diag, ones, Derivative, Subs, add, expand, has_symbol,
+        UndefFunction, Function, FunctionSymbol as AppliedUndef,
+        have_numpy)
 from .utilities import var, symbols
 from .functions import *
 
@@ -17,6 +17,26 @@
 if have_mpc:
     from .lib.symengine_wrapper import ComplexMPC
 
+if have_numpy:
+    from .lib.symengine_wrapper import Lambdify, LambdifyCSE
+
+    def lambdify(args, exprs):
+        try:
+            len(args)
+        except TypeError:
+            args = [args]
+        try:
+            len(exprs)
+        except TypeError:
+            exprs = [exprs]
+        lmb = Lambdify(args, exprs)
+        def f(*inner_args):
+            if len(inner_args) != len(args):
+                raise TypeError("Incorrect number of arguments")
+            return lmb(inner_args)
+        return f
+
+
 __version__ = "0.2.1.dev"
 
 

symengine/lib/symengine_wrapper.pyx

@@ -2599,6 +2599,7 @@ have_mpc = False
 have_piranha = False
 have_flint = False
 have_llvm = False
+have_numpy = False
 
 IF HAVE_SYMENGINE_MPFR:
     have_mpfr = True
@@ -3015,6 +3016,7 @@ IF HAVE_NUMPY:
     # Lambdify requires NumPy (since b713a61, see gh-112)
     cimport numpy as cnp
     import numpy as np
+    have_numpy = True
 
     cdef size_t _size(n):
         try:

symengine/sympy_compat.py

@@ -2,4 +2,3 @@
 warnings.warn("sympy_compat module is deprecated. Use `import symengine` instead", DeprecationWarning,
               stacklevel=2)
 from symengine import *
-