Add LBB relaxed NLP node solver#3946
Open
bernalde wants to merge 1 commit into
Open
Conversation
Contributor
Author
|
Coordination note for #3942: #3942 and this PR fix different bugs. #3942 fixes the LBB time-limit result path for #3941; this PR fixes continuous-node solver dispatch for #3945. This PR does not supersede #3942. I checked the combined patches with Recommendation: merge #3942 first, then refresh this branch to resolve the |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
relaxed_nlp_solver/relaxed_nlp_solver_argsrole for GDPopt LBB transformed node subproblems that have no unfixed discrete variables.relaxed_nlp_solveris unset, preserving LBB's current global-bounding behavior for nonconvex nodes.Coordination
pyomo/contrib/gdpopt/tests/test_LBB.py, so this PR may need a small conflict resolution after Fix GDPopt LBB time-limit results #3942 lands.Tests
pytest -q pyomo/contrib/gdpopt/tests/test_LBB.py::TestGDPoptLBBNodeSolverDispatch pyomo/contrib/mindtpy/tests/test_mindtpy_no_discrete.py::TestMindtPyShortCircuitRouting::test_goa_short_circuit_fixed_discrete_nlp_uses_nlp_solver5 passed in 0.99spytest -q pyomo/contrib/gdpopt/tests/test_LBB.py pyomo/contrib/mindtpy/tests/test_mindtpy_no_discrete.py35 passed, 9 skipped, 2 deselected in 1.70spytest -q pyomo/contrib/gdpopt/tests78 passed, 35 skipped, 5 deselected in 46.45spython -m black --check pyomo/contrib/gdpopt/branch_and_bound.py pyomo/contrib/gdpopt/tests/test_LBB.py pyomo/contrib/mindtpy/algorithm_base_class.py pyomo/contrib/mindtpy/tests/test_mindtpy_no_discrete.py4 files would be left unchangedNotes
Closes #3945