More fixes

Author: devmotion

src/threadsafe.jl

@@ -56,10 +56,12 @@ getmetadata(vi::ThreadSafeVarInfo, vn::VarName) = getmetadata(vi.varinfo, vn)
 getidx(vi::ThreadSafeVarInfo, vn::VarName) = getidx(vi.varinfo, vn)
 getrange(vi::ThreadSafeVarInfo, vn::VarName) = getrange(vi.varinfo, vn)
 getdist(vi::ThreadSafeVarInfo, vn::VarName) = getdist(vi.varinfo, vn)
+getval(vi::ThreadSafeVarInfo, vn::VarName) = getval(vi.varinfo, vn)
 
 function setgid!(vi::ThreadSafeVarInfo, gid::Selector, vn::VarName)
     setgid!(vi.varinfo, gid, vn)
 end
+setval!(vi::ThreadSafeVarInfo, val, vn::VarName) = setval!(vi.varinfo, val, vn)
 
 keys(vi::ThreadSafeVarInfo) = keys(vi.varinfo)
 haskey(vi::ThreadSafeVarInfo, vn::VarName) = haskey(vi.varinfo, vn)

test/Turing/inference/Inference.jl

@@ -473,42 +473,42 @@ floatof(::Type) = Real # fallback if type inference failed
 
 function get_matching_type(
     spl::AbstractSampler, 
-    vi::VarInfo, 
+    vi,
     ::Type{T},
 ) where {T}
     return T
 end
 function get_matching_type(
     spl::AbstractSampler, 
-    vi::VarInfo, 
+    vi,
     ::Type{<:AbstractFloat},
 )
     return floatof(eltype(vi, spl))
 end
 function get_matching_type(
     spl::Sampler{<:Hamiltonian}, 
-    vi::VarInfo, 
+    vi,
     ::Type{<:Union{Missing, AbstractFloat}},
 )
     return Union{Missing, floatof(eltype(vi, spl))}
 end
 function get_matching_type(
     spl::Sampler{<:Hamiltonian}, 
-    vi::VarInfo, 
+    vi,
     ::Type{<:AbstractFloat},
 )
     return floatof(eltype(vi, spl))
 end
 function get_matching_type(
     spl::Sampler{<:Hamiltonian}, 
-    vi::VarInfo, 
+    vi,
     ::Type{TV},
 ) where {T, N, TV <: Array{T, N}}
     return Array{get_matching_type(spl, vi, T), N}
 end
 function get_matching_type(
     spl::Sampler{<:Union{PG, SMC}}, 
-    vi::VarInfo, 
+    vi,
     ::Type{TV},
 ) where {T, N, TV <: Array{T, N}}
     return TArray{T, N}

test/compiler.jl

@@ -222,19 +222,10 @@ end
         varinfo = DynamicPPL.VarInfo(model)
         model(varinfo)
         @test getlogp(varinfo) == lp
-        @test varinfo_ === varinfo
+        @test varinfo_ isa AbstractVarInfo
         @test model_ === model
         @test sampler_ === SampleFromPrior()
         @test context_ === DefaultContext()
-        @test length(logps_) == Threads.nthreads()
-        @test sum(logps_) == lp
-        for i in 1:length(logps_)
-            if i == Threads.threadid()
-                @test logps_[i] == lp
-            else
-                @test iszero(logps_[i])
-            end
-        end
 
         # test DPPL#61
         @model testmodel(z) = begin