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

Symmetric quad [DRAFT] #160

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open

Symmetric quad [DRAFT] #160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
6bb3c35
symmetric quadratic OT newton
zsteve Jan 12, 2022
7dc5a51
update version
zsteve Jan 12, 2022
d9ce05a
fix bug
zsteve Jan 12, 2022
06f0680
fix bug
zsteve Jan 12, 2022
c95b498
merge
zsteve Jan 13, 2022
0e1cf68
update
zsteve Jan 26, 2022
fa2e61a
update by merging
zsteve Apr 25, 2023
8f7f899
test implementation of active set method for QROT in symmetric setting
zsteve Jun 25, 2023
e757f79
draft implementation of active set method for QROT
zsteve Jun 25, 2023
b309a67
clean up
zsteve Jun 28, 2023
bb223f6
clean up
zsteve Aug 17, 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
5 changes: 5 additions & 0 deletions Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,15 @@ version = "0.3.20"
[deps]
ExactOptimalTransport = "24df6009-d856-477c-ac5c-91f668376b31"
IterativeSolvers = "42fd0dbc-a981-5370-80f2-aaf504508153"
LazyArrays = "5078a376-72f3-5289-bfd5-ec5146d43c02"
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
LogExpFunctions = "2ab3a3ac-af41-5b50-aa03-7779005ae688"
NNlib = "872c559c-99b0-510c-b3b7-b6c96a88d5cd"
NearestNeighborDescent = "dd2c4c9e-a32f-5b2f-b342-08c2f244fce8"
NearestNeighbors = "b8a86587-4115-5ab1-83bc-aa920d37bbce"
RandomMatrix = "0af1cf96-9b30-454e-9d9e-87908f700846"
Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"

[compat]
ExactOptimalTransport = "0.1, 0.2"
Expand Down
2 changes: 2 additions & 0 deletions src/OptimalTransport.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ using LinearAlgebra
using IterativeSolvers
using LogExpFunctions: LogExpFunctions
using NNlib: NNlib
using SparseArrays

export SinkhornGibbs, SinkhornStabilized, SinkhornEpsilonScaling
export SinkhornBarycenterGibbs
Expand All @@ -39,6 +40,7 @@ include("entropic/sinkhorn_solve.jl")

include("quadratic.jl")
include("quadratic_newton.jl")
include("quadratic_newton_symm.jl")

include("dual/entropic_dual.jl")

Expand Down
Loading