Skip to content
Merged
Show file tree
Hide file tree
Changes from 10 commits
Commits
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: 2 additions & 0 deletions .github/workflows/Docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ jobs:
steps:
- name: Build and deploy Documenter.jl docs
uses: TuringLang/actions/DocsDocumenter@main
with:
julia-version: 1.11
Comment on lines 26 to +28
Copy link
Member Author

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


- name: Run doctests
shell: julia --project=docs --color=yes {0}
Expand Down
4 changes: 2 additions & 2 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name = "SliceSampling"
uuid = "43f4d3e8-9711-4a8c-bd1b-03ac73a255cf"
version = "0.7.8"
version = "0.7.9"

[deps]
AbstractMCMC = "80f14c24-f653-4e6a-9b94-39d6b0f70001"
Expand All @@ -21,7 +21,7 @@ Distributions = "0.25"
LinearAlgebra = "1"
LogDensityProblems = "2"
Random = "1"
Turing = "0.40"
Turing = "0.41"
julia = "1.10"

[extras]
Expand Down
2 changes: 1 addition & 1 deletion docs/Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@ Random = "1"
SliceSampling = "0.7.1"
StableRNGs = "1"
Statistics = "1"
Turing = "0.37, 0.38, 0.39, 0.40"
Turing = "0.41"
julia = "1.10"
5 changes: 3 additions & 2 deletions docs/src/gibbs_polar.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,9 @@ end
model = demo()

n_samples = 1000
latent_chain = sample(model, externalsampler(LatentSlice(10)), n_samples; initial_params=ones(10))
polar_chain = sample(model, externalsampler(GibbsPolarSlice(10)), n_samples; initial_params=ones(10))
initial_params = InitFromParams((x = ones(10),))
latent_chain = sample(model, externalsampler(LatentSlice(10)), n_samples; initial_params=initial_params)
polar_chain = sample(model, externalsampler(GibbsPolarSlice(10)), n_samples; initial_params=initial_params)

l = @layout [a; b]
p1 = Plots.plot(1:n_samples, latent_chain[:,1,:], ylims=[-10,10], label="LSS")
Expand Down
21 changes: 9 additions & 12 deletions ext/SliceSamplingTuringExt.jl
Original file line number Diff line number Diff line change
Expand Up @@ -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(ℓ, θ)
Copy link
Member Author

Choose a reason for hiding this comment

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

calling logdensity leads to an extra model evaluation, we can skip this by using the logjoint which is already in the varinfo

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

Expand Down
2 changes: 1 addition & 1 deletion test/Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ MCMCTesting = "0.3"
Random = "1"
StableRNGs = "1"
Test = "1"
Turing = "0.37, 0.38, 0.39, 0.40"
Turing = "0.41"
julia = "1.10"
2 changes: 1 addition & 1 deletion test/turing.jl
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
model,
externalsampler(sampler),
n_samples;
initial_params=[1.0, 0.1],
initial_params=InitFromParams((s=1.0, m=0.1)),
progress=false,
)

Expand Down
Loading