Skip to content

Commit

Permalink
Add stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
lukasturcani committed May 29, 2024
1 parent 027703f commit 3959e6a
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 23 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ coverage.xml
*.py,cover
.hypothesis/
.pytest_cache/
docs/notebooks/data/MNIST
docs/notebooks/neuralnet/*.keras

# Translations
*.mo
Expand Down
9 changes: 5 additions & 4 deletions .readthedocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ build:

tools:

python: "3.8"
python: "3.12"

# You can also specify other tool versions:

Expand Down Expand Up @@ -58,7 +58,8 @@ sphinx:
# See https://docs.readthedocs.io/en/stable/guides/reproducible-builds.html

python:

install:

- requirements: docs/requirements.txt
- method: pip
path: .
extra_requirements:
- docs
10 changes: 0 additions & 10 deletions docs/requirements.txt

This file was deleted.

6 changes: 6 additions & 0 deletions environment.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
channels:
- conda-forge
dependencies:
- ipopt
- pyscipopt
- coin-or-cbc
10 changes: 2 additions & 8 deletions justfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,15 @@ docs:
make -C docs html
echo Docs are in $PWD/docs/build/html/index.html

conda-deps := " \
conda-forge::ipopt \
conda-forge::pyscipopt \
conda-forge::coin-or-cbc \
"

# Do a dev install.
dev:
pip install -e '.[dev]'
conda install {{conda-deps}}
conda env update --file environment.yml

# Do a dev install with GPU support.
dev-gpu:
pip install -e '.[dev-gpu]'
conda install {{conda-deps}}
conda env update --file environment.yml

# Run code checks.
check:
Expand Down
9 changes: 8 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ authors = [
dependencies = [
"networkx",
"numpy",
"pyomo",
# TODO: Remove constraint when fix to https://github.com/Pyomo/pyomo/issues/3262 is released
"pyomo==6.6.2",
"onnx",
"onnxruntime",
]
Expand Down Expand Up @@ -50,6 +51,12 @@ dev = [
dev-gpu = [
"omlt[dev-tools,keras-gpu,torch,linear-tree]",
]
docs = [
"sphinx",
"sphinx-rtd-theme",
"tensorflow",
"linear-tree",
]


[project.urls]
Expand Down

0 comments on commit 3959e6a

Please sign in to comment.