Change implementation: make private-esque attribute that user can alter

pyomo/contrib/appsi/solvers/ipopt.py

@@ -42,7 +42,6 @@
 import os
 from pyomo.contrib.appsi.cmodel import cmodel_available
 from pyomo.core.staleflag import StaleFlagManager
-from pyomo.opt.base import subprocess_timeout
 
 
 logger = logging.getLogger(__name__)
@@ -148,6 +147,7 @@ def __init__(self, only_child_vars=False):
         self._primal_sol = ComponentMap()
         self._reduced_costs = ComponentMap()
         self._last_results_object: Optional[Results] = None
+        self._version_timeout = 2
 
     def available(self):
         if self.config.executable.path() is None:
@@ -159,7 +159,7 @@ def available(self):
     def version(self):
         results = subprocess.run(
             [str(self.config.executable), '--version'],
-            timeout=subprocess_timeout,
+            timeout=self._version_timeout,
             stdout=subprocess.PIPE,
             stderr=subprocess.STDOUT,
             universal_newlines=True,

pyomo/contrib/solver/ipopt.py

@@ -39,7 +39,6 @@
 from pyomo.core.expr.numvalue import value
 from pyomo.core.base.suffix import Suffix
 from pyomo.common.collections import ComponentMap
-from pyomo.opt.base import subprocess_timeout
 
 logger = logging.getLogger(__name__)
 
@@ -207,6 +206,7 @@ def __init__(self, **kwds):
         self._writer = NLWriter()
         self._available_cache = None
         self._version_cache = None
+        self._version_timeout = 2
 
     def available(self, config=None):
         if config is None:
@@ -229,7 +229,7 @@ def version(self, config=None):
             else:
                 results = subprocess.run(
                     [str(pth), '--version'],
-                    timeout=subprocess_timeout,
+                    timeout=self._version_timeout,
                     stdout=subprocess.PIPE,
                     stderr=subprocess.STDOUT,
                     universal_newlines=True,

pyomo/opt/base/__init__.py

@@ -22,5 +22,3 @@
 from pyomo.opt.base.results import ReaderFactory, AbstractResultsReader
 from pyomo.opt.base.problem import AbstractProblemWriter, BranchDirection, WriterFactory
 from pyomo.opt.base.formats import ProblemFormat, ResultsFormat, guess_format
-
-subprocess_timeout = 2

pyomo/opt/solver/shellcmd.py

@@ -60,6 +60,7 @@ def __init__(self, **kwargs):
         # a solver plugin may not report execution time.
         self._last_solve_time = None
         self._define_signal_handlers = None
+        self._version_timeout = 2
 
         if executable is not None:
             self.set_executable(name=executable, validate=validate)

pyomo/solvers/plugins/solvers/CONOPT.py

@@ -16,7 +16,7 @@
 from pyomo.common.collections import Bunch
 from pyomo.common.tempfiles import TempfileManager
 
-from pyomo.opt.base import ProblemFormat, ResultsFormat, subprocess_timeout
+from pyomo.opt.base import ProblemFormat, ResultsFormat
 from pyomo.opt.base.solvers import _extract_version, SolverFactory
 from pyomo.opt.results import SolverStatus
 from pyomo.opt.solver import SystemCallSolver
@@ -79,7 +79,7 @@ def _get_version(self):
             return _extract_version('')
         results = subprocess.run(
             [solver_exec],
-            timeout=subprocess_timeout,
+            timeout=self._version_timeout,
             stdout=subprocess.PIPE,
             stderr=subprocess.STDOUT,
             universal_newlines=True,

pyomo/solvers/plugins/solvers/CPLEX.py

@@ -21,13 +21,7 @@
 from pyomo.common.tempfiles import TempfileManager
 
 from pyomo.common.collections import ComponentMap, Bunch
-from pyomo.opt.base import (
-    ProblemFormat,
-    ResultsFormat,
-    OptSolver,
-    BranchDirection,
-    subprocess_timeout,
-)
+from pyomo.opt.base import ProblemFormat, ResultsFormat, OptSolver, BranchDirection
 from pyomo.opt.base.solvers import _extract_version, SolverFactory
 from pyomo.opt.results import (
     SolverResults,
@@ -410,7 +404,7 @@ def _get_version(self):
             return _extract_version('')
         results = subprocess.run(
             [solver_exec, '-c', 'quit'],
-            timeout=subprocess_timeout,
+            timeout=self._version_timeout,
             stdout=subprocess.PIPE,
             stderr=subprocess.STDOUT,
             universal_newlines=True,

pyomo/solvers/plugins/solvers/GLPK.py

@@ -19,6 +19,7 @@
 
 from pyomo.common import Executable
 from pyomo.common.collections import Bunch
+from pyomo.common.errors import ApplicationError
 from pyomo.opt import (
     SolverFactory,
     OptSolver,
@@ -29,7 +30,6 @@
     SolutionStatus,
     ProblemSense,
 )
-from pyomo.opt.base import subprocess_timeout
 from pyomo.opt.base.solvers import _extract_version
 from pyomo.opt.solver import SystemCallSolver
 from pyomo.solvers.mockmip import MockMIP
@@ -138,7 +138,7 @@ def _get_version(self, executable=None):
             [executable, "--version"],
             stdout=subprocess.PIPE,
             stderr=subprocess.STDOUT,
-            timeout=subprocess_timeout,
+            timeout=self._version_timeout,
             universal_newlines=True,
         )
         return _extract_version(result.stdout)

pyomo/solvers/plugins/solvers/IPOPT.py

@@ -16,7 +16,7 @@
 from pyomo.common.collections import Bunch
 from pyomo.common.tempfiles import TempfileManager
 
-from pyomo.opt.base import ProblemFormat, ResultsFormat, subprocess_timeout
+from pyomo.opt.base import ProblemFormat, ResultsFormat
 from pyomo.opt.base.solvers import _extract_version, SolverFactory
 from pyomo.opt.results import SolverStatus, SolverResults, TerminationCondition
 from pyomo.opt.solver import SystemCallSolver
@@ -79,7 +79,7 @@ def _get_version(self):
             return _extract_version('')
         results = subprocess.run(
             [solver_exec, "-v"],
-            timeout=subprocess_timeout,
+            timeout=self._version_timeout,
             stdout=subprocess.PIPE,
             stderr=subprocess.STDOUT,
             universal_newlines=True,

pyomo/solvers/plugins/solvers/SCIPAMPL.py

@@ -18,7 +18,7 @@
 from pyomo.common.collections import Bunch
 from pyomo.common.tempfiles import TempfileManager
 
-from pyomo.opt.base import ProblemFormat, ResultsFormat, subprocess_timeout
+from pyomo.opt.base import ProblemFormat, ResultsFormat
 from pyomo.opt.base.solvers import _extract_version, SolverFactory
 from pyomo.opt.results import (
     SolverStatus,
@@ -103,7 +103,7 @@ def _get_version(self, solver_exec=None):
                 return _extract_version('')
         results = subprocess.run(
             [solver_exec, "--version"],
-            timeout=subprocess_timeout,
+            timeout=self._version_timeout,
             stdout=subprocess.PIPE,
             stderr=subprocess.STDOUT,
             universal_newlines=True,