Rename varinfo -> get_varinfo

Author: penelopeysm

src/mcmc/external_sampler.jl

@@ -90,8 +90,8 @@ struct TuringState{S,M,V}
     ldf::DynamicPPL.LogDensityFunction{M,V}
 end
 
-varinfo(state::TuringState) = state.ldf.varinfo
-varinfo(state::AbstractVarInfo) = state
+get_varinfo(state::TuringState) = state.ldf.varinfo
+get_varinfo(state::AbstractVarInfo) = state
 
 getparams(::DynamicPPL.Model, transition::AdvancedHMC.Transition) = transition.z.θ
 function getparams(model::DynamicPPL.Model, state::AdvancedHMC.HMCState)

src/mcmc/gibbs.jl

@@ -342,7 +342,7 @@ struct GibbsState{V<:DynamicPPL.AbstractVarInfo,S}
     states::S
 end
 
-varinfo(state::GibbsState) = state.vi
+get_varinfo(state::GibbsState) = state.vi
 
 """
 Initialise a VarInfo for the Gibbs sampler.
@@ -464,7 +464,7 @@ function gibbs_initialstep_recursive(
         initial_params=initial_params_local,
         kwargs...,
     )
-    new_vi_local = varinfo(new_state)
+    new_vi_local = get_varinfo(new_state)
     # Merge in any new variables that were introduced during the step, but that
     # were not in the domain of the current sampler.
     vi = merge(vi, get_global_varinfo(context))
@@ -492,7 +492,7 @@ function AbstractMCMC.step(
     state::GibbsState;
     kwargs...,
 )
-    vi = varinfo(state)
+    vi = get_varinfo(state)
     alg = spl.alg
     varnames = alg.varnames
     samplers = alg.samplers
@@ -512,7 +512,7 @@ function AbstractMCMC.step_warmup(
     state::GibbsState;
     kwargs...,
 )
-    vi = varinfo(state)
+    vi = get_varinfo(state)
     alg = spl.alg
     varnames = alg.varnames
     samplers = alg.samplers
@@ -607,7 +607,7 @@ state for this sampler. This is relevant when multilple samplers are sampling th
 variables, and one might need it to be linked while the other doesn't.
 """
 function match_linking!!(varinfo_local, prev_state_local, model)
-    prev_varinfo_local = varinfo(prev_state_local)
+    prev_varinfo_local = get_varinfo(prev_state_local)
     was_linked = DynamicPPL.istrans(prev_varinfo_local)
     is_linked = DynamicPPL.istrans(varinfo_local)
     if was_linked && !is_linked
@@ -689,7 +689,7 @@ function gibbs_step_recursive(
     # Take a step with the local sampler.
     new_state = last(step_function(rng, conditioned_model, sampler, state; kwargs...))
 
-    new_vi_local = varinfo(new_state)
+    new_vi_local = get_varinfo(new_state)
     # Merge the latest values for all the variables in the current sampler.
     new_global_vi = merge(get_global_varinfo(context), new_vi_local)
     new_global_vi = setlogp!!(new_global_vi, getlogp(new_vi_local))

test/mcmc/gibbs.jl

@@ -822,11 +822,11 @@ end
         ]
         @testset "$(sampler_inner)" for sampler_inner in samplers_inner
             sampler = Gibbs(@varname(m1) => sampler_inner, @varname(m2) => sampler_inner)
-            # Random.seed!(42)
-            # chain = sample(
-            #     model, sampler, 1000; discard_initial=1000, thinning=10, n_adapts=0
-            # )
-            # check_numerical(chain, [:m1, :m2], [-0.2, 0.6]; atol=0.1)
+            Random.seed!(42)
+            chain = sample(
+                model, sampler, 1000; discard_initial=1000, thinning=10, n_adapts=0
+            )
+            check_numerical(chain, [:m1, :m2], [-0.2, 0.6]; atol=0.1)
             check_logp_correct(sampler_inner)
         end
     end