Skip to content

[MRG] MM algorithms for UOT #362

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.

Sign up for GitHub

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 35 commits into from
Apr 11, 2022
Merged

[MRG] MM algorithms for UOT #362

Changes from 1 commit
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
850d116
bugfix
lchapel Oct 13, 2020
573fbd5
Merge branch 'lchapel-partial-W-and-GW'
lchapel Oct 14, 2020
2b433d1
update refs partial OT
lchapel Oct 14, 2020
bf40e97
fixes small typos in plot_partial_wass_and_gromov
lchapel Oct 14, 2020
8bfdd43
fix small bugs in partial.py
lchapel Oct 14, 2020
096b878
Merge branch 'master' of https://github.com/PythonOT/POT
lchapel Oct 14, 2020
5302f6d
update README
lchapel Oct 14, 2020
5a1c998
pep8 bugfix
lchapel Oct 14, 2020
d136c8e
modif doctest
lchapel Oct 14, 2020
dcbd1b5
fix bugtests
lchapel Oct 14, 2020
eedf08d
update on test_partial and test on the numerical precision on ot/partial
lchapel Oct 15, 2020
26a843f
resolve merge pb
lchapel Oct 20, 2020
fc7bc8d
Merge branch 'master' into master
rflamary Oct 22, 2020
02b2c72
Delete partial.py
lchapel Mar 10, 2022
e4c50d5
Merge branch 'master' of https://github.com/PythonOT/POT into PythonO…
lchapel Mar 14, 2022
96500a4
Merge branch 'PythonOT-master'
lchapel Mar 14, 2022
63601c4
Merge branch 'PythonOT:master' into master
lchapel Apr 4, 2022
a33a994
update unbalanced: mm algo+plot
lchapel Apr 8, 2022
f37bcf2
update unbalanced: mm algo+plot
lchapel Apr 8, 2022
ef0d15c
update unbalanced: mm algo+plot
lchapel Apr 8, 2022
50ebbed
Merge branch 'master' into master
rflamary Apr 8, 2022
44d799d
update unbalanced: mm algo+plot
lchapel Apr 8, 2022
ecfbbcc
Merge branch 'master' of https://github.com/lchapel/POT
lchapel Apr 8, 2022
8fa78be
update unbalanced: mm algo+plot
lchapel Apr 8, 2022
f11caf2
add test mm algo unbalanced OT
lchapel Apr 11, 2022
b944132
add test mm algo unbalanced OT
lchapel Apr 11, 2022
97282df
add test mm algo unbalanced OT
lchapel Apr 11, 2022
adf0662
add test mm algo unbalanced OT
lchapel Apr 11, 2022
49a71a0
add test mm algo unbalanced OT
lchapel Apr 11, 2022
fc37e17
add test mm algo unbalanced OT
lchapel Apr 11, 2022
915a4c6
add test mm algo unbalanced OT
lchapel Apr 11, 2022
c574874
add test mm algo unbalanced OT
lchapel Apr 11, 2022
de19311
update unbalanced: mm algo+plot
lchapel Apr 11, 2022
4251357
update unbalanced: mm algo+plot
lchapel Apr 11, 2022
8385b6d
update releases.md with new MM UOT algorithms
lchapel Apr 11, 2022
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
Prev Previous commit
Next Next commit
add test mm algo unbalanced OT
  • Loading branch information
@lchapel
lchapel committed Apr 11, 2022
commit 97282df7e7a8512e5bb27a2d93b2c8e845feb985
4 changes: 2 additions & 2 deletions test/test_unbalanced.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,11 +321,11 @@ def test_mm_convergence(nx):
atol=1e-5)

# check in case no histogram is provided
M_np = nx.to_numpy(M)
M = nx.to_numpy(M)
a_np, b_np = np.array([]), np.array([])
a, b = nx.from_numpy(a_np, b_np)

G_kl_null, _ = ot.unbalanced.mm_unbalanced(a, b, M, reg_m=reg_m, div='kl')
G_kl_null, _ = ot.unbalanced.mm_unbalanced(a, b, M_, reg_m=reg_m, div='kl')
G_l2_null, _ = ot.unbalanced.mm_unbalanced(a, b, M, reg_m=reg_m, div='l2')
np.testing.assert_allclose(G_kl_null, G_kl)
np.testing.assert_allclose(G_l2_null, G_l2)
Expand Down