-
Notifications
You must be signed in to change notification settings - Fork 93
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add context-dependent data structures from CVC4 #399
Add context-dependent data structures from CVC4 #399
Conversation
Note: cvc4_private*.h is overwritten by cvc4_public.h, since Marabou won't make this distinction. Co-authored-by: anwu1219 <haozewu@stanford.edu> Co-authored-by: ahmed-irfan <irfan@cs.stanford.edu>
Group dependency related instructions Enable SYSTEM designation for dependencies to remove warnings in 3rd party code
CMakeLists.txt
Outdated
@@ -28,6 +28,8 @@ set(MARABOU_TEST_LIB MarabouHelperTest) | |||
set(MARABOU_EXE Marabou${CMAKE_EXECUTABLE_SUFFIX}) | |||
set(MARABOU_PY MarabouCore) | |||
|
|||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There are some extra spaces and empty lines in this file.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks, will make spacing uniform throughout the file.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM.
* Add Context and Base into Deps/CVC4 * Add dependencies to CMakeLists.txt * Add CVC4 dependencies and CMAKE compile Note: cvc4_private*.h is overwritten by cvc4_public.h, since Marabou won't make this distinction. Co-authored-by: anwu1219 <haozewu@stanford.edu> Co-authored-by: ahmed-irfan <irfan@cs.stanford.edu> * Fix ... syntax in variadic Macros (For Windows compiler) * Move CVC4 dependencies into top level CMakeLists.txt Group dependency related instructions Enable SYSTEM designation for dependencies to remove warnings in 3rd party code * Redefine __PRETTY_FUNCTION__ to __FUNCSIG___ on Windows * Fix empty lines in top level CMakeLists.txt * Fix edited CVC4 headers to adhere to notation and copyright Co-authored-by: anwu1219 <haozewu@stanford.edu> Co-authored-by: ahmed-irfan <irfan@cs.stanford.edu>
First in a series of PRs to intriduce context-dependent search implementation in Marabou.
Add context-dependent (CD) data structures from CVC4 to deps folder in Marabou project. Adds all the CD data structures from CVC4, of immediate interest are Context, CDList and CDO.
Fix compilation of added source files on Windows ( variadic syntax, /deps/base/check.h used some g++ specific pre-processor instructions). Noteworthy for the future, if we ever update CD files with new versions from CVC4 (due to bug fixes, updates, etc).