Skip to content
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

Feature/ulrgw #410

Merged
merged 49 commits into from
Sep 8, 2023
Merged

Feature/ulrgw #410

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
19756c1
Remove low-rank from GromovWasserstein solver
michalk8 Aug 2, 2023
a079761
First skeleton loop
michalk8 Aug 2, 2023
0d0c85f
Add LRGW implementation
michalk8 Aug 3, 2023
1f7f10d
Add ULFGW
michalk8 Aug 3, 2023
07aeedf
Revert change
michalk8 Aug 3, 2023
6d257ff
Add a TODO
michalk8 Aug 3, 2023
bf0a50d
Fix `grad_g` in the fused case
michalk8 Aug 4, 2023
7b8a0f4
Update docs
michalk8 Aug 17, 2023
5855a32
Remove duplicate citation
michalk8 Aug 17, 2023
01bd8e6
Merge branch 'main' into feature/ulrgw
michalk8 Aug 18, 2023
e4a70c3
Fix cost for the fused case
michalk8 Aug 18, 2023
4ecdca0
Fix bugs in TI
michalk8 Aug 18, 2023
04a3e8b
Remove unused import
michalk8 Aug 18, 2023
4fb9ee4
Change way array extraction in LR init works
michalk8 Aug 31, 2023
43d39eb
Disallow LR in the old GW solver
michalk8 Aug 31, 2023
0747c56
Disallow LR in old GW class
michalk8 Aug 31, 2023
83a1c36
Remove `is_entropic` property
michalk8 Aug 31, 2023
b783f3a
Use `jnp.linalg.norm`
michalk8 Aug 31, 2023
0f661cc
Simplify initializers in GW
michalk8 Aug 31, 2023
d79ce31
Simplify initializer creation for low-rank
michalk8 Aug 31, 2023
1be699f
Remove temporary name
michalk8 Aug 31, 2023
87284ae
Fix norms
michalk8 Aug 31, 2023
30f275e
Fix linkcheck
michalk8 Aug 31, 2023
f11e19f
Remove old initializers test
michalk8 Sep 1, 2023
6d4775e
Fix more initializer tests
michalk8 Sep 1, 2023
fdbafe9
Remove `LRQuadraticInitializer`, `reg_ot_cost -> reg_gw_cost`
michalk8 Sep 1, 2023
17b447a
`host_callback` -> `io_callback`
michalk8 Sep 1, 2023
3714057
Fix more initializers tests
michalk8 Sep 1, 2023
0fa6be2
Fix more tests
michalk8 Sep 1, 2023
3843609
Remove initializer mention from the docs
michalk8 Sep 1, 2023
62aad99
Remove mention of LR initializer
michalk8 Sep 1, 2023
4e57972
Start incorporating GWLoss
michalk8 Sep 1, 2023
b312126
Simplify reg GW cost computation
michalk8 Sep 1, 2023
a499102
Finish `primal_cost`
michalk8 Sep 1, 2023
4bcb71b
Don't calculate unbal. grads in balanced case
michalk8 Sep 1, 2023
eea362f
Fix `primal_cost` in balanced case
michalk8 Sep 1, 2023
3f14488
Update GW LR notebook
michalk8 Sep 1, 2023
8207696
Convert quad problem to LR if possible
michalk8 Sep 4, 2023
ba272f0
Convert quad problem to LR if possible
michalk8 Sep 4, 2023
c565ee3
Regenerate GWLR Sinkhorn
michalk8 Sep 5, 2023
f508d5d
Regenerate `LRSinkhorn`
michalk8 Sep 5, 2023
f7f440f
Merge remote-tracking branch 'upstream/main' into feature/ulrgw
michalk8 Sep 5, 2023
f703a55
Merge branch 'feature/ulrgw' of ssh://github.com/michalk8/ott into fe…
michalk8 Sep 5, 2023
ec45825
[ci skip] Fix linter
michalk8 Sep 5, 2023
68d3ce2
Fix convergence metric
michalk8 Sep 7, 2023
afd8ea6
Undo TODO
michalk8 Sep 7, 2023
e006eae
Fix factor
michalk8 Sep 7, 2023
e06f1b0
Regenerate notebooks
michalk8 Sep 7, 2023
f04757f
Add tests
michalk8 Sep 7, 2023
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
2 changes: 1 addition & 1 deletion src/ott/solvers/quadratic/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
from . import gromov_wasserstein, gw_barycenter
from . import gromov_wasserstein, gromov_wasserstein_lr, gw_barycenter
Loading