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

Fix/neural docs #473

Merged
merged 6 commits into from
Nov 28, 2023
Merged

Fix/neural docs #473

merged 6 commits into from
Nov 28, 2023

Conversation

michalk8
Copy link
Collaborator

Fixes the ott.neural docs. Also fixes some minor typos and not correctly forwarding argument in ott.neural.losses.monge_gap.
@marcocuturi I left 3 small todos to update some of the description in the docs.

@michalk8 michalk8 added the documentation Improvements or additions to documentation label Nov 28, 2023
@michalk8 michalk8 requested a review from marcocuturi November 28, 2023 16:52
@michalk8 michalk8 self-assigned this Nov 28, 2023
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.

thanks! minor comments

docs/index.rst Outdated Show resolved Hide resolved
src/ott/geometry/distrib_costs.py Show resolved Hide resolved
src/ott/solvers/linear/univariate.py Outdated Show resolved Hide resolved
.. module:: ott.neural
.. currentmodule:: ott.neural

Under reconstruction. .. TODO(marcocuturi): add some nice text here please.
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

@marcocuturi can you please add something here?

Copy link
Contributor

@marcocuturi marcocuturi Nov 28, 2023

Choose a reason for hiding this comment

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

wasnt sure you wanted it now :)

In contrast to most methods presented in :mod:~ott.solvers, which output vectors or matrices, the goal of the :mod:~ott.neural module is to parameterize optimal transport maps and couplings as neural networks. These neural networks can generalize to new samples, in the sense that they can be conveniently evaluated outside training samples. This module implements layers, models and solvers to estimate such neural networks.

.. module:: ott.neural.solvers
.. currentmodule:: ott.neural.solvers

Under reconstruction. .. TODO(marcocuturi): add some nice text here please.
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

@marcocuturi also here, thank you!

Copy link
Contributor

Choose a reason for hiding this comment

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

This module implements various solvers to estimate optimal transport between two probability measures, through samples, parameterized as neural networks. These neural networks are described in :mod:~ott.neural.models, borrowing lower-level components from :mod:~ott.neural.layers, building from the
flax <https://flax.readthedocs.io/en/latest/examples.html>__ library.

Copy link

codecov bot commented Nov 28, 2023

Codecov Report

Merging #473 (fab03d8) into main (fb7b76a) will increase coverage by 0.05%.
Report is 4 commits behind head on main.
The diff coverage is 85.96%.

❗ Current head fab03d8 differs from pull request most recent head 8d6d58c. Consider uploading reports for the commit 8d6d58c to get more accurate results

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##             main     #473      +/-   ##
==========================================
+ Coverage   90.41%   90.47%   +0.05%     
==========================================
  Files          59       60       +1     
  Lines        6440     6541     +101     
  Branches      912      928      +16     
==========================================
+ Hits         5823     5918      +95     
- Misses        472      478       +6     
  Partials      145      145              
Files Coverage Δ
src/ott/datasets.py 95.00% <ø> (ø)
src/ott/geometry/distrib_costs.py 100.00% <100.00%> (ø)
src/ott/neural/layers.py 88.67% <100.00%> (ø)
src/ott/neural/losses.py 100.00% <ø> (ø)
src/ott/neural/models.py 94.80% <100.00%> (ø)
src/ott/neural/solvers/conjugate.py 100.00% <ø> (ø)
src/ott/neural/solvers/map_estimator.py 89.74% <ø> (ø)
src/ott/neural/solvers/neuraldual.py 57.78% <100.00%> (ø)
src/ott/solvers/quadratic/lower_bound.py 81.48% <60.00%> (+6.48%) ⬆️
src/ott/solvers/linear/univariate.py 86.44% <82.85%> (-1.64%) ⬇️

... and 2 files with indirect coverage changes

@michalk8 michalk8 merged commit ef3b544 into main Nov 28, 2023
10 of 11 checks passed
@michalk8 michalk8 deleted the fix/neural-docs branch November 28, 2023 23:31
michalk8 added a commit that referenced this pull request Jun 27, 2024
* Remove nn from docs, fix some small issues

* Start adding neural part

* Update neural docs

* Fix spellchecker

* First round of comments

* Fix TODOs
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
documentation Improvements or additions to documentation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants