Skip to content

[MRG] split ot.bregman #569

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

Merged
merged 7 commits into from
Nov 10, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions RELEASES.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
- Handle documentation and warnings when integers are provided to (f)gw solvers based on cg (Issue #530, PR #559)
- Correct independence of `fgw_barycenters` to `init_C` and `init_X` (Issue #547, PR #566)
- Avoid precision change when computing norm using PyTorch backend (Discussion #570, PR #572)
- Create `ot/bregman/`repository (Issue #567, PR #569)


## 0.9.1
*August 2023*
Expand Down
3,794 changes: 0 additions & 3,794 deletions ot/bregman.py

This file was deleted.

53 changes: 53 additions & 0 deletions ot/bregman/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
# -*- coding: utf-8 -*-
"""
Solvers related to Bregman projections for entropic regularized OT
"""

# Author: Remi Flamary <remi.flamary@unice.fr>
# Cédric Vincent-Cuaz <cedvincentcuaz@gmail.com>
#
# License: MIT License

from ._utils import (geometricBar,
geometricMean,
projR,
projC)

from ._sinkhorn import (sinkhorn,
sinkhorn2,
sinkhorn_knopp,
sinkhorn_log,
greenkhorn,
sinkhorn_stabilized,
sinkhorn_epsilon_scaling)

from ._barycenter import (barycenter,
barycenter_sinkhorn,
free_support_sinkhorn_barycenter,
barycenter_stabilized,
barycenter_debiased,
jcpot_barycenter)

from ._convolutional import (convolutional_barycenter2d,
convolutional_barycenter2d_debiased)

from ._empirical import (empirical_sinkhorn,
empirical_sinkhorn2,
empirical_sinkhorn_divergence)

from ._screenkhorn import (screenkhorn)

from ._dictionary import (unmix)


__all__ = ['geometricBar', 'geometricMean', 'projR', 'projC',
'sinkhorn', 'sinkhorn2', 'sinkhorn_knopp', 'sinkhorn_log',
'greenkhorn', 'sinkhorn_stabilized', 'sinkhorn_epsilon_scaling',
'barycenter', 'barycenter_sinkhorn', 'free_support_sinkhorn_barycenter',
'barycenter_stabilized', 'barycenter_debiased', 'jcpot_barycenter',
'convolutional_barycenter2d', 'convolutional_barycenter2d_debiased',
'empirical_sinkhorn', 'empirical_sinkhorn2',
'empirical_sinkhorn_divergence',
'screenkhorn',
'unmix'
]
Loading