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

Fine grained control of Bures barycenters #366

Merged
merged 9 commits into from
Jun 3, 2023
Merged

Fine grained control of Bures barycenters #366

merged 9 commits into from
Jun 3, 2023

Conversation

marcocuturi
Copy link
Contributor

@marcocuturi marcocuturi commented Jun 1, 2023

Adds fine grained control on Gaussian (Bures) barycenters by allowing to parameterise:

  • kwargs for the sqrtm calls used inside the barycenter
  • length of the fixed point loop within barycenters.

Also, def barycenter(...) member functions in cost_fn are now expected to return a list, of which the barycenter is the first element, the second being any relevant auxiliary information on convergence. For Bures this is norms of successive differences between iterates.

@marcocuturi marcocuturi changed the title Ott-m Fine grained control of Bures barycenters Jun 1, 2023
@marcocuturi marcocuturi requested a review from michalk8 June 1, 2023 22:45
@codecov-commenter
Copy link

codecov-commenter commented Jun 2, 2023

Codecov Report

Merging #366 (8c46845) into main (e2ab44b) will increase coverage by 0.19%.
The diff coverage is 96.42%.

❗ Your organization is not using the GitHub App Integration. As a result you may experience degraded service beginning May 15th. Please install the Github App Integration for your organization. Read more.

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##             main     #366      +/-   ##
==========================================
+ Coverage   88.24%   88.43%   +0.19%     
==========================================
  Files          51       51              
  Lines        5531     5605      +74     
  Branches      831      836       +5     
==========================================
+ Hits         4881     4957      +76     
+ Misses        530      529       -1     
+ Partials      120      119       -1     
Impacted Files Coverage Δ
src/ott/geometry/pointcloud.py 86.51% <0.00%> (ø)
src/ott/solvers/linear/continuous_barycenter.py 94.02% <ø> (ø)
src/ott/geometry/costs.py 98.85% <100.00%> (+0.02%) ⬆️
src/ott/math/utils.py 85.71% <100.00%> (ø)

... and 1 file with indirect coverage changes

src/ott/geometry/costs.py Outdated Show resolved Hide resolved
src/ott/geometry/costs.py Outdated Show resolved Hide resolved
src/ott/geometry/costs.py Outdated Show resolved Hide resolved
src/ott/geometry/costs.py Outdated Show resolved Hide resolved
src/ott/geometry/costs.py Outdated Show resolved Hide resolved
src/ott/geometry/costs.py Outdated Show resolved Hide resolved
src/ott/geometry/costs.py Show resolved Hide resolved
src/ott/geometry/costs.py Outdated Show resolved Hide resolved
src/ott/geometry/costs.py Outdated Show resolved Hide resolved
src/ott/geometry/costs.py Outdated Show resolved Hide resolved
@marcocuturi marcocuturi requested a review from michalk8 June 2, 2023 19:03
src/ott/geometry/costs.py Outdated Show resolved Hide resolved
src/ott/geometry/costs.py Outdated Show resolved Hide resolved
src/ott/geometry/costs.py Outdated Show resolved Hide resolved
src/ott/geometry/costs.py Outdated Show resolved Hide resolved
@marcocuturi
Copy link
Contributor Author

Thanks a lot Michal for the tight quality control!!

@marcocuturi marcocuturi merged commit 31df701 into main Jun 3, 2023
@marcocuturi marcocuturi deleted the ott-m branch June 3, 2023 07:11
michalk8 pushed a commit that referenced this pull request Jun 27, 2024
* more granularity into computation of Bures barycenter

* linter

* pydocs

* solve tuple issues w.r.t barycenter in elsewhere

* lint

* solved comments

* comments

* missing **kwargs : Any
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants