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

Jump to bottom

Feature/move solve #418

Merged
merged 11 commits into from
Aug 29, 2023
Merged

Feature/move solve #418

merged 11 commits into from
Aug 29, 2023

Conversation

michalk8
Copy link
Collaborator

closes #401

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

codecov bot commented Aug 28, 2023 •
edited
Loading

Codecov Report

Merging #418 (144b75f) into main (441576c) will decrease coverage by 0.05%.
Report is 1 commits behind head on main.
The diff coverage is 81.48%.

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##             main     #418      +/-   ##
==========================================
- Coverage   91.44%   91.39%   -0.05%     
==========================================
  Files          54       55       +1     
  Lines        5925     5939      +14     
  Branches      861      863       +2     
==========================================
+ Hits         5418     5428      +10     
- Misses        372      375       +3     
- Partials      135      136       +1
Files Changed Coverage Δ
src/ott/initializers/linear/initializers_lr.py 92.38% <ø> (ø)
src/ott/solvers/linear/acceleration.py 94.91% <ø> (ø)
src/ott/solvers/linear/sinkhorn.py 96.92% <40.00%> (-0.62%) ⬇️
src/ott/solvers/linear/_solve.py 83.33% <83.33%> (ø)
src/ott/geometry/costs.py 92.83% <100.00%> (ø)
src/ott/initializers/linear/initializers.py 100.00% <100.00%> (ø)
src/ott/solvers/nn/losses.py 100.00% <100.00%> (ø)
src/ott/tools/gaussian_mixture/scale_tril.py 92.30% <100.00%> (ø)
src/ott/tools/sinkhorn_divergence.py 94.82% <100.00%> (+0.09%) ⬆️

@michalk8 michalk8 merged commit 937e049 into ott-jax:main Aug 29, 2023
@michalk8 michalk8 deleted the feature/move-solve branch August 29, 2023 09:32
marcocuturi added a commit that referenced this pull request Sep 8, 2023
@marcocuturi @michalk8
merge (#430)
0145c8f 
* 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
@marcocuturi @michalk8
Re-run and refactoring of some docs/tutorials + minor changes (#431)
9efa5ff 
* 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
@michalk8
Feature/move solve (#418)
cad7a47 
* 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
michalk8 added a commit that referenced this pull request Jun 27, 2024
@marcocuturi @michalk8
Re-run and refactoring of some docs/tutorials + minor changes (#431)
c866b08 
* 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
Reviewers
No reviews
Assignees

@michalk8 michalk8

Labels
enhancement New feature or request
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

have a solve() method for sinkhorn_lr
1 participant
@michalk8