Merge branch 'master' into heterogeneous-Lambdify

Author: bjodah

.travis.yml

@@ -16,7 +16,7 @@ addons:
 
 env:
   global:
-    - secure: "jkvObuYjs4oT0bbUzLOtKLPkD2AVt/c4ZOS2qNkStC8dwtLpcYd4tLn1S07PCMYzCLL/DGvp6J8IKmzhQV7a/Yl/wVySTNBFnPecjku8Spf1UqdJbrJa8Ln/nxnajFyc2Q7QnKj8s4sguN1GRY7Jdylp9l7XgebjGwVrpKXIR+JqiSAhxkEyMmWklzu80m+BOTep0xTY/E9fFMCznQFM96jTSjq9vFxCAzToOpP3EFQyBjhDkPNQvaI3KYcBabe5DQs0wMvLEboxDEGYG+Y4ijp1d8JFmWZgzU1nQm++n8WG/Igz8rF6Asy7fHeE2/sexQf0LEqtTFtSmJFFnn6vJdn+6JOB05ARbdXc2KKzP81BCCjhPIH/KNQNMpD6p7KfXhthM0np/dxBRDlCh+6kDiuei+798YSJ63Svdr+lmg4weuxWRQh7D2lmXTcygWSW4iafCgK+D0lekg239HKcvDXPx352obM/HAz7tUiIaiOvHNlKlVL7bbHDhKWyaduAHB9jVnAIvcDWjumwyOaIPPLQL1JsL8Tha1H5uUPYWYjfNjjqk57pXq1YPUFoyiylViqX1eTWypwkXFKFJCWb6IhuW32OKEYACXJLZm7zui/qvIKiNn7PNGBxtrW/rvpvVAM94yQNhlmjxiu4/V74D0/9Oh90cPGFtoocbj5MT98="
+    - secure: "gdcw4nEd06q+E8yZkaqtgexX4kHgKqFuTRHKyx5QJBW/q+vL94ntbFft7jZssXEmFtijyjjNbhTucwcSaXIAP1X4tct5kHcuBH5LVvCxi7r4NfhERJDE/EAOS4xbQJ9IUHjdBWCWTCCiXpg0bG/1YcCVsppcKi2Z864CBDpa8DPuDUtyxFpkHW7PdALitLWDIIkIJU817JqYlJKcnR62OYGdVlHiUHhSGI6JKnqou7gf6fgXLsXNnUDUeWS+9vElOTV6OU7vHbG1Ka2N2vwpLIoBoSrw80EDAyP+QqqBRP1B2CyPGvEu9lTyqxUVkb0DAjsltn1bt36UVIb+l55B1JWPSriI3xiVstXa9D2Xb1uth9h712c0cwXw9LJ7YsXEcwdAfCRF/Zywt9IdwCWlnRkiGD2fOHPBkjpXVAV+2xFSD8WLuV6hc3xZjFLvzRxiDZ1CYSY+Wh6IxOp7411GT3BgtH0kEXb5+cg55cjPxgWAWOsU1WkrrWMl9DngeiWNwGZQCU+UkPB1WaITtA6JbFdEZPinZFWtYPMj6ZdA+ARkmwQnG6Y6sg37Zq76n8mDjLb5ECLXq22uRLaATl8lRLOaNDStg9PSxtVGON65NeesPMRFRC7+2ySQ/8KqsZZubHk7SoSY8APP+5mqzBuMbt2bnBVLmf04TI7RnVPSZ6A="
 
   ## All these variables are sent into the bin/test_travis.sh script. See this
   ## script to know how they are used. Most of them are just passed to cmake,
@@ -25,20 +25,17 @@ env:
   ## statement, so if the variable is not set, the other if branch will get
   ## executed.
   matrix:
-  ## Out of tree builds (default):
+  # Debug builds:
   - BUILD_TYPE="Debug" WITH_BFD="yes" PYTHON_VERSION="2.7" TRIGGER_FEEDSTOCK="yes"
+  - BUILD_TYPE="Debug" WITH_BFD="yes" PYTHON_VERSION="3.6"
 
-  ## In-tree builds (we just check a few configurations to make sure they work):
-  # Debug build with Python 2.7:
-  - BUILD_TYPE="Debug" WITH_BFD="yes" PYTHON_VERSION="2.7"
-  # Release build shared lib with Python 2.7:
+  # Release builds:
   - PYTHON_VERSION="2.7" BUILD_SHARED_LIBS="yes"
-
-  # These test the setup.py file
-  - PYTHON_VERSION="2.7" WITH_MPFR="yes" INTEGER_CLASS="gmp"
+  - PYTHON_VERSION="2.7" WITH_MPFR="yes" INTEGER_CLASS="gmpxx"
   - PYTHON_VERSION="3.3" WITH_MPC="yes"
   - PYTHON_VERSION="3.4" WITH_MPFR="yes" WITH_NUMPY="yes"
