diff options
| author | arincbulgur <37184019+arincbulgur@users.noreply.github.com> | 2022-12-23 11:45:23 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-23 17:45:23 +0100 |
| commit | 058d275565f0f65c23e06853812d5eb3a6ebdcef (patch) | |
| tree | 669668c3df3f556f9af885f00f4bb2c81ccf4929 /ot | |
| parent | c9578b4cc29b58d9cde9ff586870140021471fc1 (diff) | |
[MRG] Fix warning bug in sinkhorn2 (#417)
* Pass warn argument downstream in sinkhorn2 method.
* releases.md
* Fix unittest.
Co-authored-by: Rémi Flamary <remi.flamary@gmail.com>
Diffstat (limited to 'ot')
| -rw-r--r-- | ot/bregman.py | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/ot/bregman.py b/ot/bregman.py index aa3cf1a..c33c92c 100644 --- a/ot/bregman.py +++ b/ot/bregman.py @@ -323,15 +323,18 @@ def sinkhorn2(a, b, M, reg, method='sinkhorn', numItermax=1000, if len(b.shape) < 2: if method.lower() == 'sinkhorn': res = sinkhorn_knopp(a, b, M, reg, numItermax=numItermax, - stopThr=stopThr, verbose=verbose, log=log, + stopThr=stopThr, verbose=verbose, + log=log, warn=warn, **kwargs) elif method.lower() == 'sinkhorn_log': res = sinkhorn_log(a, b, M, reg, numItermax=numItermax, - stopThr=stopThr, verbose=verbose, log=log, + stopThr=stopThr, verbose=verbose, + log=log, warn=warn, **kwargs) elif method.lower() == 'sinkhorn_stabilized': res = sinkhorn_stabilized(a, b, M, reg, numItermax=numItermax, - stopThr=stopThr, verbose=verbose, log=log, + stopThr=stopThr, verbose=verbose, + log=log, warn=warn, **kwargs) else: raise ValueError("Unknown method '%s'." % method) @@ -344,15 +347,18 @@ def sinkhorn2(a, b, M, reg, method='sinkhorn', numItermax=1000, if method.lower() == 'sinkhorn': return sinkhorn_knopp(a, b, M, reg, numItermax=numItermax, - stopThr=stopThr, verbose=verbose, log=log, + stopThr=stopThr, verbose=verbose, + log=log, warn=warn, **kwargs) elif method.lower() == 'sinkhorn_log': return sinkhorn_log(a, b, M, reg, numItermax=numItermax, - stopThr=stopThr, verbose=verbose, log=log, + stopThr=stopThr, verbose=verbose, + log=log, warn=warn, **kwargs) elif method.lower() == 'sinkhorn_stabilized': return sinkhorn_stabilized(a, b, M, reg, numItermax=numItermax, - stopThr=stopThr, verbose=verbose, log=log, + stopThr=stopThr, verbose=verbose, + log=log, warn=warn, **kwargs) else: raise ValueError("Unknown method '%s'." % method) |