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

Merging in Keras 3 etc #7

Merged
merged 31 commits into from
May 17, 2024
Merged
Changes from 1 commit
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
4aaa2d9
Merge branch 'cog-imperial:main' into main
jezsadler Mar 19, 2024
9b872dc
Merge pull request #4 from jezsadler/JuMP
jezsadler Mar 19, 2024
3b19e4c
Create python-package.yml
jezsadler Mar 19, 2024
83f5215
Update setup.cfg
jezsadler Apr 22, 2024
5ee489e
Merge branch 'cog-imperial:main' into main
jezsadler May 6, 2024
3393d29
fix notebook; re-add workflow
jalving May 8, 2024
f971048
set tensorflow-cpu
jalving May 8, 2024
dd3af9e
fix keras version
jalving May 8, 2024
ab80670
fix linting
jalving May 8, 2024
d34bca5
fix linting
jalving May 8, 2024
b1a0c44
fix gnn imports
jalving May 8, 2024
a54aa2b
Switching test models to Keras3 format
jezsadler May 14, 2024
01deb85
Switching test models to Keras3 format
jezsadler May 14, 2024
b7f082f
Fixed scaling NN block test
jezsadler May 14, 2024
2559fa3
Updating keras imports in notebooks
jezsadler May 14, 2024
0cba9b4
restrict pyomo to 6.6.2
jalving May 16, 2024
6961eb2
update codecov action
jalving May 16, 2024
9bf9fbc
fix linting again
jalving May 16, 2024
024f526
remove notebook folders
jalving May 16, 2024
5e20b1b
Merge pull request #145 from jalving/jalving/re-add-workflows
jalving May 16, 2024
64ac469
Switching to Pyomo 6.2.2 and fixing notebooks
jezsadler May 16, 2024
d7b582a
Merge branch 'main' into keras3
jezsadler May 16, 2024
2d4f550
Update setup.cfg
jezsadler May 16, 2024
3aaa3b3
Update setup.cfg to specify Keras 3 or later
jezsadler May 16, 2024
ffce1ce
Updating supported Python versions to 3.9-3.12
jezsadler May 16, 2024
5cd55d6
Update main.yml to support Python 3.9-3.12
jezsadler May 16, 2024
f9b5c8f
Merge pull request #146 from jezsadler/keras3
jalving May 16, 2024
4fa34ec
update codecov action
jalving May 16, 2024
e605638
Merge pull request #147 from jalving/jalving/update_codecov_action
jezsadler May 16, 2024
b0c5ff1
Update setup.cfg
jezsadler May 17, 2024
bd8b9d7
Merge pull request #6 from cog-imperial/main
jezsadler May 17, 2024
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
Prev Previous commit
Next Next commit
Update setup.cfg to specify Keras 3 or later
jezsadler authored May 16, 2024
commit 3aaa3b3e2d415fa981c0ca0b31a49758dccd34eb
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
@@ -79,7 +79,7 @@ testing =
linear-tree
matplotlib
pandas
keras
keras>=3.0
onnx
onnxruntime
onnxmltools