-  - PYTHON_VERSION="3.5" WITH_MPFR="yes" WITH_NUMPY="yes"
+  - PYTHON_VERSION="3.5" WITH_MPC="yes" WITH_NUMPY="yes"
+  - PYTHON_VERSION="3.6" WITH_MPC="yes" WITH_NUMPY="yes"
 
 matrix:
   exclude:
@@ -81,13 +78,9 @@ matrix:
     - env: BUILD_TYPE="Release" PYTHON_VERSION="3.5"
       compiler: gcc
       os: osx
-    - env: BUILD_TYPE="Release" WITH_SAGE="yes" WITH_MPC="yes"
+    - env: BUILD_TYPE="Release" WITH_SAGE="yes" WITH_MPC="yes" PYTHON_VERSION="2.7"
       compiler: gcc
       os: linux
-      addons:
-        apt:
-          packages:
-          - lrzip
 
 install:
   - export PYTHON_SOURCE_DIR=`pwd`
@@ -100,12 +93,13 @@ install:
   - git checkout `cat ../symengine_version.txt`
   - cd ..
 
-  # Setup travis for Python wrappers
-  - source bin/install_travis.sh
-
   # Setup travis for C++ library
   - cd $SOURCE_DIR
-  - if [[ "${WITH_SAGE}" != "yes" ]]; then source bin/install_travis.sh; fi
+  - source bin/install_travis.sh
+
+  # Setup travis for Python wrappers
+  - cd $PYTHON_SOURCE_DIR
+  - source bin/install_travis.sh
 
   # Build C++ library
   - cd $SOURCE_DIR

CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.8)
 project(python_wrapper)
 
 set(CMAKE_PREFIX_PATH ${SymEngine_DIR} ${CMAKE_PREFIX_PATH})
