Skip to content

Stricter types for evaluate!! methods #629

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 12, 2024
Merged

Stricter types for evaluate!! methods #629

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions src/model.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -909,13 +909,18 @@ function AbstractPPL.evaluate!!(model::Model, context::AbstractContext)
return evaluate!!(model, VarInfo(), context)
end

function AbstractPPL.evaluate!!(model::Model, args...)
function AbstractPPL.evaluate!!(
model::Model, args::Union{AbstractVarInfo,AbstractSampler,AbstractContext}...
)
return evaluate!!(model, Random.default_rng(), args...)
Copy link
Member

@yebai yebai Jul 12, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For consistency, maybe

Suggested change
return evaluate!!(model, Random.default_rng(), args...)
return AbstractPPL.evaluate!!(model, Random.default_rng(), args...)

end

# without VarInfo
function AbstractPPL.evaluate!!(
model::Model, rng::Random.AbstractRNG, sampler::AbstractSampler, args...
model::Model,
rng::Random.AbstractRNG,
sampler::AbstractSampler,
args::AbstractContext...,
)
return evaluate!!(model, rng, VarInfo(), sampler, args...)
end
Expand Down
14 changes: 14 additions & 0 deletions test/model.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,4 +396,18 @@ is_typed_varinfo(varinfo::DynamicPPL.SimpleVarInfo{<:NamedTuple}) = true
end
end
end

@testset "Erroneous model call" begin
# Calling a model with the wrong arguments used to lead to infinite recursion, see
# https://github.com/TuringLang/Turing.jl/issues/2182. This guards against it.
@model function a_model(x)
m ~ Normal(0, 1)
x ~ Normal(m, 1)
return nothing
end
instance = a_model(1.0)
# `instance` should be called with rng, context, etc., but one may easily get
# confused and call it the way you are meant to call `a_model`.
@test_throws MethodError instance(1.0)
end
end