PySMT 0.9.7.dev333__tar.gz → 0.9.7.dev346__tar.gz

pysmt-0.9.7.dev346/PKG-INFO

@@ -0,0 +1,58 @@
+Metadata-Version: 2.4
+Name: PySMT
+Version: 0.9.7.dev346
+Summary: A solver-agnostic library for SMT Formulae manipulation and solving
+Home-page: http://www.pysmt.org
+Author: PySMT Team
+Author-email: info@pysmt.org
+License: APACHE
+License-File: LICENSE
+License-File: NOTICE
+Dynamic: author
+Dynamic: author-email
+Dynamic: description
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: summary
+
+============================================================
+ pySMT: A library for SMT formulae manipulation and solving
+============================================================
+
+pySMT makes working with Satisfiability Modulo Theory simple.
+
+Among others, you can:
+
+* Define formulae in a solver independent way in a simple and
+  inutitive way,
+* Write ad-hoc simplifiers and operators,
+* Dump your problems in the SMT-Lib format,
+* Solve them using one of the native solvers, or by wrapping any
+  SMT-Lib complaint solver.
+
+Supported Theories and Solvers
+==============================
+pySMT provides methods to define a formula in Linear Real Arithmetic (LRA),
+Real Difference Logic (RDL), their combination (LIRA),
+Equalities and Uninterpreted Functions (EUF), Bit-Vectors (BV), and Arrays (A).
+The following solvers are supported through native APIs:
+
+* MathSAT (http://mathsat.fbk.eu/)
+* Z3 (https://github.com/Z3Prover/z3/)
+* cvc5 (https://cvc5.github.io/)
+* Yices 2 (http://yices.csl.sri.com/)
+* CUDD (http://vlsi.colorado.edu/~fabio/CUDD/)
+* PicoSAT (http://fmv.jku.at/picosat/)
+* Boolector (http://fmv.jku.at/boolector/)
+
+Additionally, you can use any SMT-LIB 2 compliant solver.
+
+PySMT assumes that the python bindings for the SMT Solver are installed and
+accessible from your PYTHONPATH.
+
+
+Wanna know more?
+================
+
+Visit http://www.pysmt.org

pysmt-0.9.7.dev346/PySMT.egg-info/PKG-INFO

@@ -0,0 +1,58 @@
+Metadata-Version: 2.4
+Name: PySMT
+Version: 0.9.7.dev346
+Summary: A solver-agnostic library for SMT Formulae manipulation and solving
+Home-page: http://www.pysmt.org
+Author: PySMT Team
+Author-email: info@pysmt.org
+License: APACHE
+License-File: LICENSE
+License-File: NOTICE
+Dynamic: author
+Dynamic: author-email
+Dynamic: description
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: summary
+
+============================================================
+ pySMT: A library for SMT formulae manipulation and solving
+============================================================
+
+pySMT makes working with Satisfiability Modulo Theory simple.
+
+Among others, you can:
+
+* Define formulae in a solver independent way in a simple and
+  inutitive way,
+* Write ad-hoc simplifiers and operators,
+* Dump your problems in the SMT-Lib format,
+* Solve them using one of the native solvers, or by wrapping any
+  SMT-Lib complaint solver.
+
+Supported Theories and Solvers
+==============================
+pySMT provides methods to define a formula in Linear Real Arithmetic (LRA),
+Real Difference Logic (RDL), their combination (LIRA),
+Equalities and Uninterpreted Functions (EUF), Bit-Vectors (BV), and Arrays (A).
+The following solvers are supported through native APIs:
+
+* MathSAT (http://mathsat.fbk.eu/)
+* Z3 (https://github.com/Z3Prover/z3/)
+* cvc5 (https://cvc5.github.io/)
+* Yices 2 (http://yices.csl.sri.com/)
+* CUDD (http://vlsi.colorado.edu/~fabio/CUDD/)
+* PicoSAT (http://fmv.jku.at/picosat/)
+* Boolector (http://fmv.jku.at/boolector/)
+
+Additionally, you can use any SMT-LIB 2 compliant solver.
+
+PySMT assumes that the python bindings for the SMT Solver are installed and
+accessible from your PYTHONPATH.
+
+
+Wanna know more?
+================
+
+Visit http://www.pysmt.org

{PySMT-0.9.7.dev333 → pysmt-0.9.7.dev346}/PySMT.egg-info/entry_points.txt

@@ -1,3 +1,2 @@
 [console_scripts]
 pysmt-install = pysmt.cmd.install:main
-

{PySMT-0.9.7.dev333 → pysmt-0.9.7.dev346}/pysmt/__init__.py

@@ -16,7 +16,7 @@
 #   limitations under the License.
 #
 
-VERSION = (0, 9, 7, "dev", 333)
+VERSION = (0, 9, 7, "dev", 346)
 
 # Try to provide human-readable version of latest commit for dev versions
 # E.g. v0.5.1-4-g49a49f2-wip

{PySMT-0.9.7.dev333 → pysmt-0.9.7.dev346}/pysmt/cmd/install.py

@@ -32,8 +32,8 @@ from pysmt import __version__ as pysmt_version
 Installer = namedtuple("Installer",
                        ["InstallerClass", "version", "extra_params"])
 INSTALLERS = [
-    Installer(MSatInstaller,    "5.6.10", {}),
-    Installer(CVC5Installer,    "1.1.2", {}),
+    Installer(MSatInstaller,    "5.6.16", {}),
+    Installer(CVC5Installer,    "1.3.3", {}),
     Installer(CVC4Installer,    "1.7-prerelease",
               {"git_version" : "391ab9df6c3fd9a3771864900c1718534c1e4666"}),
     Installer(Z3Installer,      "4.15.0", {}),

{PySMT-0.9.7.dev333 → pysmt-0.9.7.dev346}/pysmt/cmd/installers/base.py

@@ -231,6 +231,16 @@ class SolverInstaller(object):
                 stderr.close()
 
 
+    @staticmethod
+    def replace_in_file(file_path, old_str, new_str):
+        """Replaces all occurrences of old_str with new_str in the given file"""
+        with open(file_path, "r") as f:
+            content = f.read()
+        content = content.replace(old_str, new_str)
+        with open(file_path, "w") as f:
+            f.write(content)
+
+
     @staticmethod
     def clean_dir(path):
         """Empties a (possibly non-existent) directory"""

{PySMT-0.9.7.dev333 → pysmt-0.9.7.dev346}/pysmt/cmd/installers/msat.py

@@ -34,14 +34,14 @@ class MSatInstaller(SolverInstaller):
                 "ext": "tar.gz"
         }
         if self.os_name == "windows":
+            archive_name_template = "mathsat-{version}-{os}.{ext}"
             format["ext"] = "zip"
-            format["arch"] = "msvc"
-            format["os"] = "win64" if self.architecture == "x86_64" else "win32"
+            format["os"] = "win64"
         elif self.os_name == "darwin":
             # Since version 5.6.7 the architecture is not included in the
             # pkg name for the OSX release as it is considered a "univeral binary"
             archive_name_template = "mathsat-{version}-{os}.{ext}"
-            format["os"] = "osx"
+            format["os"] = "macos"
 
         archive_name = archive_name_template.format(**format)
 
@@ -61,19 +61,25 @@ class MSatInstaller(SolverInstaller):
         if self.os_name == "windows":
             libdir = os.path.join(self.python_bindings_dir, "../lib")
             incdir = os.path.join(self.python_bindings_dir, "../include")
-            gmp_h_url = "https://github.com/mikand/tamer-windows-deps/raw/master/gmp/include/gmp.h"
-            mpir_dll_url = "https://github.com/Legrandin/mpir-windows-builds/blob/master/mpir-2.6.0_VS2015_%s/mpir.dll?raw=true" % self.bits
-            mpir_lib_url = "https://github.com/Legrandin/mpir-windows-builds/blob/master/mpir-2.6.0_VS2015_%s/mpir.lib?raw=true" % self.bits
-            setup_py_win_url = "https://github.com/pysmt/solvers_patches/raw/master/mathsat/setup-win.py"
-
-            SolverInstaller.do_download(gmp_h_url, os.path.join(incdir, "gmp.h"))
-            SolverInstaller.do_download(mpir_dll_url, os.path.join(libdir, "mpir.dll"))
-            SolverInstaller.do_download(mpir_lib_url, os.path.join(libdir, "mpir.lib"))
 
-            # Overwrite setup.py with the patched version
-            setup_py = os.path.join(self.python_bindings_dir, "setup.py")
-            SolverInstaller.mv(setup_py, setup_py + ".original")
-            SolverInstaller.do_download(setup_py_win_url, setup_py)
+            gmp_win_url = "https://github.com/apotocki/gmp-win/releases/download/6.3.0/gmp-6.3.0.zip"
+            gmp_archive = os.path.join(self.base_dir, "gmp-6.3.0.zip")
+            gmp_dir = os.path.join(self.base_dir, "gmp-6.3.0")
+            SolverInstaller.clean_dir(gmp_dir)
+            SolverInstaller.do_download(url=gmp_win_url, file_name=gmp_archive)
+            SolverInstaller.unzip(gmp_archive, gmp_dir)
+
+            gmp_include_dir = os.path.join(self.base_dir, "gmp-6.3.0", "include")
+            gmp_lib_dir = os.path.join(self.base_dir, "gmp-6.3.0", "lib")
+            # gmp_dll_dir = os.path.join(self.base_dir, "gmp-6.3.0", "bin")
+            SolverInstaller.mv(os.path.join(gmp_include_dir, "gmp.h"), incdir)
+            SolverInstaller.mv(source=os.path.join(gmp_lib_dir, "gmpdll.lib"),
+                               dest=os.path.join(libdir, "gmp.lib"))
+
+            # The MathSAT setup.py expects to link against "mpir" on Windows,
+            # but we link against "gmp", so we need to patch the setup.py
+            setup_py_path = os.path.join(self.python_bindings_dir, "setup.py")
+            SolverInstaller.replace_in_file(setup_py_path, "mpir", "gmp")
 
         # Run setup.py to compile the bindings
         if self.os_name in {"windows", "darwin"}:
@@ -89,11 +95,11 @@ class MSatInstaller(SolverInstaller):
         pdir = self.python_bindings_dir
         bdir = os.path.join(pdir, "build")
         sodir = glob.glob(bdir + "/lib.*")[0]
-        libdir = os.path.join(self.python_bindings_dir, "../lib")
+        libdir = os.path.join(self.python_bindings_dir, "../bin")
 
         # First, we need the SWIG-generated wrapper
         for f in os.listdir(sodir):
-            if f.endswith(".so") or f.endswith(".pyd"):
+            if "_mathsat" in f:
                 SolverInstaller.mv(os.path.join(sodir, f), self.bindings_dir)
         SolverInstaller.mv(os.path.join(pdir, "mathsat.py"), self.bindings_dir)
 
@@ -103,7 +109,7 @@ class MSatInstaller(SolverInstaller):
             if f.endswith(".so") or f.endswith(".dll") or f.endswith(".dylib"):
                 SolverInstaller.mv(os.path.join(libdir, f), self.bindings_dir)
 
-        # Fix issue in MathSAT 5.6.10 linking to incorrect directory on OSX
+        # Fix issue in MathSAT 5.6.10 linking to incorrect directory on MacOS
         if self.os_name == "darwin":
             soname = glob.glob(self.bindings_dir + "/_mathsat*.so")[0]
             old_path = "/Users/alb/src/release/build/libmathsat.dylib"

{PySMT-0.9.7.dev333 → pysmt-0.9.7.dev346}/pysmt/cmd/installers/optimsat.py

@@ -37,7 +37,7 @@ class OptiMSatInstaller(SolverInstaller):
         archive_name = "optimathsat-%s-%s-%s.%s" % (solver_version, os_name,
                                                     arch, ext)
 
-        native_link = "http://optimathsat.disi.unitn.it/releases/optimathsat-%s/{archive_name}" % solver_version
+        native_link = "https://optimathsat.disi.unitn.it/releases/optimathsat-%s/{archive_name}" % solver_version
 
         SolverInstaller.__init__(self, install_dir=install_dir,
                                  bindings_dir=bindings_dir,

{PySMT-0.9.7.dev333 → pysmt-0.9.7.dev346}/pysmt/cmd/installers/pico.py

@@ -11,9 +11,10 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-import sys, os
+import os
 import json
 import codecs
+import glob
 
 import urllib.request
 
@@ -59,10 +60,8 @@ class PicoSATInstaller(SolverInstaller):
         SolverInstaller.run_python("setup.py build", directory=self.extract_path)
 
     def move(self):
-        libdir = "lib.%s-%s-%s" % (self.os_name, self.architecture,
-                                   self.python_version)
         bdir = os.path.join(self.extract_path, "build")
-        sodir = os.path.join(bdir, libdir)
+        sodir = glob.glob(bdir + "/lib.*")[0]
 
         for f in os.listdir(sodir):
             if f.endswith(".so"):

{PySMT-0.9.7.dev333 → pysmt-0.9.7.dev346}/pysmt/factory.py

@@ -321,10 +321,11 @@ class Factory(object):
             from pysmt.solvers.msat import (MSatFMQuantifierEliminator,
                                             MSatLWQuantifierEliminator)
             try:
-                MSatFMQuantifierEliminator()
-                MSatLWQuantifierEliminator()
-            except:
+                MSatFMQuantifierEliminator(self.environment)
+                MSatLWQuantifierEliminator(self.environment)
+            except NotImplementedError:
                 raise SolverAPINotFound
+
             self._all_qelims['msat_fm'] = MSatFMQuantifierEliminator
             self._all_qelims['msat_lw'] = MSatLWQuantifierEliminator
         except SolverAPINotFound:
@@ -335,6 +336,12 @@ class Factory(object):
             MSATLibLoader("optimathsat")
             from pysmt.optimization.optimsat import (OptiMSATFMQuantifierEliminator,
                                                      OptiMSATLWQuantifierEliminator)
+            try:
+                OptiMSATFMQuantifierEliminator(self.environment)
+                OptiMSATLWQuantifierEliminator(self.environment)
+            except NotImplementedError:
+                raise SolverAPINotFound
+
             self._all_qelims['optimsat_fm'] = OptiMSATFMQuantifierEliminator
             self._all_qelims['optimsat_lw'] = OptiMSATLWQuantifierEliminator
         except SolverAPINotFound:
@@ -397,8 +404,6 @@ class Factory(object):
             self._all_optimizers['optimsat'] = OptiMSATSolver
         except SolverAPINotFound:
             pass
-        except SolverAPINotFound:
-            pass
 
         try:
             from pysmt.optimization.yices import YicesSUAOptimizer, YicesIncrementalOptimizer