-find_package(SymEngine 0.2.0 REQUIRED CONFIG
+find_package(SymEngine 0.3.0 REQUIRED CONFIG
              PATH_SUFFIXES lib/cmake/symengine cmake/symengine CMake/)
 message("SymEngine_DIR : " ${SymEngine_DIR})
 set(CMAKE_BUILD_TYPE ${SYMENGINE_BUILD_TYPE})

bin/install_travis.sh

@@ -1,15 +1,16 @@
 #!/usr/bin/env bash
 
-if [[ "${WITH_SAGE}" != "yes" ]]; then
-    # symengine's bin/install_travis.sh will install miniconda
-    conda_pkgs="python=${PYTHON_VERSION} pip cython sympy nose pytest"
-    if [[ "${WITH_NUMPY}" == "yes" ]]; then
-        conda_pkgs="${conda_pkgs} numpy";
-    fi
-else
-    wget -O- https://dl.dropboxusercontent.com/u/46807346/sage-6.9-x86_64-Linux-Ubuntu_12.04_64_bit.tar.gz | tar xz
-    SAGE_ROOT=`pwd`/sage-6.9-x86_64-Linux
-    export PATH="$SAGE_ROOT:$PATH"
-    source $SAGE_ROOT/src/bin/sage-env
-    export our_install_dir=$SAGE_LOCAL
+# symengine's bin/install_travis.sh will install miniconda
+export conda_pkgs="python=${PYTHON_VERSION} pip cython sympy nose pytest"
+
+if [[ "${WITH_NUMPY}" == "yes" ]]; then
+    export conda_pkgs="${conda_pkgs} numpy";
+fi
+
+if [[ "${WITH_SAGE}" == "yes" ]]; then
+    export conda_pkgs="${conda_pkgs} sage";
 fi
+
+conda update -q -n root conda
+conda install ${conda_pkgs} libgap=4.8.3
+source activate $our_install_dir;

bin/test_travis.sh

@@ -9,17 +9,12 @@ set -x
 python setup.py install build_ext --inplace --symengine-dir=$our_install_dir
 
 # Test python wrappers
-if [[ "${WITH_SAGE}" != "yes" ]]; then
-    nosetests -v
-    # If switching to py.test, the following collects correct tests:
-    #py.test -v $PYTHON_SOURCE_DIR/symengine/tests/test_*.py
-    mkdir -p empty
-    cd empty
-    python $PYTHON_SOURCE_DIR/bin/test_python.py
-fi
-if [[ "${WITH_SAGE}" == "yes" ]]; then
-    sage -t $PYTHON_SOURCE_DIR/symengine/tests/test_sage.py
-fi
+nosetests -v
+# If switching to py.test, the following collects correct tests:
+#py.test -v $PYTHON_SOURCE_DIR/symengine/tests/test_*.py
+mkdir -p empty && cd empty
+python $PYTHON_SOURCE_DIR/bin/test_python.py
+cd ..
 
 if [[ "${TRIGGER_FEEDSTOCK}" == "yes" ]]; then
     cd $PYTHON_SOURCE_DIR

setup.py

@@ -3,10 +3,13 @@
 import os
 import subprocess
 import sys
+from distutils.command.build_ext import build_ext as _build_ext
+from distutils.command.build import build as _build
 
 # Make sure the system has the right Python version.
 if sys.version_info[:2] < (2, 7):
-    print("SymEngine requires Python 2.7 or newer. Python %d.%d detected" % sys.version_info[:2])
+    print("SymEngine requires Python 2.7 or newer. "
+          "Python %d.%d detected" % sys.version_info[:2])
     sys.exit(-1)
 
 # use setuptools by default as per the official advice at:
@@ -18,12 +21,9 @@
     if use_distutils.lower() == 'true':
         use_setuptools = False
     else:
-        print("Value {} for USE_DISTUTILS treated as False".\
+        print("Value {} for USE_DISTUTILS treated as False".
               format(use_distutils))
 
-from distutils.command.build_ext import build_ext as _build_ext
-from distutils.command.build import build as _build
-
 if use_setuptools:
     try:
         from setuptools import setup
@@ -35,30 +35,37 @@
     from distutils.core import setup
     from distutils.command.install import install as _install
 
-cmake_opts = [("PYTHON_BIN", sys.executable), ("CMAKE_INSTALL_RPATH_USE_LINK_PATH", "yes")]
+cmake_opts = [("PYTHON_BIN", sys.executable),
+              ("CMAKE_INSTALL_RPATH_USE_LINK_PATH", "yes")]
 cmake_generator = [None]
 cmake_build_type = ["Release"]
 
+
 def process_opts(opts):
     return ['-D'+'='.join(o) for o in opts]
 
+
 def get_build_dir(dist):
     source_dir = path.dirname(path.realpath(__file__))
     build = dist.get_command_obj('build')
     build_ext = dist.get_command_obj('build_ext')
     return source_dir if build_ext.inplace else build.build_platlib
 
+
 global_user_options = [
-    ('symengine-dir=', None, 'path to symengine installation or build directory'),
+    ('symengine-dir=', None,
+     'path to symengine installation or build directory'),
     ('generator=', None, 'cmake build generator'),
     ('build-type=', None, 'build type: Release or Debug'),
     ('define=', 'D',
      'options to cmake <var>:<type>=<value>'),
 ]
 
+
 class BuildWithCmake(_build):
     sub_commands = [('build_ext', None)]
 
+
 class BuildExtWithCmake(_build_ext):
     _build_opts = _build_ext.user_options
     user_options = list(global_user_options)
@@ -98,22 +105,25 @@ def cmake_build(self):
         if build_dir != source_dir and path.exists("CMakeCache.txt"):
             os.remove("CMakeCache.txt")
 
-        cmake_cmd = ["cmake", source_dir, "-DCMAKE_BUILD_TYPE=" + cmake_build_type[0]]
+        cmake_cmd = ["cmake", source_dir,
+                     "-DCMAKE_BUILD_TYPE=" + cmake_build_type[0]]
         cmake_cmd.extend(process_opts(cmake_opts))
         if not path.exists(path.join(build_dir, "CMakeCache.txt")):
             cmake_cmd.extend(self.get_generator())
         if subprocess.call(cmake_cmd, cwd=build_dir) != 0:
             raise EnvironmentError("error calling cmake")
 
-        if subprocess.call(["cmake", "--build", ".", "--config", cmake_build_type[0]],
-                cwd=build_dir) != 0:
+        if subprocess.call(["cmake", "--build", ".",
+                            "--config", cmake_build_type[0]],
+                           cwd=build_dir) != 0:
             raise EnvironmentError("error building project")
 
     def get_generator(self):
         if cmake_generator[0]:
             return ["-G", cmake_generator[0]]
         else:
-            import platform, sys
+            import platform
+            import sys
             if (platform.system() == "Windows"):
                 compiler = str(self.compiler).lower()
                 if ("msys" in compiler):
@@ -128,9 +138,11 @@ def get_generator(self):
 
     def run(self):
         self.cmake_build()
-        # can't use super() here because _build_ext is an old style class in 2.7
+        # can't use super() here because
+        #  _build_ext is an old style class in 2.7
         _build_ext.run(self)
 
+
 class InstallWithCmake(_install):
     _install_opts = _install.user_options
     user_options = list(global_user_options)
@@ -157,7 +169,8 @@ def finalize_options(self):
 
         cmake_build_type[0] = self.build_type
         cmake_opts.extend([('PYTHON_INSTALL_PATH', self.install_platlib)])
-        cmake_opts.extend([('PYTHON_INSTALL_HEADER_PATH', self.install_headers)])
+        cmake_opts.extend([('PYTHON_INSTALL_HEADER_PATH',
+                            self.install_headers)])
 
     def cmake_install(self):
         source_dir = path.dirname(path.realpath(__file__))
@@ -170,8 +183,10 @@ def cmake_install(self):
         if subprocess.call(cmake_cmd, cwd=build_dir) != 0:
             raise EnvironmentError("error calling cmake")
 
-        if subprocess.call(["cmake", "--build", ".", "--config", cmake_build_type[0], "--target", "install"],
-                cwd=build_dir) != 0:
+        if subprocess.call(["cmake", "--build", ".",
+                            "--config", cmake_build_type[0],
+                            "--target", "install"],
+                           cwd=build_dir) != 0:
             raise EnvironmentError("error installing")
 
         import compileall
@@ -182,24 +197,25 @@ def run(self):
         _install.run(self)
         self.cmake_install()
 
+
 long_description = '''
 SymEngine is a standalone fast C++ symbolic manipulation library.
 Optional thin Python wrappers (SymEngine) allow easy usage from Python and
 integration with SymPy and Sage.'''
 
-setup(name = "symengine",
+setup(name="symengine",
       version="0.2.1.dev",
-      description = "Python library providing wrappers to SymEngine",
-      setup_requires = ['cython>=0.19.1'],
-      long_description = long_description,
-      author = "SymEngine development team",
-      author_email = "[email protected]",
-      license = "MIT",
-      url = "https://github.com/symengine/symengine.py",
+      description="Python library providing wrappers to SymEngine",
+      setup_requires=['cython>=0.19.1'],
+      long_description=long_description,
+      author="SymEngine development team",
+      author_email="[email protected]",
+      license="MIT",
+      url="https://github.com/symengine/symengine.py",
       cmdclass={
-          'build' : BuildWithCmake,
-          'build_ext' : BuildExtWithCmake,
-          'install' : InstallWithCmake,
+          'build': BuildWithCmake,
+          'build_ext': BuildExtWithCmake,
+          'install': InstallWithCmake,
           },
       classifiers=[
         'License :: OSI Approved :: MIT License',
@@ -213,4 +229,4 @@ def run(self):
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         ]
-    )
+      )

symengine/CMakeLists.txt

@@ -2,6 +2,6 @@ add_subdirectory(lib)
 add_subdirectory(tests)
 
 set(PY_PATH ${PYTHON_INSTALL_PATH}/symengine)
-install(FILES __init__.py utilities.py compatibility.py sympy_compat.py
+install(FILES __init__.py utilities.py compatibility.py sympy_compat.py functions.py
     DESTINATION ${PY_PATH}
     )

symengine/__init__.py

@@ -1,12 +1,15 @@
-from .lib.symengine_wrapper import (Symbol, Integer, sympify, SympifyError,
-        Add, Mul, Pow, exp, log, gamma, sqrt, function_symbol, I, E, pi,
-        have_mpfr, have_mpc, have_flint, have_piranha, have_llvm,
-        RealDouble, ComplexDouble, DenseMatrix, Matrix,
-        sin, cos, tan, cot, csc, sec, asin, acos, atan, acot, acsc, asec,
-        sinh, cosh, tanh, coth, asinh, acosh, atanh, acoth, Lambdify,
-        LambdifyCSE, DictBasic, series, symarray, diff, zeros, eye, diag,
-        ones, zeros, add, expand, has_symbol, UndefFunction)
+from .lib.symengine_wrapper import (Symbol, sympify as S, sympify,
+        SympifyError, Add, Mul, Pow, function_symbol, I, E, pi, oo,
+        zoo, nan, have_mpfr, have_mpc, have_flint, have_piranha,
+        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)
 from .utilities import var, symbols
+from .functions import *
 
 if have_mpfr:
     from .lib.symengine_wrapper import RealMPFR
@@ -16,7 +19,9 @@
 
 __version__ = "0.2.1.dev"
 
+
 def test():
-    import pytest, os
+    import pytest
+    import os
     return not pytest.cmdline.main(
         [os.path.dirname(os.path.abspath(__file__))])

symengine/functions.py

@@ -0,0 +1,5 @@
+from .lib.symengine_wrapper import (sin, cos, tan, cot, csc, sec,
+    asin, acos, atan, acot, acsc, asec,
+    sinh, cosh, tanh, coth, sech, csch,
+    asinh, acosh, atanh, acoth, asech, acsch,
+    gamma, log, atan2, sqrt, exp, Abs)