Various small fixes

Author: mhauru

src/abstract_varinfo.jl

@@ -105,15 +105,13 @@ end
 
 """
     setaccs!!(vi::AbstractVarInfo, accs::AccumulatorTuple)
-    setaccs!!(vi::AbstractVarInfo, accs::AbstractAccumulator...)
+    setaccs!!(vi::AbstractVarInfo, accs::NTuple{N,AbstractAccumulator} where {N})
 
 Update the `AccumulatorTuple` of `vi` to `accs`, mutating if it makes sense.
 
 `setaccs!!(vi:AbstractVarInfo, accs::AccumulatorTuple) should be implemented by each subtype
 of `AbstractVarInfo`.
 """
-function setaccs!! end
-
 function setaccs!!(vi::AbstractVarInfo, accs::NTuple{N,AbstractAccumulator}) where {N}
     return setaccs!!(vi, AccumulatorTuple(accs))
 end

src/varinfo.jl

@@ -292,7 +292,7 @@ function typed_varinfo(vi::UntypedVarInfo)
         )
     end
     nt = NamedTuple{syms_tuple}(Tuple(new_metas))
-    return VarInfo(nt, vi.accs)
+    return VarInfo(nt, deepcopy(vi.accs))
 end
 function typed_varinfo(vi::NTVarInfo)
     # This function preserves the behaviour of typed_varinfo(vi) where vi is
@@ -353,7 +353,7 @@ single `VarNamedVector` as its metadata field.
 """
 function untyped_vector_varinfo(vi::UntypedVarInfo)
     md = metadata_to_varnamedvector(vi.metadata)
-    return VarInfo(md, vi.accs)
+    return VarInfo(md, deepcopy(vi.accs))
 end
 function untyped_vector_varinfo(
     rng::Random.AbstractRNG,
@@ -396,12 +396,12 @@ NamedTuple of `VarNamedVector`s as its metadata field.
 """
 function typed_vector_varinfo(vi::NTVarInfo)
     md = map(metadata_to_varnamedvector, vi.metadata)
-    return VarInfo(md, vi.accs)
+    return VarInfo(md, deepcopy(vi.accs))
 end
 function typed_vector_varinfo(vi::UntypedVectorVarInfo)
     new_metas = group_by_symbol(vi.metadata)
     nt = NamedTuple(new_metas)
-    return VarInfo(nt, vi.accs)
+    return VarInfo(nt, deepcopy(vi.accs))
 end
 function typed_vector_varinfo(
     rng::Random.AbstractRNG,
@@ -450,7 +450,7 @@ function unflatten(vi::VarInfo, x::AbstractVector)
     # messes with cases like using Float32 of logprobs and Float64 for x. Also, this is just
     # plain ugly and hacky.
     et = float_type_with_fallback(eltype(x))
-    accs = map_accumulator!!(vi.accs, convert_eltype, et)
+    accs = map_accumulator!!(deepcopy(vi.accs), convert_eltype, et)
     return VarInfo(md, accs)
 end
 
@@ -533,7 +533,7 @@ end
 
 function subset(varinfo::VarInfo, vns::AbstractVector{<:VarName})
     metadata = subset(varinfo.metadata, vns)
-    return VarInfo(metadata, varinfo.accs)
+    return VarInfo(metadata, deepcopy(varinfo.accs))
 end
 
 function subset(metadata::NamedTuple, vns::AbstractVector{<:VarName})
@@ -622,7 +622,7 @@ end
 
 function _merge(varinfo_left::VarInfo, varinfo_right::VarInfo)
     metadata = merge_metadata(varinfo_left.metadata, varinfo_right.metadata)
-    return VarInfo(metadata, varinfo_right.accs)
+    return VarInfo(metadata, deepcopy(varinfo_right.accs))
 end
 
 function merge_metadata(vnv_left::VarNamedVector, vnv_right::VarNamedVector)

test/contexts.jl

@@ -46,9 +46,8 @@ Base.IteratorSize(::Type{<:AbstractContext}) = Base.SizeUnknown()
 Base.IteratorEltype(::Type{<:AbstractContext}) = Base.EltypeUnknown()
 
 @testset "contexts.jl" begin
-    child_contexts = Dict(:default => DefaultContext())
-
-    parent_contexts = Dict(
+    contexts = Dict(
+        :default => DefaultContext(),
         :testparent => DynamicPPL.TestUtils.TestParentContext(DefaultContext()),
         :sampling => SamplingContext(),
         :prefix => PrefixContext(@varname(x)),
@@ -63,8 +62,6 @@ Base.IteratorEltype(::Type{<:AbstractContext}) = Base.EltypeUnknown()
         :condition4 => ConditionContext((x=[1.0, missing],)),
     )
 
-    contexts = merge(child_contexts, parent_contexts)
-
     @testset "$(name)" for (name, context) in contexts
         @testset "$(model.f)" for model in DynamicPPL.TestUtils.DEMO_MODELS
             DynamicPPL.TestUtils.test_context(context, model)

test/pointwise_logdensities.jl

@@ -1,5 +1,5 @@
 @testset "logdensities_likelihoods.jl" begin
-    @testset "$(model.f)" for model in DynamicPPL.TestUtils.DEMO_MODELS[1:1]
+    @testset "$(model.f)" for model in DynamicPPL.TestUtils.DEMO_MODELS
         example_values = DynamicPPL.TestUtils.rand_prior_true(model)
 
         # Instantiate a `VarInfo` with the example values.