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

Feature/lineax ridge #424

Merged
merged 10 commits into from
Sep 5, 2023
Merged

Feature/lineax ridge #424

merged 10 commits into from
Sep 5, 2023

Conversation

michalk8
Copy link
Collaborator

@michalk8 michalk8 commented Sep 5, 2023

TODOs:

  • tests

@michalk8 michalk8 added the enhancement New feature or request label Sep 5, 2023
@michalk8 michalk8 self-assigned this Sep 5, 2023
@codecov
Copy link

codecov bot commented Sep 5, 2023

Codecov Report

Merging #424 (cec56e9) into main (937e049) will increase coverage by 0.00%.
The diff coverage is 100.00%.

Additional details and impacted files

Impacted file tree graph

@@           Coverage Diff           @@
##             main     #424   +/-   ##
=======================================
  Coverage   91.39%   91.40%           
=======================================
  Files          55       55           
  Lines        5939     5943    +4     
  Branches      863      866    +3     
=======================================
+ Hits         5428     5432    +4     
  Misses        375      375           
  Partials      136      136           
Files Changed Coverage Δ
src/ott/solvers/linear/lineax_implicit.py 100.00% <100.00%> (ø)

@marcocuturi
Copy link
Contributor

thanks! LGTM for now

@michalk8
Copy link
Collaborator Author

michalk8 commented Sep 5, 2023

Thanks, will just fix the docs linter + add a test!

