Merge pull request #108 from isuruf/lambdifycse

Fix two issues in LambdifyCSE

Author: isuruf

.travis.yml

@@ -56,13 +56,16 @@ matrix:
           sources:
           - ubuntu-toolchain-r-test
           - boost-latest
+          - george-edison55-precise-backports
           packages:
           - libgmp-dev
           - libmpfr-dev
           - binutils-dev
           - libboost-serialization1.55-dev
           - libboost-iostreams1.55-dev
           - g++-4.8
+          - cmake
+          - cmake-data
     - env: BUILD_TYPE="Debug" WITH_BFD="yes" PYTHON_VERSION="3.5"
       compiler: clang
       os: linux
@@ -90,8 +93,6 @@ matrix:
           - lrzip
 
 install:
-  # Workaround till symengine C++ repo's script is fixed
-  - if [[ "${TRAVIS_OS_NAME}" == "osx" ]]; then brew uninstall cmake; fi
   - export PYTHON_SOURCE_DIR=`pwd`
   - export TEST_CPP="no"
 

symengine/lib/symengine_wrapper.pyx

@@ -2845,17 +2845,22 @@ def LambdifyCSE(args, exprs, real=True, cse=None, concatenate=None):
         from sympy import cse
     if concatenate is None:
         from numpy import concatenate
-    subs, new_exprs = cse(exprs)
-    cse_symbs, cse_exprs = zip(*subs)
-    lmb = Lambdify(tuple(args) + cse_symbs, new_exprs, real=real)
-    cse_lambda = Lambdify(args, cse_exprs, real=real)
-
-    def cb(inp, out=None, **kwargs):
-        cse_vals = cse_lambda(inp, **kwargs)
-        new_inp = concatenate((inp, cse_vals))
-        return lmb(new_inp, out, **kwargs)
+    from sympy import sympify as ssympify
+    subs, new_exprs = cse([ssympify(expr) for expr in exprs])
+    if subs:
+        cse_symbs, cse_exprs = zip(*subs)
+        lmb = Lambdify(tuple(args) + cse_symbs, new_exprs, real=real)
+        cse_lambda = Lambdify(args, cse_exprs, real=real)
+
+        def cb(inp, out=None, **kwargs):
+            cse_vals = cse_lambda(inp, **kwargs)
+            new_inp = concatenate((inp, cse_vals))
+            return lmb(new_inp, out, **kwargs)
+
+        return cb
+    else:
+        return Lambdify(args, exprs, real=real)
 
-    return cb
 
 def has_symbol(obj, symbol=None):
     cdef Basic b = sympify(obj)

symengine_version.txt

@@ -1 +1 @@
-v0.2.0
+c7a3bac9d715d9d78c3005b725c2cf4946514e32