small sign thingys #385
Merged
small sign thingys #385
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
…ification/master Set default Gurobi option to non-incremental LP relaxation
wu-haoze
reviewed
Nov 9, 2020
CMakeLists.txt
Outdated
| @@ -13,7 +13,7 @@ option(RUN_SYSTEM_TEST "run system tests on build" OFF) | |||
| option(RUN_MEMORY_TEST "run cxxtest testing with ASAN ON" ON) | |||
| option(RUN_PYTHON_TEST "run python API tests if building with python" OFF) | |||
| option(ENABLE_GUROBI "Enable use the Gurobi optimizer" OFF) | |||
| option(ENABLE_OPENBLAS "Do symbolic bound tighting using blas" ON) # Not available on windows | |||
| option(ENABLE_OPENBLAS "Do symbolic bound tighting using blas" OFF) # Not available on windows | |||
| @@ -52,14 +52,14 @@ const double GlobalConfiguration::COST_FUNCTION_ERROR_THRESHOLD = 0.0000000001; | |||
|
|
|||
| const bool GlobalConfiguration::USE_HARRIS_RATIO_TEST = true; | |||
|
|
|||
| const bool GlobalConfiguration::USE_SYMBOLIC_BOUND_TIGHTENING = true; | |||
| const bool GlobalConfiguration::USE_SYMBOLIC_BOUND_TIGHTENING = false; | |||
There was a problem hiding this comment.
Reset the parameter values to default
|
@guykatzz @GuyKatzHuji |
guykatzz
reviewed
Nov 12, 2020
guykatzz
approved these changes
Nov 12, 2020
matanost
pushed a commit
that referenced
this pull request
Nov 2, 2021
* Guy Amir's first try 20/05/2020 * Guy Amir's first try 20/05/2020 * Guy Amir's first try 21/05/2020 * Guy Amir - 21/05 - before testing * Guy Amir's first try 20/05/2020 * Guy Amir's first try 20/05/2020 * Guy Amir - 0506 * Guy Amir - before testing - 0406 * Guy 0406 * Guy Amir's first try 20/05/2020 * Guy Amir's first try 20/05/2020 * Guy - before testing 0406 * Guy - while testing * Guy - while testing * Guy - while testing * Guy - while testing * Guy - while testing * Guy - while testing * Guy - while testing * Guy - while testing * Guy - while testing * Guy - while testing * Guy - while testing * Guy - after testing 1706 * Guy - while testing * Guy - system testing * Guy - system testing * Guy - system testing * Guy - system testing * Guy - system testing * Guy - after system testing * Guy - after system testing * Guy - after system testing? * Guy - after system testing? * some cleanup * WIP * Delete vcs.xml * Delete Project.xml * Merge branch 'master' of https://github.com/guyam2/Marabou # Conflicts: # src/system_tests/Test_sign.h * lots of polishing * undo changes in relu * unused var * with new function addSignConstraint() to MarabouCore.cpp - 0908 Merge branch 'master' of https://github.com/guyam2/Marabou # Conflicts: # src/system_tests/Test_sign.h * with new function addSignConstraint() to MarabouCore.cpp - 0908 Merge branch 'master' of https://github.com/guyam2/Marabou # Conflicts: # src/system_tests/Test_sign.h * with sign function - after Guy A & Kyle * parse sign layers in the NLR * printing * Merge branch 'master' of https://github.com/NeuralNetworkVerification/Marabou # Conflicts: # src/engine/InputQuery.cpp # src/engine/InputQuery.h * Merge branch 'master' of https://github.com/NeuralNetworkVerification/Marabou # Conflicts: # src/engine/InputQuery.cpp # src/engine/InputQuery.h * Merge branch 'master' of https://github.com/NeuralNetworkVerification/Marabou # Conflicts: # maraboupy/MarabouCore.cpp * Merge branch 'master' of https://github.com/NeuralNetworkVerification/Marabou # Conflicts: # maraboupy/MarabouCore.cpp * Merge branch 'master' of https://github.com/NeuralNetworkVerification/Marabou # Conflicts: # maraboupy/MarabouCore.cpp * Merge branch 'master' of https://github.com/NeuralNetworkVerification/Marabou # Conflicts: # maraboupy/MarabouCore.cpp * Merge branch 'master' of https://github.com/NeuralNetworkVerification/Marabou # Conflicts: # maraboupy/MarabouCore.cpp * guy k's comments * Merge branch 'master' of https://github.com/NeuralNetworkVerification/Marabou # Conflicts: # maraboupy/MarabouCore.cpp * Merge branch 'master' of https://github.com/NeuralNetworkVerification/Marabou # Conflicts: # maraboupy/MarabouCore.cpp * Merge branch 'master' of https://github.com/NeuralNetworkVerification/Marabou # Conflicts: # maraboupy/MarabouCore.cpp * Merge branch 'master' of https://github.com/NeuralNetworkVerification/Marabou # Conflicts: # maraboupy/MarabouCore.cpp * Guy K's comments * Merge branch 'master' of https://github.com/NeuralNetworkVerification/Marabou # Conflicts: # maraboupy/MarabouCore.cpp * cleanup * another line * Merge branch 'master' of https://github.com/NeuralNetworkVerification/Marabou # Conflicts: # maraboupy/MarabouCore.cpp * 0209 - after Guy K, before testing * Guy A - after unit-testing the WS elimination * fixing some variable indexing issues * fix some more issues * bound thingy * Guy A - updated ipq->nlr and ipq<-nlr * Guy A - updated ipq->nlr and ipq<-nlr * minor * fix an issue regarding the number of variables in the generated input query * InputQuery files for a small BNN * more bound issues in ipq --> nlr * minor * InputQuery files for BNNs * disable explicit bound tightening, which is too expensive * Guy A - with system test for WS elimination * Guy A - with system test for WS elimination -still need to fix engine flag * new flags * reverted back tablue "if" Guy K asked * cleanup - after fixing Guy K's comments - 0909 * cosmetics and a bug fix * more cosmetics * fix a memcmp issue * Guy A - fixing "sizeof" test * nicer output printing when merging consecutive WS layers * fix small issue * when dealing with signs, use largest interval * Guy A and Guy K * fix * with Andrew's timeout fix in DncManager * construct NLR for Maxes * oops * fix some compilation errors * test fix * fix * temp * bug fix * generate IPQs with max layers * oops * construct nlr * fix in DnC preprocessing * an attempt at supporting max constraints in the LP preprocessor * add splitTreshold to options * changes after submit * commit with 3 deletes * without adversarial.py * commit with all deletes * commit with all deletes - again * commit with all deletes - again * commit with ws merge OFF * commit with ws merge OFF and symbolic bounds ON * commit with ws merge OFF and symbolic bounds ON, and openblas sbt ON * with update in Marabou.cpp for Windows compilation * without update in Marabou.cpp for Windows compilation * with update in Marabou.cpp for Windows compilation, 2nd try * with 2 updates in Marabou.cpp for Windows compilation, 3rd try * after passes travis & Guy Ks comments Co-authored-by: Guy Katz <guyk@cs.stanford.edu> Co-authored-by: Guy Katz <guykatz@cs.huji.ac.il> Co-authored-by: Guy Katz <katz911@gmail.com> Co-authored-by: anwu1219 <haozewu@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.
Guy K - I'm trying to merge to the main Marabou branch only 2 of these files, Is it ok?