Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/TuringLang/Turing.jl into…
Browse files Browse the repository at this point in the history
… martint/#634
  • Loading branch information
trappmartin committed Apr 13, 2019
2 parents c4aa64c + 65371ce commit fe63a3e
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 2 deletions.
4 changes: 3 additions & 1 deletion src/inference/support/hmc_core.jl
Original file line number Diff line number Diff line change
Expand Up @@ -232,8 +232,10 @@ function find_good_eps(model, spl::Sampler{T}, vi::VarInfo) where T
momentum_sampler = gen_momentum_sampler(vi, spl)
grad_func = gen_grad_func(vi, spl, model)
H_func = gen_H_func()
θ = vi[spl]
θ, lj = vi[spl], vi.logp
ϵ = _find_good_eps(θ, lj_func, grad_func, H_func, momentum_sampler)
vi[spl] = θ
setlogp!(vi, lj)
@info "[Turing] found initial ϵ: "
return ϵ
end
Expand Down
2 changes: 2 additions & 0 deletions test/inference/hmcda.jl
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ using Turing: Sampler
include("../test_utils/AllUtils.jl")

@testset "hmcda.jl" begin
Random.seed!(1234)

@numerical_testset "hmcda inference" begin
alg1 = HMCDA(3000, 1000, 0.65, 0.015)
# alg2 = Gibbs(3000, HMCDA(1, 200, 0.65, 0.35, :m), HMC(1, 0.25, 3, :s))
Expand Down
2 changes: 1 addition & 1 deletion test/utilities/io.jl
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ include("../test_utils/AllUtils.jl")

@testset "io.jl" begin
@testset "chain save/resume" begin
Random.seed!(123)
Random.seed!(1234)

alg1 = HMCDA(3000, 1000, 0.65, 0.15)
alg2 = PG(20, 500)
Expand Down

0 comments on commit fe63a3e

Please sign in to comment.