Skip to content
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
1 change: 1 addition & 0 deletions RELEASES.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ This new release adds support for sparse cost matrices and a new lazy EMD solver
- Debug Debug linux test core dump (PR #815)
- Fix entropic regularization in `gcg`(PR #817, Issue #758)
- Fix documentation build on master with submodules (PR #818)
- Fix failing test for unbalanced solver with generic regularization (PR #824)

## 0.9.6.post1

Expand Down
5 changes: 5 additions & 0 deletions ot/solvers.py
Original file line number Diff line number Diff line change
Expand Up @@ -557,6 +557,11 @@ def solve(
isinstance(reg_type, tuple)
or reg_type.lower() in ["kl", "l2", "entropy"]
) and unbalanced_type.lower() in ["kl", "l2", "tv"]:
if isinstance(reg_type, tuple) and nx.__name__ == "tf":
raise NotImplementedError(
"Custom regularization is not implemented for TensorFlow backend."
)

if max_iter is None:
max_iter = 1000
if tol is None:
Expand Down
Loading