-
Notifications
You must be signed in to change notification settings - Fork 3
Compat for Turing v0.41 #44
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.
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
Changes from 10 commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
ef2eb15
Compat for Turing v0.41
penelopeysm 2b6e49e
Bump patch
penelopeysm 717011b
use original vi (shouldn't make a difference)
penelopeysm 5d5779b
Update comment
penelopeysm 56f7262
bump deps in docs/ and test/ as well
penelopeysm 4c693c7
Format
penelopeysm 064dccb
That was a mistake; use getlogdensity instead of hardcoding the function
penelopeysm cb9ebb4
fix initial_params in tests
penelopeysm 0e12374
Fix docs and format
penelopeysm f97f89f
Fix more docs
penelopeysm 18dacad
Fix docstring
penelopeysm File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -38,33 +38,30 @@ end | |
| function SliceSampling.initial_sample(rng::Random.AbstractRNG, ℓ::Turing.LogDensityFunction) | ||
| n_max_attempts = 1000 | ||
|
|
||
| model = ℓ.model | ||
| vi = Turing.DynamicPPL.VarInfo(rng, model, Turing.SampleFromUniform()) | ||
| vi_spl = last(Turing.DynamicPPL.evaluate_and_sample!!(rng, model, vi, Turing.SampleFromUniform())) | ||
| θ = vi_spl[:] | ||
| ℓp = LogDensityProblems.logdensity(ℓ, θ) | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. calling |
||
| model, vi = ℓ.model, ℓ.varinfo | ||
| vi_spl = last( | ||
| Turing.DynamicPPL.init!!(rng, model, vi, Turing.DynamicPPL.InitFromUniform()) | ||
| ) | ||
| ℓp = ℓ.getlogdensity(vi_spl) | ||
|
|
||
| init_attempt_count = 1 | ||
| for attempts in 1:n_max_attempts | ||
| if attempts == 10 | ||
| @warn "Failed to find valid initial parameters after $(init_attempt_count) attempts; consider providing explicit initial parameters using the `initial_params` keyword" | ||
| end | ||
|
|
||
| # NOTE: This will sample in the unconstrained space. | ||
| vi_spl = last( | ||
| Turing.DynamicPPL.evaluate_and_sample!!( | ||
| rng, model, vi, Turing.SampleFromUniform() | ||
| ), | ||
| ) | ||
| # NOTE: This will sample in the unconstrained space if ℓ.varinfo is linked | ||
| vi_spl = last(Turing.DynamicPPL.init!!(rng, model, vi, Turing.InitFromUniform())) | ||
| ℓp = ℓ.getlogdensity(vi_spl) | ||
| θ = vi_spl[:] | ||
| ℓp = LogDensityProblems.logdensity(ℓ, θ) | ||
|
|
||
| if all(isfinite.(θ)) && isfinite(ℓp) | ||
| return θ | ||
| end | ||
| end | ||
|
|
||
| @error "Failed to find valid initial parameters after $(n_max_attempts) attempts; consider providing explicit initial parameters using the `initial_params` keyword" | ||
| θ = vi_spl[:] | ||
| return θ | ||
| end | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
the docs example uses PG, which doesn't work on 1.12 so this has to be pinned for now