Merge pull request #3641 from sadavis1/mbigm-parallel

Enable parallel big-M calculation for gdp.mbigm transformation

Author: blnicho

doc/OnlineDocs/reference/bibliography.rst

@@ -154,5 +154,9 @@ Bibliography
    Models for Non-separable Piecewise Linear Optimization: Unifying
    framework and Extensions", *Operations Research* 58(2), 303-315. 2010.
 
+.. [Vie15] J. P. Vielma. "Mixed Integer Linear Programming Formluation
+   Techniques", *SIAM Review*, 57(1), 3-57.  2015.  DOI
+   `10.1137/130915303 <https://doi.org/10.1137/130915303>`_
+
 .. [NW99] Nocedal, Jorge, and Stephen J. Wright, eds. Numerical
    optimization. New York, NY: Springer New York, 1999.

pyomo/common/config.py

@@ -1411,7 +1411,7 @@ class UninitializedMixin(object):
     attempt to access the ``_data`` will trigger the initialization of the
     Config object from its ``_default`` value.  Setting the ``_data``
     attribute will also trigger resolution of the Config object, but
-    without processing the ``_default__``.
+    without processing the ``_default``.
 
     """
 
@@ -1449,7 +1449,7 @@ def _data(self, value):
         # recursively lookup the _data attribute and the second lookup
         # will resolve to normal attribute assignment).
         #
-        # We first encountered this issue for Config objects stores as
+        # We first encountered this issue for Config objects stored as
         # class attributes (i.e., the default Config for something like
         # a solver or writer) and multiple threads were simultaneously
         # creating instances of the class (each of which was resolving
@@ -1628,7 +1628,12 @@ def set_default_value(self, default):
 
     def set_domain(self, domain):
         self._domain = domain
-        self.set_value(self.value(accessValue=False))
+        # Note that the domain is generally a callable (type, function,
+        # or functor).  However, ConfigDict can also have a str domain
+        # (because ConfigDict doesn't need/use an actual domain for
+        # validation, we re-use that slot to *document* the domain).
+        if domain.__class__ is not str:
+            self.set_value(self.value(accessValue=False))
 
     def _cast(self, value):
         if value is None:

pyomo/gdp/plugins/bigm_mixin.py

@@ -9,12 +9,16 @@
 #  This software is distributed under the 3-clause BSD License.
 #  ___________________________________________________________________________
 
+import logging
+
 from pyomo.gdp import GDP_Error
 from pyomo.common.collections import ComponentSet
 from pyomo.contrib.fbbt.expression_bounds_walker import ExpressionBoundsVisitor
 import pyomo.contrib.fbbt.interval as interval
 from pyomo.core import Suffix
 
+logger = logging.getLogger(__name__)
+
 
 def _convert_M_to_tuple(M, constraint, disjunct=None):
     if not isinstance(M, (tuple, list)):
@@ -23,7 +27,7 @@ def _convert_M_to_tuple(M, constraint, disjunct=None):
         else:
             try:
                 M = (-M, M)
-            except:
+            except Exception:
                 logger.error(
                     "Error converting scalar M-value %s "
                     "to (-M,M).  Is %s not a numeric type?" % (M, type(M))