Merge pull request #3792 from jsiirola/ipopt-sol-parser

Update Ipopt interface in `contrib.solver`

Author: blnicho

pyomo/common/tempfiles.py

@@ -270,7 +270,7 @@ def __enter__(self):
     def __exit__(self, exc_type, exc_val, exc_tb):
         self.release()
 
-    def mkstemp(self, suffix=None, prefix=None, dir=None, text=False):
+    def mkstemp(self, suffix=None, prefix=None, dir=None, text=False, delete=True):
         """Create a unique temporary file using :func:`tempfile.mkstemp`
 
         Parameters are handled as in :func:`tempfile.mkstemp`, with
@@ -289,10 +289,11 @@ def mkstemp(self, suffix=None, prefix=None, dir=None, text=False):
         dir = self._resolve_tempdir(dir)
         # Note: ans == (fd, fname)
         ans = tempfile.mkstemp(suffix=suffix, prefix=prefix, dir=dir, text=text)
-        self.tempfiles.append(ans)
+        if delete:
+            self.tempfiles.append(ans)
         return ans
 
-    def mkdtemp(self, suffix=None, prefix=None, dir=None):
+    def mkdtemp(self, suffix=None, prefix=None, dir=None, delete=True):
         """Create a unique temporary directory using :func:`tempfile.mkdtemp`
 
         Parameters are handled as in :func:`tempfile.mkdtemp`, with
@@ -307,7 +308,8 @@ def mkdtemp(self, suffix=None, prefix=None, dir=None):
         """
         dir = self._resolve_tempdir(dir)
         dname = tempfile.mkdtemp(suffix=suffix, prefix=prefix, dir=dir)
-        self.tempfiles.append((None, dname))
+        if delete:
+            self.tempfiles.append((None, dname))
         return dname
 
     def gettempdir(self):

pyomo/common/tests/test_tempfile.py

@@ -284,6 +284,32 @@ def test_mkstemp(self):
         os.close(fd)
         context.release()
 
+    def test_mktemp_delete(self):
+        with self.TM.new_context() as context:
+            dname = context.mkdtemp()
+            with self.TM.new_context() as subcontext:
+                fd, fname1 = subcontext.mkstemp(dir=dname)
+                fd, fname2 = subcontext.mkstemp(dir=dname, delete=False)
+                # Note: because the context manager isn't going to
+                # delete fname2, we need to explicitly close the file
+                # here...
+                os.close(fd)
+                dname1 = subcontext.mkdtemp(dir=dname)
+                dname2 = subcontext.mkdtemp(dir=dname, delete=False)
+
+                self.assertTrue(os.path.exists(fname1))
+                self.assertTrue(os.path.exists(fname2))
+                self.assertTrue(os.path.exists(dname1))
+                self.assertTrue(os.path.exists(dname2))
+            self.assertFalse(os.path.exists(fname1))
+            self.assertTrue(os.path.exists(fname2))
+            self.assertFalse(os.path.exists(dname1))
+            self.assertTrue(os.path.exists(dname2))
+        self.assertFalse(os.path.exists(fname1))
+        self.assertFalse(os.path.exists(fname2))
+        self.assertFalse(os.path.exists(dname1))
+        self.assertFalse(os.path.exists(dname2))
+
     def test_create_tempdir(self):
         context = self.TM.push()
         fname = self.TM.create_tempdir("suffix", "prefix")

pyomo/contrib/solver/__init__.py

@@ -37,4 +37,10 @@
     version='6.9.2',
 )
 
+moved_module(
+    'pyomo.contrib.solver.solvers.sol_reader',
+    'pyomo.contrib.solver.solvers.asl_sol_reader',
+    version='6.10.0.dev0',
+)
+
 del _module, moved_module

pyomo/contrib/solver/common/results.py

@@ -112,6 +112,9 @@ class SolutionStatus(enum.Enum):
     solutions was returned.
     """
 
+    unknown = 5
+    "Solution returned, but feasibility/optimality unknown."
+
     infeasible = 10
     "Solution point does not satisfy some domains and/or constraints."
 

pyomo/contrib/solver/common/util.py

@@ -15,6 +15,11 @@
 from pyomo.core.base.objective import Objective
 
 
+class SolverError(PyomoException):
+    """General error raised by Pyomo solver interfaces when processing
+    Solver results."""
+
+
 class NoFeasibleSolutionError(PyomoException):
     default_message = (
         'A feasible solution was not found, so no solution can be loaded. '