From 6d76453d8a12e45eba22bf77b1ebd88997c7c87f Mon Sep 17 00:00:00 2001 From: Penelope Yong Date: Mon, 5 Aug 2024 15:25:45 +0100 Subject: [PATCH 1/3] Add AbstractRNG types to fix method ambiguities in Turing --- src/context_implementations.jl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/context_implementations.jl b/src/context_implementations.jl index 515dce7ae..1b5f91224 100644 --- a/src/context_implementations.jl +++ b/src/context_implementations.jl @@ -63,13 +63,13 @@ function tilde_assume(::IsParent, context::AbstractContext, args...) return tilde_assume(childcontext(context), args...) end -function tilde_assume(rng, context::AbstractContext, args...) +function tilde_assume(rng::Random.AbstractRNG, context::AbstractContext, args...) return tilde_assume(NodeTrait(tilde_assume, context), rng, context, args...) end -function tilde_assume(::IsLeaf, rng, context::AbstractContext, sampler, right, vn, vi) +function tilde_assume(::IsLeaf, rng::Random.AbstractRNG, context::AbstractContext, sampler, right, vn, vi) return assume(rng, sampler, right, vn, vi) end -function tilde_assume(::IsParent, rng, context::AbstractContext, args...) +function tilde_assume(::IsParent, rng::Random.AbstractRNG, context::AbstractContext, args...) return tilde_assume(rng, childcontext(context), args...) end @@ -121,7 +121,7 @@ end function tilde_assume(context::PrefixContext, right, vn, vi) return tilde_assume(context.context, right, prefix(context, vn), vi) end -function tilde_assume(rng, context::PrefixContext, sampler, right, vn, vi) +function tilde_assume(rng::Random.AbstractRNG, context::PrefixContext, sampler, right, vn, vi) return tilde_assume(rng, context.context, sampler, right, prefix(context, vn), vi) end @@ -291,7 +291,7 @@ end function dot_tilde_assume(context::AbstractContext, args...) return dot_tilde_assume(NodeTrait(dot_tilde_assume, context), context, args...) end -function dot_tilde_assume(rng, context::AbstractContext, args...) +function dot_tilde_assume(rng::Random.AbstractRNG, context::AbstractContext, args...) return dot_tilde_assume(NodeTrait(dot_tilde_assume, context), rng, context, args...) end From fbe0d308c83f1428f5f8da3c9ba05733a5584fbb Mon Sep 17 00:00:00 2001 From: Penelope Yong Date: Tue, 6 Aug 2024 12:11:36 +0100 Subject: [PATCH 2/3] Format code Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- src/context_implementations.jl | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/context_implementations.jl b/src/context_implementations.jl index 1b5f91224..f5090c007 100644 --- a/src/context_implementations.jl +++ b/src/context_implementations.jl @@ -66,10 +66,14 @@ end function tilde_assume(rng::Random.AbstractRNG, context::AbstractContext, args...) return tilde_assume(NodeTrait(tilde_assume, context), rng, context, args...) end -function tilde_assume(::IsLeaf, rng::Random.AbstractRNG, context::AbstractContext, sampler, right, vn, vi) +function tilde_assume( + ::IsLeaf, rng::Random.AbstractRNG, context::AbstractContext, sampler, right, vn, vi +) return assume(rng, sampler, right, vn, vi) end -function tilde_assume(::IsParent, rng::Random.AbstractRNG, context::AbstractContext, args...) +function tilde_assume( + ::IsParent, rng::Random.AbstractRNG, context::AbstractContext, args... +) return tilde_assume(rng, childcontext(context), args...) end @@ -121,7 +125,9 @@ end function tilde_assume(context::PrefixContext, right, vn, vi) return tilde_assume(context.context, right, prefix(context, vn), vi) end -function tilde_assume(rng::Random.AbstractRNG, context::PrefixContext, sampler, right, vn, vi) +function tilde_assume( + rng::Random.AbstractRNG, context::PrefixContext, sampler, right, vn, vi +) return tilde_assume(rng, context.context, sampler, right, prefix(context, vn), vi) end From 5bfc246b021c29ff070ca981082dc6191031f75c Mon Sep 17 00:00:00 2001 From: Penelope Yong Date: Tue, 6 Aug 2024 12:52:31 +0100 Subject: [PATCH 3/3] Add one more annotation --- src/context_implementations.jl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/context_implementations.jl b/src/context_implementations.jl index f5090c007..9fcd2e310 100644 --- a/src/context_implementations.jl +++ b/src/context_implementations.jl @@ -315,7 +315,9 @@ function dot_tilde_assume(::IsParent, rng, context::AbstractContext, args...) return dot_tilde_assume(rng, childcontext(context), args...) end -function dot_tilde_assume(rng, ::DefaultContext, sampler, right, left, vns, vi) +function dot_tilde_assume( + rng::Random.AbstractRNG, ::DefaultContext, sampler, right, left, vns, vi +) return dot_assume(rng, sampler, right, vns, left, vi) end