Skip to content

Commit

Permalink
add davibarreira's sinkhorn_divergence with some modifications (#145)
Browse files Browse the repository at this point in the history
* add davibarreira's sinkhorn_divergence with some modifications

* added documentation entry for sinkhorn_divergence

* add statsbase to test deps

* add empirical measure example for sinkhorn divergence

* format

* add literate

* implement symmetric sinkhorn

* implement sinkhorn_loss

* change formula for obj()

* make empirical example run faster

* update docstrings

* Update src/entropic/sinkhorn.jl

Co-authored-by: David Widmann <devmotion@users.noreply.github.com>

* Update src/entropic/sinkhorn.jl

Co-authored-by: David Widmann <devmotion@users.noreply.github.com>

* address review comments

* fix naming of plan and sinkhorn_plan

* address comments

* fix sinkhorn_divergence and docs

* update docs

* format

* remove sinkhorn_loss

* Update examples/empirical_sinkhorn_div/script.jl

Co-authored-by: David Widmann <devmotion@users.noreply.github.com>

* Update src/entropic/sinkhorn_divergence.jl

Co-authored-by: David Widmann <devmotion@users.noreply.github.com>

* Update src/entropic/symmetric.jl

Co-authored-by: David Widmann <devmotion@users.noreply.github.com>

* Update src/entropic/sinkhorn_gibbs.jl

Co-authored-by: David Widmann <devmotion@users.noreply.github.com>

* Update src/entropic/sinkhorn_gibbs.jl

Co-authored-by: David Widmann <devmotion@users.noreply.github.com>

* Update src/entropic/symmetric.jl

Co-authored-by: David Widmann <devmotion@users.noreply.github.com>

* bump version

Co-authored-by: David Widmann <devmotion@users.noreply.github.com>
  • Loading branch information
zsteve and devmotion authored Sep 22, 2021
1 parent cc3ab16 commit 803274d
Show file tree
Hide file tree
Showing 14 changed files with 1,627 additions and 16 deletions.
5 changes: 3 additions & 2 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "OptimalTransport"
uuid = "7e02d93a-ae51-4f58-b602-d97af76e3b33"
authors = ["zsteve <stephenz@student.unimelb.edu.au>"]
version = "0.3.16"
version = "0.3.17"

[deps]
ExactOptimalTransport = "24df6009-d856-477c-ac5c-91f668376b31"
Expand All @@ -28,6 +28,7 @@ Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
ReverseDiff = "37e2e3b7-166d-5795-8a7a-e32c996b4267"
SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"

[targets]
test = ["Distances", "ForwardDiff", "ReverseDiff", "Pkg", "PythonOT", "Random", "SafeTestsets", "Test"]
test = ["Distances", "ForwardDiff", "ReverseDiff", "Pkg", "PythonOT", "Random", "SafeTestsets", "Test", "StatsBase"]
1 change: 1 addition & 0 deletions docs/src/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ squared2wasserstein
```@docs
sinkhorn
sinkhorn2
sinkhorn_divergence
sinkhorn_barycenter
```

Expand Down
Loading

2 comments on commit 803274d

@zsteve
Copy link
Member Author

@zsteve zsteve commented on 803274d Sep 22, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JuliaRegistrator
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Registration pull request created: JuliaRegistries/General/45341

After the above pull request is merged, it is recommended that a tag is created on this repository for the registered package version.

This will be done automatically if the Julia TagBot GitHub Action is installed, or can be done manually through the github interface, or via:

git tag -a v0.3.17 -m "<description of version>" 803274d7cefbb75e49b1edcf3a4220ac59136d35
git push origin v0.3.17

Please sign in to comment.