Expose MILP timeout and Marabou preprocess to python interface. #438
Conversation
This file contains 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
merging from guykatzz/master
updating
I was getting the following error on build:
/Marabou/src/engine/ReluConstraint.cpp:913:14: error: call to 'abs' is ambiguous
_score = std::abs( computePolarity() );
^~~~~~~~
Generally this probably happens because computePolarity() returns double, and abs accepts int or long int.
In cmath there is abs that accepts double, hence this fixed the issue.
wu-haoze
approved these changes
Mar 1, 2021
maraboupy/MarabouCore.cpp
Outdated
| @@ -196,6 +196,7 @@ struct MarabouOptions { | |||
| , _sncSplittingStrategyString( Options::get()->getString( Options::SNC_SPLITTING_STRATEGY ).ascii() ) | |||
| , _tighteningStrategyString( Options::get()->getString( Options::SYMBOLIC_BOUND_TIGHTENING_TYPE ).ascii() ) | |||
| , _milpTighteningString( Options::get()->getString( Options::MILP_SOLVER_BOUND_TIGHTENING_TYPE ).ascii() ) | |||
| , _milpSolverTimeout( Options::get()->getFloat( Options::MILP_SOLVER_TIMEOUT ) ) | |||
There was a problem hiding this comment.
Order the options such that all floatOptions are grouped together?
maraboupy/MarabouCore.cpp
Outdated
| @@ -432,7 +475,8 @@ PYBIND11_MODULE(MarabouCore, m) { | |||
| .def_readwrite("_splittingStrategy", &MarabouOptions::_splittingStrategyString) | |||
| .def_readwrite("_sncSplittingStrategy", &MarabouOptions::_sncSplittingStrategyString) | |||
| .def_readwrite("_tighteningStrategy", &MarabouOptions::_tighteningStrategyString) | |||
| .def_readwrite("_milpTightening", &MarabouOptions::_milpTighteningString); | |||
| .def_readwrite("_milpTightening", &MarabouOptions::_milpTighteningString) | |||
| .def_readwrite("_milpSolverTimeout", &MarabouOptions::_milpSolverTimeout); | |||
matanost
pushed a commit
that referenced
this pull request
Nov 2, 2021
* Fix a compilation issue on Mac.
I was getting the following error on build:
/Marabou/src/engine/ReluConstraint.cpp:913:14: error: call to 'abs' is ambiguous
_score = std::abs( computePolarity() );
^~~~~~~~
Generally this probably happens because computePolarity() returns double, and abs accepts int or long int.
In cmath there is abs that accepts double, hence this fixed the issue.
* Remove extra newline
* Expose MILP timeout and Marabou preprocessor to python interface.
* Minor.
Co-authored-by: Guy Katz <guyk@cs.stanford.edu>
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.
I have been using these options for some time; apparently there is more demand for them.