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.

Sign up for GitHub

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

OmltVar abstraction classes #141

Open
wants to merge 218 commits into
base: main
Choose a base branch
from
Open

OmltVar abstraction classes #141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
218 commits
Select commit Hold shift + click to select a range
a2586ea
Merge pull request #3 from cog-imperial/main
jezsadler Jan 5, 2024
8a5dbe9
Merge branch 'cog-imperial:main' into JuMP
jezsadler Mar 4, 2024
28b3fd9
OmltVar wrapper class
jezsadler Mar 19, 2024
4aaa2d9
Merge branch 'cog-imperial:main' into main
jezsadler Mar 19, 2024
45ac095
OmltVar wrapper class
jezsadler Mar 19, 2024
9b872dc
Merge pull request #4 from jezsadler/JuMP
jezsadler Mar 19, 2024
13b5265
Create main.yml
jezsadler Mar 19, 2024
3b19e4c
Create python-package.yml
jezsadler Mar 19, 2024
ccd3c89
Removing ipopt from CI workflow
jezsadler Mar 19, 2024
ff4dbcb
Implementing JuMP format scalar and indexed
jezsadler Apr 8, 2024
be74ed2
Cleaning up variables
jezsadler Apr 19, 2024
820f5f6
Cleaning up variables - MOI dependency
jezsadler Apr 19, 2024
55e338b
Cleaning up variables - MOI dependency
jezsadler Apr 19, 2024
fa7a859
Removing duplicate line
jezsadler Apr 19, 2024
5790bad
Getting dependencies lined up correctly
jezsadler Apr 19, 2024
8cc7bf6
Update var.py
jezsadler Apr 20, 2024
cad7ba2
Update var.py
jezsadler Apr 20, 2024
3abb7ff
Make test for JuMP variables conditional on presence of JuMP
jezsadler Apr 20, 2024
9621f3d
Use tensorflow-cpu for testing to save space
jezsadler Apr 21, 2024
725348b
Fix Keras version at 2.9
jezsadler Apr 21, 2024
19a7128
removing tweaked action file
jezsadler Apr 22, 2024
015324f
restoring action workflow file
jezsadler Apr 22, 2024
da6c316
Fixing some whitespace linting
jezsadler Apr 22, 2024
fcc62e2
Merge pull request #5 from cog-imperial/main
jezsadler Apr 22, 2024
83f5215
Update setup.cfg
jezsadler Apr 22, 2024
5ee489e
Merge branch 'cog-imperial:main' into main
jezsadler May 6, 2024
b0c5ff1
Update setup.cfg
jezsadler May 17, 2024
bd8b9d7
Merge pull request #6 from cog-imperial/main
jezsadler May 17, 2024
e151c6c
Update Python versions in main.yml
jezsadler May 17, 2024
f7e1e7f
Update setup.cfg for Keras version
jezsadler May 17, 2024
63798c3
Update main.yml
jezsadler May 17, 2024
175f613
Update main.yml
jezsadler May 17, 2024
40ef6b1
Update main.yml
jezsadler May 17, 2024
e222424
Update main.yml
jezsadler May 17, 2024
ec8af37
Merge pull request #7 from jezsadler/main
jezsadler May 17, 2024
0babe62
wip
lukasturcani May 28, 2024
30a36d1
Add workflows
lukasturcani May 28, 2024
027703f
wip
lukasturcani May 28, 2024
3959e6a
Add stuff
lukasturcani May 29, 2024
c3b619b
Fix formatting
lukasturcani May 29, 2024
691d3a6
wip
lukasturcani May 29, 2024
8a896ba
wip
lukasturcani May 29, 2024
25d31fe
docs work
lukasturcani May 29, 2024
c02be67
wip
lukasturcani May 29, 2024
d839071
Update checks
lukasturcani May 30, 2024
77c0588
update checks
lukasturcani May 30, 2024
a61fb82
update checks
lukasturcani May 30, 2024
e0b35b2
Add conda
lukasturcani May 30, 2024
1a13431
Thing
lukasturcani May 30, 2024
e8c20f6
Add thing
lukasturcani May 30, 2024
3c6148a
wip
lukasturcani May 30, 2024
5c8be2b
update docs
lukasturcani May 30, 2024
b51ba7d
add link
lukasturcani May 30, 2024
cd892bc
wip
lukasturcani May 30, 2024
fbac1ba
thing
lukasturcani May 30, 2024
0e8bded
wip
lukasturcani May 30, 2024
1cdf89c
remove unnecessary things
lukasturcani May 30, 2024
909f86e
Add back for mypy
lukasturcani May 30, 2024
7ae13be
Including OmltExpr expressions for the OmltVars
jezsadler Jun 5, 2024
3483455
cleanup in expression.py
jezsadler Jun 6, 2024
21a63ea
tidying var.py
jezsadler Jun 6, 2024
4ae0715
fixing variable initialization
jezsadler Jun 6, 2024
b174820
further fixing
jezsadler Jun 6, 2024
e219114
adding abstract methods to expression interface
jezsadler Jun 6, 2024
7c0dcb4
Delete .github/workflows/python-package.yml
jezsadler Jun 6, 2024
b6fed2a
linting (1)
jezsadler Jun 6, 2024
bea9863
linting (2)
jezsadler Jun 6, 2024
86d8961
Merge pull request #8 from lukasturcani/lukas/cleanup
jezsadler Jun 6, 2024
a967418
Fixing initial batch of ruff errors
jezsadler Jun 13, 2024
051ac3b
Fixing ruff linting errors.
jezsadler Jun 23, 2024
040c858
Fixing mypy typing errors
jezsadler Jun 24, 2024
b7b1c5b
Fixing mypy typing errors
jezsadler Jun 24, 2024
568474a
Merge branch 'JuMP' into keras3
jezsadler Jun 24, 2024
f439ffa
Merge pull request #9 from jezsadler/keras3
jezsadler Jun 24, 2024
1330560
Including OmltExpr and OmltConstraints, spreading Omlt classes throug…
jezsadler Jul 8, 2024
2f91d07
Making block-level modelling language choices percolate through gener…
jezsadler Jul 9, 2024
29819ee
Fixing an issue with linear trees
jezsadler Jul 9, 2024
cf24e85
Moving JuMP objects into their own file
jezsadler Jul 11, 2024
5b8e1fe
Adding tests
jezsadler Jul 15, 2024
f94b765
Improving test coverage
jezsadler Jul 22, 2024
6bdb7f9
Factory classes for vars and constraints
jezsadler Aug 1, 2024
328fb22
Removing Julia pieces (for now) and more mypy cleanup
jezsadler Aug 2, 2024
1230eba
Fixing indexed variables
jezsadler Aug 18, 2024
b7108ac
Cleaned up some unnecessary methods.
jezsadler Sep 18, 2024
8b0f0cf
Making blocks more generic
jezsadler Sep 27, 2024
e8857ff
Merge pull request #11 from jezsadler/JuMP
jezsadler Sep 27, 2024
0a2671f
Add workflows
lukasturcani May 28, 2024
c58ec68
wip
lukasturcani May 28, 2024
cc07a30
wip
lukasturcani May 29, 2024
e735707
Add conda
lukasturcani May 30, 2024
0790eb8
Thing
lukasturcani May 30, 2024
3d056e9
Add thing
lukasturcani May 30, 2024
5492ddb
wip
lukasturcani May 30, 2024
fd4ef72
add link
lukasturcani May 30, 2024
8042185
wip
lukasturcani May 30, 2024
4c40b8b
thing
lukasturcani May 30, 2024
551530d
wip
lukasturcani May 30, 2024
2b0f991
remove unnecessary things
lukasturcani May 30, 2024
0379ec6
Add back for mypy
lukasturcani May 30, 2024
8a44751
Fixing initial batch of ruff errors
jezsadler Jun 13, 2024
ce6a944
Fixing ruff linting errors.
jezsadler Jun 23, 2024
7bb6f0d
Fixing mypy typing errors
jezsadler Jun 24, 2024
7515f57
Fixing mypy typing errors
jezsadler Jun 24, 2024
0e86c9f
OmltVar wrapper class
jezsadler Mar 19, 2024
9178a1b
OmltVar wrapper class
jezsadler Mar 19, 2024
6e36c47
Create main.yml
jezsadler Mar 19, 2024
3c20611
Removing ipopt from CI workflow
jezsadler Mar 19, 2024
29b89bc
Implementing JuMP format scalar and indexed
jezsadler Apr 8, 2024
5dae012
Cleaning up variables
jezsadler Apr 19, 2024
fa62661
Cleaning up variables - MOI dependency
jezsadler Apr 19, 2024
ef42ba3
Cleaning up variables - MOI dependency
jezsadler Apr 19, 2024
1490f42
Removing duplicate line
jezsadler Apr 19, 2024
b57848a
Getting dependencies lined up correctly
jezsadler Apr 19, 2024
991dd37
Update var.py
jezsadler Apr 20, 2024
09c9945
Update var.py
jezsadler Apr 20, 2024
c4ab257
Make test for JuMP variables conditional on presence of JuMP
jezsadler Apr 20, 2024
738f7fd
Use tensorflow-cpu for testing to save space
jezsadler Apr 21, 2024
c929d54
Fix Keras version at 2.9
jezsadler Apr 21, 2024
c911bb0
removing tweaked action file
jezsadler Apr 22, 2024
cbcefcb
restoring action workflow file
jezsadler Apr 22, 2024
0ae5b75
Fixing some whitespace linting
jezsadler Apr 22, 2024
61c8daf
Update Python versions in main.yml
jezsadler May 17, 2024
ab25542
Update setup.cfg for Keras version
jezsadler May 17, 2024
9ab7fc3
Update main.yml
jezsadler May 17, 2024
f844c2d
Update main.yml
jezsadler May 17, 2024
7eecd26
Update main.yml
jezsadler May 17, 2024
ea1154c
Update main.yml
jezsadler May 17, 2024
63f0e5f
Create python-package.yml
jezsadler Mar 19, 2024
83ccaef
Update setup.cfg
jezsadler Apr 22, 2024
a64f6d7
Update setup.cfg
jezsadler May 17, 2024
ef0885b
Including OmltExpr expressions for the OmltVars
jezsadler Jun 5, 2024
6e141d4
cleanup in expression.py
jezsadler Jun 6, 2024
dd69394
tidying var.py
jezsadler Jun 6, 2024
2764df1
fixing variable initialization
jezsadler Jun 6, 2024
1a8c124
further fixing
jezsadler Jun 6, 2024
7adf6e4
adding abstract methods to expression interface
jezsadler Jun 6, 2024
6e5292d
Delete .github/workflows/python-package.yml
jezsadler Jun 6, 2024
98518f8
linting (1)
jezsadler Jun 6, 2024
c5b866b
linting (2)
jezsadler Jun 6, 2024
e01a352
Including OmltExpr and OmltConstraints, spreading Omlt classes throug…
jezsadler Jul 8, 2024
8c459f1
Making block-level modelling language choices percolate through gener…
jezsadler Jul 9, 2024
79af205
Fixing an issue with linear trees
jezsadler Jul 9, 2024
fe433a3
Moving JuMP objects into their own file
jezsadler Jul 11, 2024
069c3ef
Adding tests
jezsadler Jul 15, 2024
8b18e97
Improving test coverage
jezsadler Jul 22, 2024
905e528
Factory classes for vars and constraints
jezsadler Aug 1, 2024
6c648ca
Removing Julia pieces (for now) and more mypy cleanup
jezsadler Aug 2, 2024
d42cae2
Fixing indexed variables
jezsadler Aug 18, 2024
164b179
Cleaned up some unnecessary methods.
jezsadler Sep 18, 2024
6dfd2c0
Making blocks more generic
jezsadler Sep 27, 2024
877aac1
Cleaning up integrated changes
jezsadler Oct 3, 2024
ac0912c
Squashed commit of the following:
jezsadler Oct 3, 2024
a64316b
Merge branch 'JuMP-Julia' into JuMP
jezsadler Oct 3, 2024
0dfa086
JuMP-backed objects initial commit
jezsadler Oct 3, 2024
3e1e6d4
Adding JuMP-backed OMLT classes, tests, and notebook.
jezsadler Dec 6, 2024
2ea9362
Cleaning up __init__.py for omlt.base
jezsadler Dec 6, 2024
1168207
Merge branch 'JuMP' into JuMP-Julia
jezsadler Dec 6, 2024
ca30190
Merge pull request #16 from jezsadler/JuMP-Julia
jezsadler Dec 6, 2024
65dca21
Setting JuMP tests to only run when Julia is available
jezsadler Dec 6, 2024
f34c190
Adding "jump" install option, organizing imports
jezsadler Dec 9, 2024
d7b735d
Merge branch 'main' into JuMP
jezsadler Dec 9, 2024
8723cd3
Fixing and ignoring some errors
jezsadler Dec 9, 2024
645013a
fixing
jezsadler Dec 9, 2024
635ca36
ruff formatting
jezsadler Dec 9, 2024
7269355
fixing ruff formatting
jezsadler Dec 9, 2024
c58d370
Fixing more issues
jezsadler Dec 10, 2024
8c05da0
fixing mypy errors
jezsadler Dec 10, 2024
62172ed
formatting
jezsadler Dec 10, 2024
2f14155
ruff reformatting
jezsadler Dec 10, 2024
735f4ca
Added an error when using formulations that don't support jump
jezsadler Dec 10, 2024
c1eb0e6
ruff formatting again
jezsadler Dec 10, 2024
018b9ca
Merge pull request #17 from cog-imperial/main
jezsadler Dec 19, 2024
dd70790
Merge pull request #18 from jezsadler/JuMP
jezsadler Dec 19, 2024
0fe8d2c
Adding first test in Julia.
jezsadler Feb 11, 2025
321576b
Create julia_tests.yml
jezsadler Feb 11, 2025
2676898
Update julia_tests.yml
jezsadler Feb 11, 2025
d7b4b3b
Tweaking test files for automation
jezsadler Feb 11, 2025
aeb8cec
Merge branch 'JuMP-Julia' of https://github.com/jezsadler/OMLT into J…
jezsadler Feb 11, 2025
3317b07
trying earlier PythonCall version
jezsadler Feb 11, 2025
04cae86
another attempt to get the right version
jezsadler Feb 11, 2025
a15b931
Trying different version of CondaPkg
jezsadler Feb 11, 2025
f6b6ec4
adding ijulia
jezsadler Feb 11, 2025
38136fb
specifying ijulia version
jezsadler Feb 11, 2025
a8a3f11
trying to fix omlt location
jezsadler Feb 11, 2025
4fa7fba
trying interpolating the path
jezsadler Feb 11, 2025
6d6830d
adjusting omlt path
jezsadler Feb 11, 2025
9498499
one more try
jezsadler Feb 11, 2025
dc6457e
just one more
jezsadler Feb 11, 2025
23fb22a
Printing environment status
jezsadler Feb 17, 2025
09a4f3c
fixing CondaPkg ordering
jezsadler Feb 17, 2025
79e797e
Update julia_tests.yml
jezsadler Feb 17, 2025
c34e7c3
Specifying pyomo version
jezsadler Feb 17, 2025
02b1c16
Merge branch 'JuMP-Julia' of https://github.com/jezsadler/OMLT into J…
jezsadler Feb 17, 2025
25429cc
de-specifying Julia package versions
jezsadler Feb 17, 2025
ed50bf9
Update julia_tests.yml
jezsadler Feb 17, 2025
462584f
Including more Julia tests
jezsadler Feb 17, 2025
cf2239c
Merge branch 'JuMP-Julia' of https://github.com/jezsadler/OMLT into J…
jezsadler Feb 17, 2025
e144f5b
switching to relative paths for test models
jezsadler Feb 17, 2025
9dcf8d8
Update julia_tests.yml
jezsadler Feb 17, 2025
d6613da
Update julia_tests.yml
jezsadler Feb 17, 2025
e401cb6
fixing those paths
jezsadler Feb 17, 2025
d449149
Merge branch 'JuMP-Julia' of https://github.com/jezsadler/OMLT into J…
jezsadler Feb 17, 2025
1a97725
Fixing ruff formating issue
jezsadler Feb 17, 2025
8c4ab16
Merge pull request #20 from jezsadler/JuMP-Julia
jezsadler Feb 17, 2025
4c9a587
addressing review feedback
jezsadler Feb 18, 2025
377269e
rolling back a change that didn't work
jezsadler Feb 18, 2025
7fa376f
Addressing MyPy typing errors
jezsadler Feb 22, 2025
ce3cb4a
ruff formatting
jezsadler Feb 22, 2025
fcea422
fixing Julia test set up
jezsadler Feb 22, 2025
87b5ba2
Adjusting CondaPkg version
jezsadler Feb 23, 2025
e925b3d
fixing
jezsadler Feb 23, 2025
1adc46f
fixing again
jezsadler Feb 23, 2025
9f1f419
Adding some more docstrings and tests for expressions
jezsadler Mar 4, 2025
427e3b5
fixing ruff error
jezsadler Mar 4, 2025
ce26e02
more static fixes
jezsadler Mar 4, 2025
d68c27a
removing diagnostic code
jezsadler Mar 4, 2025
559996e
Adding tests for errors registering known object classes
jezsadler Mar 4, 2025
e8400f2
More changes to increase code coverage
jezsadler Mar 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions .github/workflows/julia_tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
name: Julia testing for OMLT
on:
push:
branches:
- main
pull_request:
workflow_dispatch:
# You may pin to the exact commit or the version.
# uses: julia-actions/setup-julia@5c9647d97b78a5debe5164e9eec09d653d29bd71
jobs:
testing:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
- uses: julia-actions/setup-julia@v2.6.1
- run: cd tests/
- run: julia tests/test_setup.jl
- run: julia tests/omlt_tests.jl
Loading
Loading