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

added gradient-enhanced neural nets (genn) #126

Merged
merged 17 commits into from
Mar 4, 2019
Merged

Conversation

shb84
Copy link
Contributor

@shb84 shb84 commented Jan 7, 2019

This pull request includes new files that implement gradient-enhanced neural nets using numpy. The original code was not modified, except for "test_surrogate_model_examples.py" where I added a test for GENN. The newly added files are as follows:

new file:   doc/_src_docs/surrogate_models/genn.rst -----> documentation
new file:   doc/_src_docs/surrogate_models/genn.rstx -----> documentation
new file:   smt/surrogate_models/genn.py -----> API interface
new file:   smt/surrogate_models/neural_net/* -----> neural net logic
modified:   smt/surrogate_models/tests/test_surrogate_model_examples.py -----> test

@AppVeyorBot
Copy link

Build SMT 0.2.467 failed (commit 17ce5081a0 by @)

@AppVeyorBot
Copy link

Build SMT 0.2.468 failed (commit 408e0ce07a by @)

@AppVeyorBot
Copy link

Build SMT 0.2.469 completed (commit 99c0dfedf8 by @)

@bouhlelma bouhlelma requested a review from relf January 18, 2019 15:54
@coveralls
Copy link

coveralls commented Jan 20, 2019

Pull Request Test Coverage Report for Build 456

  • 595 of 777 (76.58%) changed or added relevant lines in 9 files are covered.
  • No unchanged relevant lines lost coverage.
  • Overall coverage decreased (-0.2%) to 77.37%

Changes Missing Coverage Covered Lines Changed/Added Lines %
smt/surrogate_models/genn.py 85 89 95.51%
smt/surrogate_models/neural_net/fwd_prop.py 46 51 90.2%
smt/surrogate_models/neural_net/activation.py 36 56 64.29%
smt/surrogate_models/neural_net/metrics.py 12 35 34.29%
smt/surrogate_models/neural_net/data.py 49 89 55.06%
smt/surrogate_models/neural_net/model.py 192 236 81.36%
smt/surrogate_models/neural_net/optimizer.py 106 152 69.74%
Totals Coverage Status
Change from base Build 455: -0.2%
Covered Lines: 3118
Relevant Lines: 4030

💛 - Coveralls

@AppVeyorBot
Copy link

Build SMT 0.2.472 completed (commit 294914f709 by @shb84)

@shb84
Copy link
Contributor Author

shb84 commented Jan 20, 2019

In order to increase coverage, there exist additional tests within most of the neural_net files that could potentially be incorporated. These are implemented after the "if name == 'main'" statement. Please let me know how I can help increase coverage.

@relf
Copy link
Member

relf commented Jan 20, 2019

Indeed you should exclude "main parts" from coverage and add tests under smt/tests and mimic what is done for other surrogates. You can run coverage in your dev environment to check for improvement.

@AppVeyorBot
Copy link

Build SMT 0.2.473 failed (commit c773c0ffca by @)

@AppVeyorBot
Copy link

Build SMT 0.2.474 failed (commit c8d357a956 by @)

@AppVeyorBot
Copy link

Build SMT 0.2.475 failed (commit 328c90f0e7 by @shb84)

@AppVeyorBot
Copy link

Build SMT 0.2.476 completed (commit b7ee7bd6d5 by @)

@shb84
Copy link
Contributor Author

shb84 commented Jan 20, 2019

It looks like the reason the Travis CI build failed is not related to neural net additions, but has to do with "smt/tests/test_high_dim.py:Test.test_tanh_QP ... FAIL" instead. Please let me know if any additional corrections are needed on the neural net side.

doc/_src_docs/surrogate_models/genn.rstx Outdated Show resolved Hide resolved
smt/surrogate_models/genn.py Outdated Show resolved Hide resolved
appveyor.yml Outdated Show resolved Hide resolved
smt/surrogate_models/neural_net/activation.py Outdated Show resolved Hide resolved
smt/surrogate_models/neural_net/loss.py Outdated Show resolved Hide resolved
smt/surrogate_models/neural_net/optimizer.py Outdated Show resolved Hide resolved
smt/surrogate_models/neural_net/tests/test_neural_net.py Outdated Show resolved Hide resolved
smt/surrogate_models/neural_net/demo.py Outdated Show resolved Hide resolved
smt/surrogate_models/neural_net/tests/test_neural_net.py Outdated Show resolved Hide resolved
@AppVeyorBot
Copy link

Build SMT 0.2.487 failed (commit e1c3413bef by @)

@shb84
Copy link
Contributor Author

shb84 commented Feb 21, 2019

Sorry for the late reply. This is the first time in 6 weeks that I've had a chance to work on the code. I sincerely appreciate the feedback. Thank you.

@AppVeyorBot
Copy link

Build SMT 0.2.488 failed (commit 10d7a337ec by @shb84)

@relf relf requested a review from bouhlelma March 2, 2019 14:26
@AppVeyorBot
Copy link

Build SMT 0.2.493 completed (commit 41d8012dda by @bouhlelma)

@bouhlelma bouhlelma merged commit 9b61f27 into SMTorg:master Mar 4, 2019
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.

None yet

5 participants