Merge branch 'master' into posdef

Author: rikardn

.gitignore

@@ -40,3 +40,4 @@ symengine.egg-info/
 genDocs/
 docs/_build/
 docs/source/
+symengine/lib/version_script_symengine_wrapper.txt

bin/test_travis.sh

@@ -6,12 +6,13 @@ set -e
 set -x
 
 # Build inplace so that nosetests can be run inside source directory
-python setup.py install build_ext --inplace --symengine-dir=$our_install_dir
+python3 setup.py install build_ext --inplace --symengine-dir=$our_install_dir
 
 # Test python wrappers
-py.test -s -v $PYTHON_SOURCE_DIR/symengine/tests/test_*.py
+python3 -m pip install pytest
+python3 -m pytest -s -v $PYTHON_SOURCE_DIR/symengine/tests/test_*.py
 mkdir -p empty && cd empty
-python $PYTHON_SOURCE_DIR/bin/test_python.py
+python3 $PYTHON_SOURCE_DIR/bin/test_python.py
 cd ..
 
 if [[ "${TRIGGER_FEEDSTOCK}" == "yes" ]]; then

symengine/lib/symengine.pxd

@@ -835,7 +835,6 @@ cdef extern from "<symengine/matrix.h>" namespace "SymEngine":
     DenseMatrix* static_cast_DenseMatrix "static_cast<SymEngine::DenseMatrix*>"(const MatrixBase *a)
     void inverse_FFLU "SymEngine::inverse_fraction_free_LU"(const DenseMatrix &A,
         DenseMatrix &B) nogil except +
-    void pivoted_LU (const DenseMatrix &A, DenseMatrix &L, DenseMatrix &U, vector[int] &P) nogil except +
     void pivoted_LU_solve (const DenseMatrix &A, const DenseMatrix &b, DenseMatrix &x) nogil except +
     void inverse_GJ "SymEngine::inverse_gauss_jordan"(const DenseMatrix &A,
         DenseMatrix &B) nogil except +
@@ -860,6 +859,9 @@ cdef extern from "<symengine/matrix.h>" namespace "SymEngine":
     void dot(const DenseMatrix &A, const DenseMatrix &B, DenseMatrix &C) nogil
     void cross(const DenseMatrix &A, const DenseMatrix &B, DenseMatrix &C) nogil
 
+cdef extern from "<symengine/matrix.h>":
+    void pivoted_LU (const DenseMatrix &A, DenseMatrix &L, DenseMatrix &U, vector[pair[int, int]] &P) nogil except +
+
 cdef extern from "<symengine/ntheory.h>" namespace "SymEngine":
     int probab_prime_p(const Integer &a, int reps)
     RCP[const Integer] nextprime (const Integer &a) nogil
@@ -911,6 +913,7 @@ cdef extern from "<symengine/ntheory.h>" namespace "SymEngine":
     void powermod_list(vec_integer &powm, RCP[const Integer] a,
             RCP[const Number] b, RCP[const Integer] m) nogil
 
+cdef extern from "<symengine/prime_sieve.h>" namespace "SymEngine":
     void sieve_generate_primes "SymEngine::Sieve::generate_primes"(vector[unsigned] &primes, unsigned limit) nogil
 
     cdef cppclass sieve_iterator "SymEngine::Sieve::iterator":

symengine/lib/symengine_wrapper.pyx

@@ -562,6 +562,8 @@ def _sympify(a, raise_error=True):
         return Integer(a)
     elif isinstance(a, float):
         return RealDouble(a)
+    elif have_numpy and isinstance(a, (np.float16, np.float32)):
+        return RealDouble(a)
     elif isinstance(a, complex):
         return ComplexDouble(a)
     elif hasattr(a, '_symengine_'):
@@ -3192,7 +3194,7 @@ cdef class DenseMatrixBase(MatrixBase):
             self.thisptr = new symengine.DenseMatrix(row, col)
             return
         if col is None:
-            v = row
+            v = sympify(row)
             row = 0
         cdef symengine.vec_basic v_
         cdef DenseMatrixBase A
@@ -3706,6 +3708,17 @@ cdef class DenseMatrixBase(MatrixBase):
         deref(self.thisptr).LU(deref(L.thisptr), deref(U.thisptr))
         return L, U
 
+    def LUdecomposition(self):
+        cdef DenseMatrixBase L = self.__class__(self.nrows(), self.ncols())
+        cdef DenseMatrixBase U = self.__class__(self.nrows(), self.ncols())
+        cdef vector[pair[int, int]] perm
+        symengine.pivoted_LU(
+            deref(symengine.static_cast_DenseMatrix(self.thisptr)),
+            deref(symengine.static_cast_DenseMatrix(L.thisptr)),
+            deref(symengine.static_cast_DenseMatrix(U.thisptr)),
+            perm)
+        return L, U, perm
+
     def LDL(self):
         cdef DenseMatrixBase L = self.__class__(self.nrows(), self.ncols())
         cdef DenseMatrixBase D = self.__class__(self.nrows(), self.ncols())

symengine/tests/test_matrices.py

@@ -699,3 +699,15 @@ def test_atoms():
     b = Symbol("b")
     X = DenseMatrix([[a, 2], [b, 4]])
     assert X.atoms(Symbol) == set([a, b])
+
+
+def test_LUdecomp():
+    testmat = DenseMatrix([[0, 2, 5, 3],
+                      [3, 3, 7, 4],
+                      [8, 4, 0, 2],
+                      [-2, 6, 3, 4]])
+    L, U, p = testmat.LUdecomposition()
+    res = L*U
+    for orig, new in p:
+        res.row_swap(orig, new)
+    assert res - testmat == zeros(4)

symengine/tests/test_subs.py

@@ -1,5 +1,7 @@
+import unittest
+
 from symengine.utilities import raises
-from symengine import Symbol, sin, cos, sqrt, Add, function_symbol
+from symengine import Symbol, sin, cos, sqrt, Add, function_symbol, have_numpy
 
 
 def test_basic():
@@ -56,3 +58,19 @@ def test_xreplace():
     y = Symbol("y")
     f = sin(cos(x))
     assert f.xreplace({x: y}) == sin(cos(y))
+
+
+@unittest.skipUnless(have_numpy, "Numpy not installed")
+def test_float32():
+    import numpy as np
+    x = Symbol("x")
+    expr = x * 2
+    assert expr.subs({x: np.float32(2)}) == 4.0
+
+
+@unittest.skipUnless(have_numpy, "Numpy not installed")
+def test_float16():
+    import numpy as np
+    x = Symbol("x")
+    expr = x * 2
+    assert expr.subs({x: np.float16(2)}) == 4.0

symengine/tests/test_sympy_conv.py

@@ -786,3 +786,12 @@ def test_pynumber():
 
     b = b / x
     assert isinstance(b, PyNumber)
+
+
+@unittest.skipIf(not have_sympy, "SymPy not installed")
+def test_construct_dense_matrix():
+    # Test for issue #347
+    A = sympy.Matrix([[1, 2], [3, 5]])
+    B = DenseMatrix(A)
+    assert B.shape == (2, 2)
+    assert list(B) == [1, 2, 3, 5]

symengine_version.txt

@@ -1 +1 @@
-v0.7.0
+bb386f47369500d76cda07e6e9f014bfe6339f64