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/optional dependencies #412

Merged
merged 6 commits into from
Aug 18, 2023

Conversation

michalk8
Copy link
Collaborator

Optional dependencies can be now installed as pip install 'ott-jax[neural]' (name subject to change).

closes #409

@michalk8 michalk8 added the misc label Aug 16, 2023
@michalk8 michalk8 requested a review from marcocuturi August 16, 2023 14:31
@michalk8 michalk8 self-assigned this Aug 16, 2023
@codecov
Copy link

codecov bot commented Aug 16, 2023

Codecov Report

Merging #412 (38670f5) into main (f275dc4) will decrease coverage by 0.07%.
Report is 1 commits behind head on main.
The diff coverage is 100.00%.

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##             main     #412      +/-   ##
==========================================
- Coverage   91.51%   91.44%   -0.07%     
==========================================
  Files          54       54              
  Lines        5891     5902      +11     
  Branches      856      589     -267     
==========================================
+ Hits         5391     5397       +6     
- Misses        364      370       +6     
+ Partials      136      135       -1     
Files Changed Coverage Δ
src/ott/solvers/linear/sinkhorn.py 97.53% <ø> (ø)
src/ott/tools/gaussian_mixture/fit_gmm_pair.py 79.01% <100.00%> (ø)
src/ott/tools/map_estimator.py 87.01% <100.00%> (ø)

... and 5 files with indirect coverage changes

Copy link
Contributor

@marcocuturi marcocuturi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@michalk8 michalk8 merged commit 441576c into ott-jax:main Aug 18, 2023
@michalk8 michalk8 deleted the feature/optional-dependencies branch August 18, 2023 10:26
marcocuturi added a commit that referenced this pull request Aug 20, 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

---------

Co-authored-by: michalk8 <[email protected]>
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
* Add `neural` extra requirements

* Add import wrappers for neural modules

* Update `tox`

* Fix linter

* Update docs

* Pin numpy from above, fix RTD
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Possibly make neural network packages as optional dependencies
2 participants