Skip to content
Open
Show file tree
Hide file tree
Changes from all 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
4 changes: 4 additions & 0 deletions HISTORY.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# 0.41.2

Fixed NUTS not correctly specifying the number of adaptation steps when calling `AdvancedHMC.initialize!`.

# 0.41.1

The `ModeResult` struct returned by `maximum_a_posteriori` and `maximum_likelihood` can now be wrapped in `InitFromParams()`.
Expand Down
2 changes: 1 addition & 1 deletion Project.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name = "Turing"
uuid = "fce5fe82-541a-59a6-adf8-730c64b5f9a0"
version = "0.41.1"
version = "0.41.2"

[deps]
ADTypes = "47edcb42-4c32-4615-8424-f2b9edc5f35b"
Expand Down
10 changes: 6 additions & 4 deletions src/mcmc/hmc.jl
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ function Turing.Inference.initialstep(
end
# Generate a kernel and adaptor.
kernel = make_ahmc_kernel(spl, ϵ)
adaptor = AHMCAdaptor(spl, hamiltonian.metric; ϵ=ϵ)
adaptor = AHMCAdaptor(spl, hamiltonian.metric, nadapts; ϵ=ϵ)

transition = Transition(model, vi, NamedTuple())
state = HMCState(vi, 1, kernel, hamiltonian, z, adaptor)
Expand Down Expand Up @@ -480,7 +480,9 @@ end
#### Default HMC stepsize and mass matrix adaptor
####

function AHMCAdaptor(alg::AdaptiveHamiltonian, metric::AHMC.AbstractMetric; ϵ=alg.ϵ)
function AHMCAdaptor(
alg::AdaptiveHamiltonian, metric::AHMC.AbstractMetric, nadapts::Int; ϵ=alg.ϵ
)
pc = AHMC.MassMatrixAdaptor(metric)
da = AHMC.StepSizeAdaptor(alg.δ, ϵ)

Expand All @@ -491,13 +493,13 @@ function AHMCAdaptor(alg::AdaptiveHamiltonian, metric::AHMC.AbstractMetric; ϵ=a
adaptor = AHMC.NaiveHMCAdaptor(pc, da) # there is actually no adaptation for mass matrix
else
adaptor = AHMC.StanHMCAdaptor(pc, da)
AHMC.initialize!(adaptor, alg.n_adapts)
AHMC.initialize!(adaptor, nadapts)
end
end

return adaptor
end

function AHMCAdaptor(::Hamiltonian, ::AHMC.AbstractMetric; kwargs...)
function AHMCAdaptor(::Hamiltonian, ::AHMC.AbstractMetric, nadapts::Int; kwargs...)
return AHMC.Adaptation.NoAdaptation()
end
Loading