@michalk8 michalk8 merged commit 21d3627 into ott-jax:main Sep 5, 2023
@michalk8 michalk8 deleted the feature/lineax-ridge branch September 5, 2023 20:13
marcocuturi added a commit that referenced this pull request Sep 8, 2023
* Feature/better io callbacks (#413)

* Add `tqdm` callback

* Polish docs, add examples

* Fix LRSink and GW

* Update notebook

* Update docstrings

* Update old tests

* More tests

* Add `tqdm` to testing requirements

* Skip progress fn tests on `jax<0.4`

* Fix last callback test

* Feature/optional dependencies (#412)

* Add `neural` extra requirements

* Add import wrappers for neural modules

* Update `tox`

* Fix linter

* Update docs

* Pin numpy from above, fix RTD

* Update pre-commits (#416)

* Update pre-commits

* Dedent `tox` in `pyproject.toml`

* Temporarily indent again

* Run linters

* Update for `tox>=4.9.0`

* Feature/move solve (#418)

* Update pre-commits

* Dedent `tox` in `pyproject.toml`

* Temporarily indent again

* Run linters

* Update for `tox>=4.9.0`

* Move `ott.solvers.linear.sinkhorn.solve` to `linear`

* Fix typo

* Nicer docs for Sinkhorn output

* Fix math

* [ci skip] Update docs

* Feature/lineax ridge (#424)

* Update pre-commits

* Dedent `tox` in `pyproject.toml`

* Temporarily indent again

* Run linters

* Update for `tox>=4.9.0`

* Add `ridge` options to `lineax`

* Modify test for `lineax` ridge

* Fix linkchecker

---------

Co-authored-by: michalk8 <[email protected]>
marcocuturi added a commit that referenced this pull request Sep 11, 2023
* docs

* mongegap

* mg

* mg

* more details in monge gap

* merge (#414)

* Feature/better io callbacks (#413)

* Add `tqdm` callback

* Polish docs, add examples

* Fix LRSink and GW

* Update notebook

* Update docstrings

* Update old tests

* More tests

* Add `tqdm` to testing requirements

* Skip progress fn tests on `jax<0.4`

* Fix last callback test

* Feature/optional dependencies (#412)

* Add `neural` extra requirements

* Add import wrappers for neural modules

* Update `tox`

* Fix linter

* Update docs

* Pin numpy from above, fix RTD

---------

Co-authored-by: michalk8 <[email protected]>

* precom

* merge (#430)

* Feature/better io callbacks (#413)

* Add `tqdm` callback

* Polish docs, add examples

* Fix LRSink and GW

* Update notebook

* Update docstrings

* Update old tests

* More tests

* Add `tqdm` to testing requirements

* Skip progress fn tests on `jax<0.4`

* Fix last callback test

* Feature/optional dependencies (#412)

* Add `neural` extra requirements

* Add import wrappers for neural modules

* Update `tox`

* Fix linter

* Update docs

* Pin numpy from above, fix RTD

* Update pre-commits (#416)

* Update pre-commits

* Dedent `tox` in `pyproject.toml`

* Temporarily indent again

* Run linters

* Update for `tox>=4.9.0`

* Feature/move solve (#418)

* Update pre-commits

* Dedent `tox` in `pyproject.toml`

* Temporarily indent again

* Run linters

* Update for `tox>=4.9.0`

* Move `ott.solvers.linear.sinkhorn.solve` to `linear`

* Fix typo

* Nicer docs for Sinkhorn output

* Fix math

* [ci skip] Update docs

* Feature/lineax ridge (#424)

* Update pre-commits

* Dedent `tox` in `pyproject.toml`

* Temporarily indent again

* Run linters

* Update for `tox>=4.9.0`

* Add `ridge` options to `lineax`

* Modify test for `lineax` ridge

* Fix linkchecker

---------

Co-authored-by: michalk8 <[email protected]>

* n_iters more precise

* clarify epsilon param in sinkhorn

* epsilon doc

* ott pot

* ott - pot

* add small comment

* fix check trees in test

* fitting / regularizer losses must return log

* spell

* improve coverage

* fix threshold of total mass

* again

---------

Co-authored-by: michalk8 <[email protected]>
michalk8 added a commit that referenced this pull request Jun 27, 2024
* Update pre-commits

* Dedent `tox` in `pyproject.toml`

* Temporarily indent again

* Run linters

* Update for `tox>=4.9.0`

* Add `ridge` options to `lineax`

* Modify test for `lineax` ridge

* Fix linkchecker
michalk8 added a commit that referenced this pull request Jun 27, 2024
* docs

* mongegap

* mg

* mg

* more details in monge gap

* merge (#414)

* Feature/better io callbacks (#413)

* Add `tqdm` callback

* Polish docs, add examples

* Fix LRSink and GW

* Update notebook

* Update docstrings

* Update old tests

* More tests

* Add `tqdm` to testing requirements

* Skip progress fn tests on `jax<0.4`

* Fix last callback test

* Feature/optional dependencies (#412)

* Add `neural` extra requirements

* Add import wrappers for neural modules

* Update `tox`

* Fix linter

* Update docs

* Pin numpy from above, fix RTD

---------

Co-authored-by: michalk8 <[email protected]>

* precom

* merge (#430)

* Feature/better io callbacks (#413)

* Add `tqdm` callback

* Polish docs, add examples

* Fix LRSink and GW

* Update notebook

* Update docstrings

* Update old tests

* More tests

* Add `tqdm` to testing requirements

* Skip progress fn tests on `jax<0.4`

* Fix last callback test

* Feature/optional dependencies (#412)

* Add `neural` extra requirements

* Add import wrappers for neural modules

* Update `tox`

* Fix linter

* Update docs

* Pin numpy from above, fix RTD

* Update pre-commits (#416)

* Update pre-commits

* Dedent `tox` in `pyproject.toml`

* Temporarily indent again

* Run linters

* Update for `tox>=4.9.0`

* Feature/move solve (#418)

* Update pre-commits

* Dedent `tox` in `pyproject.toml`

* Temporarily indent again

* Run linters

* Update for `tox>=4.9.0`

* Move `ott.solvers.linear.sinkhorn.solve` to `linear`

* Fix typo

* Nicer docs for Sinkhorn output

* Fix math

* [ci skip] Update docs

* Feature/lineax ridge (#424)

* Update pre-commits

* Dedent `tox` in `pyproject.toml`

* Temporarily indent again

* Run linters

* Update for `tox>=4.9.0`

* Add `ridge` options to `lineax`

* Modify test for `lineax` ridge

* Fix linkchecker

---------

Co-authored-by: michalk8 <[email protected]>

* n_iters more precise

* clarify epsilon param in sinkhorn

* epsilon doc

* ott pot

* ott - pot

* add small comment

* fix check trees in test

* fitting / regularizer losses must return log

* spell

* improve coverage

* fix threshold of total mass

* again

---------

Co-authored-by: michalk8 <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants