Merge pull request #136 from TuringLang/nodist

Fix #129

Author: yebai

Project.toml

@@ -1,7 +1,7 @@
 name = "DynamicPPL"
 uuid = "366bfd00-2699-11ea-058f-f148b4cae6d8"
 authors = ["mohamed82008 <mohamed82008@gmail.com>"]
-version = "0.8.0"
+version = "0.8.1"
 
 [deps]
 AbstractMCMC = "80f14c24-f653-4e6a-9b94-39d6b0f70001"

src/context_implementations.jl

@@ -177,7 +177,7 @@ function dot_tilde(
     else
         vns, dist = get_vns_and_dist(right, left, vn)
     end
-    return _dot_tilde(rng, sampler, NoDist(dist), left, vns, vi)
+    return _dot_tilde(rng, sampler, NoDist.(dist), left, vns, vi)
 end
 function dot_tilde(rng, ctx::MiniBatchContext, sampler, right, left, vn::VarName, inds, vi)
     return dot_tilde(rng, ctx.ctx, sampler, right, left, vn, inds, vi)
@@ -392,7 +392,7 @@ function dot_tilde(ctx::LikelihoodContext, sampler, right, left, vi)
     return _dot_tilde(sampler, right, left, vi)
 end
 function dot_tilde(ctx::MiniBatchContext, sampler, right, left, vi)
-    return ctx.loglike_scalar * dot_tilde(ctx.ctx, sampler, right, left, left, vi)
+    return ctx.loglike_scalar * dot_tilde(ctx.ctx, sampler, right, left, vi)
 end
 
 """

test/context_implementations.jl

@@ -0,0 +1,15 @@
+@testset "context_implementations.jl" begin
+    # https://github.com/TuringLang/DynamicPPL.jl/issues/129
+    @testset "#129" begin
+        @model function test(x)
+            μ ~ MvNormal(fill(0, 2), 2.0)
+            z = Vector{Int}(undef, length(x))
+            z .~ Categorical.(fill([0.5, 0.5], length(x)))
+            for i in 1:length(x)
+                x[i] ~ Normal(μ[z[i]], 0.1)
+            end
+        end
+
+        test([1, 1, -1])(VarInfo(), SampleFromPrior(), LikelihoodContext())
+    end
+end

test/runtests.jl

@@ -25,6 +25,7 @@ include("test_util.jl")
     include("prob_macro.jl")
     include("independence.jl")
     include("distribution_wrappers.jl")
+    include("context_implementations.jl")
 
     include("threadsafe.jl")