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

maraboupy #9

Merged
merged 8 commits into from
Mar 16, 2018
Merged

maraboupy #9

merged 8 commits into from
Mar 16, 2018

Conversation

clazarus
Copy link
Collaborator

maraboupy python module.

Parsers for:

  • Tensorflow proto buffers (with support for convolutional layers)
  • NNet files

clazarus added 3 commits March 9, 2018 16:11
-implemented method that adds the Relu constraints given two variables
-avoids exposing PiecewiseLinearConstraint to the shared library
-Abstrac classes needed for maraboupy
-TF Parser
-NNet Parser
-Example scripts
-Example Notebooks
-Example TF network proto buffers.
clazarus and others added 4 commits March 14, 2018 18:14
@ShantanuThakoor
Copy link
Collaborator

Changed MarabouCore.cpp to add addReluConstraint function.
Now the ReluConstraint class is not exposed to the InputQuery and the encapsulation is as before.
We are no longer modifying any of the pre-existing C++ code.

@clazarus clazarus requested review from guykatzz and ShantanuThakoor and removed request for ShantanuThakoor March 15, 2018 23:06
Copy link
Collaborator

@guykatzz guykatzz left a comment

Choose a reason for hiding this comment

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

Looks good to me

@@ -0,0 +1,178 @@
#
Copy link
Collaborator

Choose a reason for hiding this comment

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

Same comment from before, otherwise the PR looks fine.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Rules.mk has been removed from /maraboupy and we now use the one in the root directory. We have modified the Makefile in /maraboupy accordingly. I believe this file was there in a previous commit. Is this correct?

@ShantanuThakoor ShantanuThakoor self-requested a review March 16, 2018 23:07
Copy link
Collaborator

@ShantanuThakoor ShantanuThakoor left a comment

Choose a reason for hiding this comment

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

Looks good to me as well.

@clazarus clazarus merged commit 0e699eb into NeuralNetworkVerification:master Mar 16, 2018
matanost pushed a commit that referenced this pull request Nov 2, 2021
Introducing maraboupy: a python module that wraps Marabou and enables easy interaction with Tensorflow networks and .nnet files.

* Python Wrapper

-Abstract classes needed for maraboupy
-TF Parser
-NNet Parser
-Example scripts
-Example Notebooks
-Example TF network proto buffers.


* Refactored addReluConstraint into MarabouCore

* Left all original Marabou code untouched and moved all needed modifications to maraboucore.cpp in maraboupy.

* Maraboupy now uses the same Rules.mk as Marabou and uses its own Makefile for its flags.
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