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

Layer formulation #24

Merged
merged 52 commits into from
Jan 16, 2022
Merged

Layer formulation #24

merged 52 commits into from
Jan 16, 2022

Conversation

carldlaird
Copy link
Collaborator

This PR merges work from many different people.

The key item added was @fracek reworking of the network definition to include individual objects for layers and to allow for multi-dimensional inputs and outputs. It also includes reworking of other parts of the code to update them to this new foundation.

This also added gbt and some preliminary implementations of different notebooks.

@codecov
Copy link

codecov bot commented Jan 13, 2022

Codecov Report

Merging #24 (56845c8) into main (2c38689) will decrease coverage by 2.30%.
The diff coverage is 89.27%.

Impacted file tree graph

@@            Coverage Diff             @@
##             main      #24      +/-   ##
==========================================
- Coverage   91.10%   88.79%   -2.31%     
==========================================
  Files          15       23       +8     
  Lines         854     1071     +217     
  Branches      159      160       +1     
==========================================
+ Hits          778      951     +173     
- Misses         51       98      +47     
+ Partials       25       22       -3     
Impacted Files Coverage Δ
src/omlt/io/onnx.py 47.61% <38.88%> (-44.78%) ⬇️
src/omlt/neuralnet/layers/full_space.py 60.60% <60.60%> (ø)
src/omlt/neuralnet/layer.py 73.33% <73.33%> (ø)
src/omlt/neuralnet/network_definition.py 89.65% <88.46%> (-4.99%) ⬇️
src/omlt/io/onnx_parser.py 93.16% <93.16%> (ø)
src/omlt/neuralnet/nn_formulation.py 95.31% <95.31%> (ø)
src/omlt/neuralnet/activations/relu.py 96.77% <96.77%> (ø)
src/omlt/block.py 100.00% <100.00%> (+7.27%) ⬆️
src/omlt/formulation.py 92.06% <100.00%> (+3.82%) ⬆️
src/omlt/gbt/__init__.py 100.00% <100.00%> (ø)
... and 13 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 2c38689...56845c8. Read the comment docs.

src/omlt/block.py Outdated Show resolved Hide resolved
src/omlt/block.py Outdated Show resolved Hide resolved
src/omlt/block.py Outdated Show resolved Hide resolved
tests/conftest.py Outdated Show resolved Hide resolved
Copy link
Collaborator

@jalving jalving left a comment

Choose a reason for hiding this comment

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

See comments. PR looks good to me.

We should update the readme example before merging or at least very shortly after merging.
I updated the readme example. It works locally, but we should look into setting up a test for that as well.

@jalving jalving merged commit 40bc6a9 into main Jan 16, 2022
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.

4 participants