Skip to content

[MRG] Backend for gromov #294

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
rflamary merged 27 commits into from
Nov 2, 2021
Merged

[MRG] Backend for gromov #294

Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
10f354d
bregman: small correction
ncassereau Oct 27, 2021
c79c038
Merge branch 'master' into gromov_backend
ncassereau Oct 27, 2021
b028dac
gromov backend first draft
ncassereau Oct 27, 2021
0709c6e
Merge branch 'gromov_backend' of https://github.com/ncassereau-idris/…
ncassereau Oct 27, 2021
081468c
Removing decorators
ncassereau Oct 27, 2021
1b642d9
Reworked casting method
ncassereau Oct 27, 2021
45f8ebf
Bug solve
ncassereau Oct 27, 2021
4bf6e3e
Removing casting
ncassereau Oct 27, 2021
85b8c32
Bug solve
ncassereau Oct 27, 2021
04207ea
toarray renamed todense ; expand_dims removed
ncassereau Oct 27, 2021
b681c00
Warning (jax not supporting sparse matrix) moved
ncassereau Oct 27, 2021
8c4da3b
Mistake corrected
ncassereau Oct 27, 2021
a41f116
test backend
ncassereau Oct 27, 2021
ee00886
Sparsity test for older versions of pytorch
ncassereau Oct 27, 2021
7ace335
Trying pytorch/1.10
ncassereau Oct 27, 2021
c3fc330
Attempt to correct torch sparse bug
ncassereau Oct 27, 2021
80c0ebe
Backend version of gromov tests
ncassereau Oct 28, 2021
3e87223
Random state introduced for remaining gromov functions
ncassereau Oct 29, 2021
8932aba
review changes
ncassereau Oct 29, 2021
9e73e4e
code coverage
ncassereau Oct 29, 2021
e353a9e
Docs (first draft, to be continued)
ncassereau Oct 29, 2021
01862a8
Merge branch 'master' into gromov_backend
rflamary Oct 29, 2021
1c4c3eb
Gromov docs
ncassereau Nov 2, 2021
1ce352c
Prettified docs
ncassereau Nov 2, 2021
d9b9978
Merge branch 'gromov_backend' of https://github.com/ncassereau-idris/…
ncassereau Nov 2, 2021
337483f
mistake corrected in the docs
ncassereau Nov 2, 2021
cb1c014
little change
ncassereau Nov 2, 2021
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
Bug solve
  • Loading branch information
@ncassereau
ncassereau committed Oct 27, 2021
commit 85b8c32b6bf2ab263067a9d7ff34c1e41a80f18a
2 changes: 1 addition & 1 deletion ot/gromov.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1460,7 +1460,7 @@ def fgw_barycenters(N, Ys, Cs, ps, lambdas, alpha, fixed_structure=False, fixed_
ps = list_to_array(*ps)
Ys = list_to_array(*Ys)
p, lambdas = list_to_array(p, lambdas)
nx = get_backend(*Cs, *Ys, *ps, p)
nx = get_backend(*Cs, *Ys, *ps)

S = len(Cs)
d = Ys[0].shape[1] # dimension on the node features
Expand Down