Merge branch 'main' into main

Author: mrmundt

.coin-or/projDesc.xml

@@ -227,8 +227,8 @@ Carl D. Laird, Chair, Pyomo Management Committee, claird at andrew dot cmu dot e
 			     Use explicit overrides to disable use of automated
 			     version reporting.
 			-->
-			<stableVersionNumber>6.9.1</stableVersionNumber>
-			<releaseNumber>6.9.1</releaseNumber>
+			<stableVersionNumber>6.9.2</stableVersionNumber>
+			<releaseNumber>6.9.2</releaseNumber>
 
 		</developmentStatus>
 

CHANGELOG.md

@@ -1,6 +1,54 @@
 Pyomo CHANGELOG
 ===============
 
+-------------------------------------------------------------------------------
+Pyomo 6.9.2   (16 Apr 2025)
+-------------------------------------------------------------------------------
+
+- General
+  - Update Copyright to 2025 (#3515)
+  - `capture_output`: do not output to captured file descriptors (#3537, #3560)
+  - `calc_variable_from_constraint`: guard against expression overflow (#3541)
+  - Standardize the usage of pyomo.environ imports (#3545)
+  - Update ASL CMake builders (#3548)
+  - Support passing LoggerAdapter objects to LogStream (#3547)
+- Core
+  - Support multi-column DataFrames in Initializer (#3552)
+  - Multiple dispatch for relational expression generation (#3483)
+  - Type check `exception` args in component `__call__` implementations (#3538)
+- Documentation
+  - Move RTD ads to the sidebar (#3536)
+  - Standardize Example Imports (#3543)
+  - LD-SDA Documentation (#3539)
+  - Fix broken URLs in documentation (#3529, #3544)
+  - Update future solver interface documentation (#3526)
+  - Document `BlockData.clone` (#3542)
+- Solver Interfaces
+  - Fix bug in `XpressPersistent.update_var` (#3566)
+  - Avoid duplicate `AMPLFUNC` entries in `ipopt_v2` (#3554)
+  - Update deprecation warnings in `contrib.solver` (#3553, #3555)
+  - Support for upcoming knitro python package (#3478)
+  - Future solver interface reorganization and updates (#3476)
+  - Update HiGHS interface to allow keyboard interrupts (#3509, #3511)
+  - Fix/extend MOSEK option handling (#3488)
+- Testing
+  - Defer `pathlib` import, remove test output file (#3563)
+  - Add IDAES Solvers to Mac; Update to Ubuntu 22.04 (#3556)
+  - Clean up numeric_expr dispatcher test driver (#3551)
+  - Testing and coverage fixes (#3549)
+  - Resolve intermittent test failure (increase sleep time) (#3517)
+  - Be more careful when/how we timeout conda install (#3514)
+- Contributed Packages
+  - cspline_external: Add a function for cubic spline interpolation (#3216)
+  - DoE: Correct initialization when using lower diagonal of FIM (#3532)
+  - FBBT: Resolve bug registering native type handlers (#3567)
+  - parmest/DoE: Ordering and param bug fixes (#3512)
+  - PyNumero: Add support for greybox models (#3364)
+  - PyROS: Modify Decision Rule Order Efficiency (#3562)
+  - PyROS: Revise second-stage equality reformulation under discrete
+    (scenario-based) uncertainty (#3533)
+  - PyROS: Add Uncertain Parameter Reduction (#3503)
+
 -------------------------------------------------------------------------------
 Pyomo 6.9.1   (5 Mar 2025)
 -------------------------------------------------------------------------------
@@ -34,7 +82,7 @@ Pyomo 6.9.0   (21 Feb 2025)
   - Resolve error parenthesizing pow mantissa (#3472)
   - Resolve OSX error accessing closed filehandle (#3467)
   - Allow construction of CUID from another CUID (#3464)
-  - Clean up `identify_variables` / `identify_mutable_parameters`; 
+  - Clean up `identify_variables` / `identify_mutable_parameters`;
     deprecate `SimpleExpressionVisitor` (#3436)
 - Solver Interfaces
   - Solver refactor: BUGFIX, f-string in contrib/solver (#3481)
@@ -48,11 +96,11 @@ Pyomo 6.9.0   (21 Feb 2025)
   - 2025 Testing update: Black 25.1.0, testing Qt without X11 (#3463)
   - Testing: exclude Xpress 9.5.1 on Windows/GHA/Python3.{0,1} (#3455)
   - CY25 CI Infrastructure and typo fixes (#3453)
-  - Verify we are testing all NEOS solvers (#3433)  
+  - Verify we are testing all NEOS solvers (#3433)
 - Contributed Packages
   - GDPOpt: Add Logic-Based Discrete-Steepest Descent Algorithm (#3331)
   - PyROS: Fix/Tweak Documentation and Solver Output Logging (#3475)
-  - PyROS: Fix Treatment of Fixed Model Variables and Initialization of 
+  - PyROS: Fix Treatment of Fixed Model Variables and Initialization of
            Auxiliary Uncertain Parameters (#3461)
   - PyROS: Improve handling of separation problem sub-solver errors (#3441)
   - PyROS: Extend valid types for solver argument `uncertain_params` (#3439)

RELEASE.md

@@ -1,4 +1,4 @@
-We are pleased to announce the release of Pyomo 6.9.1.
+We are pleased to announce the release of Pyomo 6.9.2.
 
 Pyomo is a collection of Python software packages that supports a
 diverse set of optimization capabilities for formulating and analyzing
@@ -8,7 +8,9 @@ The following are highlights of the 6.9 release series:
 
 - Removed support for Python 3.8
 - New Logic-Based Discrete-Steepest Descent Algorithm in GDPOpt
+- New External Function for Cubic Spline Interpolation
 - New solver interfaces:
+  - Support for upcoming knitro Python package
   - v2: Ongoing solver interface refactor
 - ...and of course numerous minor bug fixes and performance enhancements
 

doc/OnlineDocs/explanation/solvers/pyros.rst

@@ -964,7 +964,7 @@ Observe that the log contains the following information:
 
    ==============================================================================
    PyROS: The Pyomo Robust Optimization Solver, v1.3.6.
-          Pyomo version: 6.9.2.dev0 (devel {pyros-effective-uncertain-params})
+          Pyomo version: 6.9.2
           Commit hash: 41cd797e0
           Invoked at UTC 2025-03-13T16:20:31.105320+00:00
 

pyomo/contrib/solver/__init__.py

@@ -15,26 +15,26 @@
     moved_module(
         f'pyomo.contrib.solver.{_module}',
         f'pyomo.contrib.solver.common.{_module}',
-        version='6.9.2.dev0',
+        version='6.9.2',
     )
 
 moved_module(
     'pyomo.contrib.solver.solution',
     'pyomo.contrib.solver.common.solution_loader',
-    version='6.9.2.dev0',
+    version='6.9.2',
 )
 
 for _module in ('ipopt', 'gurobi_direct', 'sol_reader'):
     moved_module(
         f'pyomo.contrib.solver.{_module}',
         f'pyomo.contrib.solver.solvers.{_module}',
-        version='6.9.2.dev0',
+        version='6.9.2',
     )
 
 moved_module(
     'pyomo.contrib.solver.gurobi',
     'pyomo.contrib.solver.solvers.gurobi_persistent',
-    version='6.9.2.dev0',
+    version='6.9.2',
 )
 
 del _module, moved_module

pyomo/core/expr/numeric_expr.py

@@ -104,7 +104,7 @@
 relocated_module_attribute(
     'register_arg_type',
     'pyomo.core.expr.expr_common',
-    version='6.9.2.dev0',
+    version='6.9.2',
     f_globals=globals(),
 )
 

pyomo/solvers/amplfunc_merge.py

@@ -14,7 +14,7 @@
 relocated_module_attribute(
     'amplfunc_string_merge',
     'pyomo.solvers.amplfunc_merge.unique_paths',
-    version='6.9.2.dev0',
+    version='6.9.2',
     f_globals=globals(),
 )
 

pyomo/solvers/plugins/solvers/mosek_direct.py

@@ -163,21 +163,28 @@ def _process_stream(msg):
         for key, option in self.options.items():
             try:
                 param = key.split('.')
-                if param[0] == 'mosek':
-                    param.pop(0)
-                param = getattr(mosek, param[0])(param[1])
-                if 'sparam' in key.split('.'):
-                    self._solver_model.putstrparam(param, option)
-                elif 'dparam' in key.split('.'):
-                    self._solver_model.putdouparam(param, option)
-                elif 'iparam' in key.split('.'):
-                    if isinstance(option, str):
-                        option = option.split('.')
-                        if option[0] == 'mosek':
-                            option.pop('mosek')
-                        option = getattr(mosek, option[0])(option[1])
-                    else:
+                if key == param[0]:
+                    self._solver_model.putparam(key, option)
+                else:
+                    if param[0] == 'mosek':
+                        param.pop(0)
+                    assert (
+                        len(param) == 2
+                    ), "unrecognized MOSEK parameter name '{}'".format(key)
+                    param = getattr(mosek, param[0])(param[1])
+                    if 'sparam.' in key:
+                        self._solver_model.putstrparam(param, option)
+                    elif 'dparam.' in key:
+                        self._solver_model.putdouparam(param, option)
+                    elif 'iparam.' in key:
+                        if isinstance(option, str):
+                            option = option.split('.')
+                            if option[0] == 'mosek':
+                                option.pop(0)
+                            option = getattr(mosek, option[0])(option[1])
                         self._solver_model.putintparam(param, option)
+                    else:
+                        raise ValueError(f"unrecognized MOSEK parameter name '{key}'")
             except (TypeError, AttributeError):
                 raise
         try:

pyomo/solvers/tests/checks/test_MOSEKDirect.py

@@ -313,6 +313,62 @@ def test_conic_duals(self):
                     results.Solution.constraint['x11']['Dual'][i], check[i], 5
                 )
 
+    def test_solver_parameters(self):
+        import mosek
+
+        solver = pyo.SolverFactory('mosek_direct')
+        model = self._test_model()
+        solver.solve(
+            model,
+            options={
+                'dparam.optimizer_max_time': 1.0,
+                'iparam.intpnt_solve_form': mosek.solveform.dual,
+                'mosek.iparam.intpnt_max_iterations': 10,
+                'MSK_DPAR_INTPNT_CO_TOL_REL_GAP': '1.0e-7',
+                'MSK_IPAR_PRESOLVE_USE': '0',
+                'sparam.param_comment_sign': '##',
+            },
+        )
+        # Check if iparams were set correctly
+        self.assertEqual(
+            solver._solver_model.getintparam(mosek.iparam.intpnt_solve_form),
+            mosek.solveform.dual,
+        )
+        self.assertEqual(
+            solver._solver_model.getintparam(mosek.iparam.intpnt_max_iterations), 10
+        )
+        self.assertEqual(
+            solver._solver_model.getintparam(mosek.iparam.presolve_use),
+            mosek.presolvemode.off,
+        )
+        # Check if dparams were set correctly
+        self.assertEqual(
+            solver._solver_model.getdouparam(mosek.dparam.optimizer_max_time), 1.0
+        )
+        self.assertEqual(
+            solver._solver_model.getdouparam(mosek.dparam.intpnt_co_tol_rel_gap), 1.0e-7
+        )
+        # Check if sparam is set correctly
+        self.assertEqual(
+            solver._solver_model.getstrparam(mosek.sparam.param_comment_sign)[1], '##'
+        )
+        # Check for TypeErrors
+        with self.assertRaises(TypeError) as typeCheck:
+            solver.solve(model, options={'mosek.dparam.intpnt_co_tol_rel_gap': '1.4'})
+        with self.assertRaises(TypeError) as typeCheck:
+            solver.solve(model, options={'iparam.log': 1.2})
+        # Check for AttributeError
+        with self.assertRaises(AttributeError) as assertCheck:
+            solver.solve(model, options={'wrong.name': '1'})
+        with self.assertRaises(AttributeError) as typeCheck:
+            solver.solve(model, options={'mosek.iparam.log': 'mosek.wrong.input'})
+        # Check for wrong parameter name (but valid MOSEK attribute)
+        with self.assertRaises(ValueError) as typeCheck:
+            solver.solve(model, options={'mosek.mark.up': 'wrong.val'})
+        # Check for parameter names with wrong length
+        with self.assertRaises(AssertionError) as typeCheck:
+            solver.solve(model, options={'mosek.iparam.log.level': 10})
+
 
 if __name__ == "__main__":
     unittest.main()

pyomo/version/info.py

@@ -26,7 +26,7 @@
 # main and needs a hard reference to "suitably new" development.
 major = 6
 minor = 9
-micro = 2
+micro = 3
 releaselevel = 'invalid'
 # releaselevel = 'final'
 serial = 0