diff options
| author | Cédric Vincent-Cuaz <cedvincentcuaz@gmail.com> | 2023-06-12 12:01:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-12 12:01:48 +0200 |
| commit | 9076f02903ba2fb9ea9fe704764a755cad8dcd63 (patch) | |
| tree | b7fda84880c5dabd1c441a1655741493e0683342 /ot/gromov/__init__.py | |
| parent | f0dab2f684f4fc768fd50e0b70918e075dcdd0f3 (diff) | |
[FEAT] Entropic gw/fgw/srgw/srfgw solvers (#455)upstream/latest
* add entropic fgw + fgw bary + srgw + srfgw with tests
* add exemples for entropic srgw - srfgw solvers
* add PPA solvers for GW/FGW + complete previous commits
* update readme
* add tests
* add examples + tests + warning in entropic solvers + releases
* reduce testing runtimes for test_gromov
* fix conflicts
* optional marginals
* improve coverage
* gromov doc harmonization
* fix pep8
* complete optional marginal for entropic srfgw
---------
Co-authored-by: Rémi Flamary <remi.flamary@gmail.com>
Diffstat (limited to 'ot/gromov/__init__.py')
| -rw-r--r-- | ot/gromov/__init__.py | 37 |
1 files changed, 25 insertions, 12 deletions
diff --git a/ot/gromov/__init__.py b/ot/gromov/__init__.py index 6184edf..e39d906 100644 --- a/ot/gromov/__init__.py +++ b/ot/gromov/__init__.py @@ -11,38 +11,51 @@ Solvers related to Gromov-Wasserstein problems. # All submodules and packages from ._utils import (init_matrix, tensor_product, gwloss, gwggrad, - update_square_loss, update_kl_loss, + update_square_loss, update_kl_loss, update_feature_matrix, init_matrix_semirelaxed) + from ._gw import (gromov_wasserstein, gromov_wasserstein2, fused_gromov_wasserstein, fused_gromov_wasserstein2, - solve_gromov_linesearch, gromov_barycenters, fgw_barycenters, - update_structure_matrix, update_feature_matrix) + solve_gromov_linesearch, gromov_barycenters, fgw_barycenters) + from ._bregman import (entropic_gromov_wasserstein, entropic_gromov_wasserstein2, - entropic_gromov_barycenters) + entropic_gromov_barycenters, + entropic_fused_gromov_wasserstein, + entropic_fused_gromov_wasserstein2, + entropic_fused_gromov_barycenters) + from ._estimators import (GW_distance_estimation, pointwise_gromov_wasserstein, sampled_gromov_wasserstein) + from ._semirelaxed import (semirelaxed_gromov_wasserstein, semirelaxed_gromov_wasserstein2, semirelaxed_fused_gromov_wasserstein, semirelaxed_fused_gromov_wasserstein2, - solve_semirelaxed_gromov_linesearch) + solve_semirelaxed_gromov_linesearch, + entropic_semirelaxed_gromov_wasserstein, + entropic_semirelaxed_gromov_wasserstein2, + entropic_semirelaxed_fused_gromov_wasserstein, + entropic_semirelaxed_fused_gromov_wasserstein2) + from ._dictionary import (gromov_wasserstein_dictionary_learning, gromov_wasserstein_linear_unmixing, fused_gromov_wasserstein_dictionary_learning, fused_gromov_wasserstein_linear_unmixing) -__all__ = ['init_matrix', 'tensor_product', 'gwloss', 'gwggrad', - 'update_square_loss', 'update_kl_loss', 'init_matrix_semirelaxed', +__all__ = ['init_matrix', 'tensor_product', 'gwloss', 'gwggrad', 'update_square_loss', + 'update_kl_loss', 'update_feature_matrix', 'init_matrix_semirelaxed', 'gromov_wasserstein', 'gromov_wasserstein2', 'fused_gromov_wasserstein', 'fused_gromov_wasserstein2', 'solve_gromov_linesearch', 'gromov_barycenters', - 'fgw_barycenters', 'update_structure_matrix', 'update_feature_matrix', - 'entropic_gromov_wasserstein', 'entropic_gromov_wasserstein2', - 'entropic_gromov_barycenters', 'GW_distance_estimation', - 'pointwise_gromov_wasserstein', 'sampled_gromov_wasserstein', + 'fgw_barycenters', 'entropic_gromov_wasserstein', 'entropic_gromov_wasserstein2', + 'entropic_gromov_barycenters', 'entropic_fused_gromov_wasserstein', + 'entropic_fused_gromov_wasserstein2', 'entropic_fused_gromov_barycenters', + 'GW_distance_estimation', 'pointwise_gromov_wasserstein', 'sampled_gromov_wasserstein', 'semirelaxed_gromov_wasserstein', 'semirelaxed_gromov_wasserstein2', 'semirelaxed_fused_gromov_wasserstein', 'semirelaxed_fused_gromov_wasserstein2', - 'solve_semirelaxed_gromov_linesearch', 'gromov_wasserstein_dictionary_learning', + 'solve_semirelaxed_gromov_linesearch', 'entropic_semirelaxed_gromov_wasserstein', + 'entropic_semirelaxed_gromov_wasserstein2', 'entropic_semirelaxed_fused_gromov_wasserstein', + 'entropic_semirelaxed_fused_gromov_wasserstein2', 'gromov_wasserstein_dictionary_learning', 'gromov_wasserstein_linear_unmixing', 'fused_gromov_wasserstein_dictionary_learning', 'fused_gromov_wasserstein_linear_unmixing'] |