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

Which Optimizer to Choose #536

Merged
merged 31 commits into from
Nov 5, 2024
Merged

Which Optimizer to Choose #536

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
ba05ce3
work on thoery
mpetrosian Aug 17, 2024
fda0bf3
Merge branch 'main' of https://github.com/OpenSourceEconomics/optimag…
mpetrosian Oct 4, 2024
1fb4120
Add myst extensions for mermaid blocks
mpetrosian Oct 4, 2024
ca369c7
Run pre commit hooks
mpetrosian Oct 4, 2024
1813ba7
Edit intro text in how_to_algorithm_selection
mpetrosian Oct 4, 2024
eef2c22
Finish intro for how to select algorithm
mpetrosian Oct 4, 2024
c13f3b3
start example optimization in how to select algorithm
mpetrosian Oct 4, 2024
878802f
Add example with criterion plot
mpetrosian Oct 5, 2024
8d6a7a1
Add nlopt_lbfgsb to the algorithm selection tree
mpetrosian Oct 5, 2024
a49433f
Merge branch 'main' into how_to_algo_selection
janosg Oct 31, 2024
f66ca51
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Oct 31, 2024
7f0b314
Polish how to guide for local algorithm selection.
janosg Oct 31, 2024
e0a7cd4
Merge branch 'how_to_algo_selection' of https://github.com/OpenSource…
janosg Oct 31, 2024
4046a88
Polishing.
janosg Nov 1, 2024
60df51a
Add a comment.
janosg Nov 1, 2024
f99d483
Add nlopt to rtd environment.
janosg Nov 4, 2024
7cb889d
Apply suggestions from code review by HM
janosg Nov 4, 2024
fbd678f
Apply suggestions from code review by Christian
janosg Nov 4, 2024
f5dfe44
Polishing and add fides to docs environment.
janosg Nov 4, 2024
de76d5c
Polishing.
janosg Nov 4, 2024
f9d1c2e
Try workaround for missing text in terminal nodes.
janosg Nov 4, 2024
ff76d3a
Undo the workaround.
janosg Nov 4, 2024
b305a01
Fix mermaid?
janosg Nov 4, 2024
1594e1e
Fix mermaid?
janosg Nov 4, 2024
8b3fbdd
Fix mermaid?
janosg Nov 4, 2024
2db7f7d
Fix mermaid?
janosg Nov 4, 2024
57b8f45
Fix mermaid?
janosg Nov 4, 2024
374b9d3
Fix mermaid?
janosg Nov 4, 2024
56cfe9b
Fix mermaid?
janosg Nov 4, 2024
863c063
Last polishing.
janosg Nov 5, 2024
3652038
[pre-commit.ci] pre-commit autoupdate (#546)
pre-commit-ci[bot] Nov 5, 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
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ repos:
- --blank
exclude: src/optimagic/optimization/algo_options.py
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.7.1
rev: v0.7.2
hooks:
# Run the linter.
- id: ruff
Expand Down Expand Up @@ -108,7 +108,7 @@ repos:
- '88'
files: (docs/.)
- repo: https://github.com/kynan/nbstripout
rev: 0.7.1
rev: 0.8.0
hooks:
- id: nbstripout
exclude: |
Expand Down
3 changes: 2 additions & 1 deletion .tools/envs/testenv-linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ dependencies:
- jax
- cyipopt>=1.4.0 # dev, tests
- pygmo>=2.19.0 # dev, tests
- nlopt # dev, tests
- nlopt # dev, tests, docs
- pip # dev, tests, docs
- pytest # dev, tests
- pytest-cov # tests
Expand Down Expand Up @@ -37,4 +37,5 @@ dependencies:
- types-openpyxl # dev, tests
- types-jinja2 # dev, tests
- sqlalchemy-stubs # dev, tests
- sphinxcontrib-mermaid # dev, tests, docs
- -e ../../
3 changes: 2 additions & 1 deletion .tools/envs/testenv-numpy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ dependencies:
- numpy<2
- cyipopt>=1.4.0 # dev, tests
- pygmo>=2.19.0 # dev, tests
- nlopt # dev, tests
- nlopt # dev, tests, docs
- pip # dev, tests, docs
- pytest # dev, tests
- pytest-cov # tests
Expand All @@ -34,4 +34,5 @@ dependencies:
- types-openpyxl # dev, tests
- types-jinja2 # dev, tests
- sqlalchemy-stubs # dev, tests
- sphinxcontrib-mermaid # dev, tests, docs
- -e ../../
3 changes: 2 additions & 1 deletion .tools/envs/testenv-others.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ channels:
dependencies:
- cyipopt>=1.4.0 # dev, tests
- pygmo>=2.19.0 # dev, tests
- nlopt # dev, tests
- nlopt # dev, tests, docs
- pip # dev, tests, docs
- pytest # dev, tests
- pytest-cov # tests
Expand Down Expand Up @@ -35,4 +35,5 @@ dependencies:
- types-openpyxl # dev, tests
- types-jinja2 # dev, tests
- sqlalchemy-stubs # dev, tests
- sphinxcontrib-mermaid # dev, tests, docs
- -e ../../
3 changes: 2 additions & 1 deletion .tools/envs/testenv-pandas.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ dependencies:
- numpy<2
- cyipopt>=1.4.0 # dev, tests
- pygmo>=2.19.0 # dev, tests
- nlopt # dev, tests
- nlopt # dev, tests, docs
- pip # dev, tests, docs
- pytest # dev, tests
- pytest-cov # tests
Expand All @@ -34,4 +34,5 @@ dependencies:
- types-openpyxl # dev, tests
- types-jinja2 # dev, tests
- sqlalchemy-stubs # dev, tests
- sphinxcontrib-mermaid # dev, tests, docs
- -e ../../
3 changes: 3 additions & 0 deletions docs/rtd_environment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ dependencies:
- patsy
- joblib
- plotly
- nlopt
- annotated-types
- pip:
- ../
Expand All @@ -38,3 +39,5 @@ dependencies:
- types-openpyxl # dev, tests
- types-jinja2 # dev, tests
- sqlalchemy-stubs # dev, tests
- sphinxcontrib-mermaid # dev, tests, docs
- fides==0.7.4 # dev, tests
4 changes: 4 additions & 0 deletions docs/source/conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,17 @@
"sphinxcontrib.bibtex",
"sphinx_panels",
"sphinx_design",
"sphinxcontrib.mermaid",
]

myst_enable_extensions = [
"colon_fence",
"dollarmath",
"html_image",
]
myst_fence_as_directive = ["mermaid"]


copybutton_prompt_text = ">>> "
copybutton_only_copy_prompt_lines = False

Expand Down
Loading