Skip to content

Commit 4210f12

Browse files
committed
Remove has_dot_assume check
1 parent 0c8b28f commit 4210f12

File tree

1 file changed

+2
-23
lines changed

1 file changed

+2
-23
lines changed

test/mcmc/gibbs.jl

Lines changed: 2 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -33,18 +33,6 @@ function check_transition_varnames(transition::Turing.Inference.Transition, pare
3333
end
3434
end
3535

36-
const DEMO_MODELS_WITHOUT_DOT_ASSUME = Union{
37-
DynamicPPL.Model{typeof(DynamicPPL.TestUtils.demo_assume_index_observe)},
38-
DynamicPPL.Model{typeof(DynamicPPL.TestUtils.demo_assume_multivariate_observe)},
39-
DynamicPPL.Model{typeof(DynamicPPL.TestUtils.demo_assume_dot_observe)},
40-
DynamicPPL.Model{typeof(DynamicPPL.TestUtils.demo_assume_multivariate_observe_literal)},
41-
DynamicPPL.Model{typeof(DynamicPPL.TestUtils.demo_assume_observe_literal)},
42-
DynamicPPL.Model{typeof(DynamicPPL.TestUtils.demo_assume_dot_observe_literal)},
43-
DynamicPPL.Model{typeof(DynamicPPL.TestUtils.demo_assume_matrix_observe_matrix_index)},
44-
}
45-
has_dot_assume(::DEMO_MODELS_WITHOUT_DOT_ASSUME) = false
46-
has_dot_assume(::DynamicPPL.Model) = true
47-
4836
@testset verbose = true "GibbsContext" begin
4937
@testset "type stability" begin
5038
struct Wrapper{T<:Real}
@@ -614,19 +602,10 @@ end
614602
Turing.Gibbs(@varname(s) => NUTS(), @varname(m) => NUTS()),
615603
Turing.Gibbs(@varname(s) => NUTS(), @varname(m) => HMC(0.01, 4)),
616604
Turing.Gibbs(@varname(s) => NUTS(), @varname(m) => ESS()),
605+
Turing.Gibbs(@varname(s) => HMC(0.01, 4), @varname(m) => MH()),
606+
Turing.Gibbs(@varname(s) => MH(), @varname(m) => HMC(0.01, 4)),
617607
]
618608

619-
if !has_dot_assume(model)
620-
# Add in some MH samplers, which are not compatible with `.~`.
621-
append!(
622-
samplers,
623-
[
624-
Turing.Gibbs(@varname(s) => HMC(0.01, 4), @varname(m) => MH()),
625-
Turing.Gibbs(@varname(s) => MH(), @varname(m) => HMC(0.01, 4)),
626-
],
627-
)
628-
end
629-
630609
@testset "$sampler" for sampler in samplers
631610
# Check that taking steps performs as expected.
632611
rng = Random.default_rng()

0 commit comments

Comments
 (0)