Skip to content
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

Conversation

AleksandarZeljic
Copy link
Collaborator

First in a series of PRs to intriduce context-dependent search implementation in Marabou.

  1. 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.

  2. 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).

AleksandarZeljic and others added 6 commits October 29, 2020 13:37
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)


Copy link
Collaborator

@wu-haoze wu-haoze Nov 2, 2020

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.

Copy link
Collaborator Author

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.

Copy link
Collaborator

@ahmed-irfan ahmed-irfan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.

@AleksandarZeljic AleksandarZeljic merged commit 376ab45 into NeuralNetworkVerification:master Nov 3, 2020
@AleksandarZeljic AleksandarZeljic deleted the context-integration branch November 3, 2020 18:54
matanost pushed a commit that referenced this pull request Nov 2, 2021
* 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>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants