reverted changes to default_varinfo and LogDensityFunction

Author: torfjelde

src/logdensityfunction.jl

@@ -63,16 +63,10 @@ function LogDensityFunction(
     return LogDensityFunction(varinfo, model, SamplingContext(sampler, context))
 end
 
-function LogDensityFunction(model::Model, context::Union{Nothing,AbstractContext}=nothing)
-    # Determine the suitable varinfo for the given model and context.
-    varinfo = determine_suitable_varinfo(
-        model, context === nothing ? leafcontext(model.context) : context
-    )
-    return LogDensityFunction(varinfo, model, context)
-end
-
 function LogDensityFunction(
-    model::Model, varinfo::AbstractVarInfo, context::Union{Nothing,AbstractContext}=nothing
+    model::Model,
+    varinfo::AbstractVarInfo=VarInfo(model),
+    context::Union{Nothing,AbstractContext}=nothing,
 )
     return LogDensityFunction(varinfo, model, context)
 end

src/sampler.jl

@@ -77,8 +77,7 @@ function default_varinfo(
     context::AbstractContext,
 )
     init_sampler = initialsampler(sampler)
-    varinfo = determine_suitable_varinfo(model, SamplingContext(rng, init_sampler, context))
-    return varinfo
+    return VarInfo(rng, model, init_sampler, context)
 end
 
 function AbstractMCMC.sample(
@@ -141,7 +140,7 @@ Return the sampler that is used for generating the initial parameters when sampl
 
 By default, it returns an instance of [`SampleFromPrior`](@ref).
 """
-initialsampler(spl) = SampleFromPrior()
+initialsampler(spl::Sampler) = SampleFromPrior()
 
 function set_values!!(
     varinfo::AbstractVarInfo,