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

move input query construction from preprocessor to inputquery #296

Merged
merged 8 commits into from
Jun 30, 2020

Conversation

wu-haoze
Copy link
Collaborator

This allows us to call constructNLR() after loading the .nnet file, so that we can load bounds of internal variables in the property file.

@wu-haoze wu-haoze requested a review from guykatzz June 18, 2020 19:26
@guykatzz
Copy link
Collaborator

LGTM

@wu-haoze wu-haoze merged commit 7ffd1e0 into NeuralNetworkVerification:master Jun 30, 2020
@wu-haoze wu-haoze deleted the nlr-inputquery branch June 30, 2020 00:04
@@ -138,7 +138,7 @@ void PropertyParser::processSingleLine( const String &line, InputQuery &inputQue

auto subToken = subTokens.begin();
++subToken;
unsigned layerIndex = atoi( subToken->ascii() );
unsigned layerIndex = 2 * atoi( subToken->ascii() ) - 1;
Copy link
Collaborator

Choose a reason for hiding this comment

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

Hmm...
So, it seems like this change is tightly coupled to the ACAS Xu architecture, of input, <fc,relu>*, output layers. Our NLR now supports general feed-forward topologies. I understand the motivation was to maintain the old ws indexing, but I'm not sure it's good to hard-code this.

AleksandarZeljic pushed a commit to AleksandarZeljic/Marabou that referenced this pull request Oct 9, 2020
…NetworkVerification#296)

* move input query construction from preprocessor to inputquery

* reconstruct nlr

* delete nlr before constructing it

* apply the same change to DnCMaraou

* add back preprocessor logging

* fix bug in property parser
matanost pushed a commit that referenced this pull request Nov 2, 2021
* move input query construction from preprocessor to inputquery

* reconstruct nlr

* delete nlr before constructing it

* apply the same change to DnCMaraou

* add back preprocessor logging

* fix bug in property parser
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.

2 participants