Skip to content

Commit fcd8f05

Browse files
[MRG] split ot.bregman (#569)
* draft bregman split * update contrib+release+check tests * fix tests * fix? * fix docstring issues * add missing contributors
1 parent 91c67fb commit fcd8f05

File tree

10 files changed

+3944
-3794
lines changed

10 files changed

+3944
-3794
lines changed

RELEASES.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
- Handle documentation and warnings when integers are provided to (f)gw solvers based on cg (Issue #530, PR #559)
2424
- Correct independence of `fgw_barycenters` to `init_C` and `init_X` (Issue #547, PR #566)
2525
- Avoid precision change when computing norm using PyTorch backend (Discussion #570, PR #572)
26+
- Create `ot/bregman/`repository (Issue #567, PR #569)
27+
2628

2729
## 0.9.1
2830
*August 2023*

ot/bregman.py

Lines changed: 0 additions & 3794 deletions
This file was deleted.

ot/bregman/__init__.py

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
# -*- coding: utf-8 -*-
2+
"""
3+
Solvers related to Bregman projections for entropic regularized OT
4+
"""
5+
6+
# Author: Remi Flamary <remi.flamary@unice.fr>
7+
# Cédric Vincent-Cuaz <cedvincentcuaz@gmail.com>
8+
#
9+
# License: MIT License
10+
11+
from ._utils import (geometricBar,
12+
geometricMean,
13+
projR,
14+
projC)
15+
16+
from ._sinkhorn import (sinkhorn,
17+
sinkhorn2,
18+
sinkhorn_knopp,
19+
sinkhorn_log,
20+
greenkhorn,
21+
sinkhorn_stabilized,
22+
sinkhorn_epsilon_scaling)
23+
24+
from ._barycenter import (barycenter,
25+
barycenter_sinkhorn,
26+
free_support_sinkhorn_barycenter,
27+
barycenter_stabilized,
28+
barycenter_debiased,
29+
jcpot_barycenter)
30+
31+
from ._convolutional import (convolutional_barycenter2d,
32+
convolutional_barycenter2d_debiased)
33+
34+
from ._empirical import (empirical_sinkhorn,
35+
empirical_sinkhorn2,
36+
empirical_sinkhorn_divergence)
37+
38+
from ._screenkhorn import (screenkhorn)
39+
40+
from ._dictionary import (unmix)
41+
42+
43+
__all__ = ['geometricBar', 'geometricMean', 'projR', 'projC',
44+
'sinkhorn', 'sinkhorn2', 'sinkhorn_knopp', 'sinkhorn_log',
45+
'greenkhorn', 'sinkhorn_stabilized', 'sinkhorn_epsilon_scaling',
46+
'barycenter', 'barycenter_sinkhorn', 'free_support_sinkhorn_barycenter',
47+
'barycenter_stabilized', 'barycenter_debiased', 'jcpot_barycenter',
48+
'convolutional_barycenter2d', 'convolutional_barycenter2d_debiased',
49+
'empirical_sinkhorn', 'empirical_sinkhorn2',
50+
'empirical_sinkhorn_divergence',
51+
'screenkhorn',
52+
'unmix'
53+
]

0 commit comments

Comments
 (0)