removed now-redudant filtering methods since we use JET's own filters

Author: torfjelde

ext/DynamicPPLJETExt.jl

@@ -3,53 +3,19 @@ module DynamicPPLJETExt
 using DynamicPPL: DynamicPPL
 using JET: JET
 
-"""
-    is_tilde_instance(x)
-
-Return `true` if `x` is a method instance of a tilde function, otherwise `false`.
-"""
-is_tilde_instance(x) = false
-is_tilde_instance(frame::JET.VirtualFrame) = is_tilde_instance(frame.linfo)
-function is_tilde_instance(mi::Core.MethodInstance)
-    types = mi.specTypes
-    # This can occur, for example, if `specTypes` is `UnionAll` due to an error.
-    return if hasproperty(types, :parameters)
-        is_tilde_instance(types.parameters[1])
-    else
-        false
-    end
-end
-is_tilde_instance(::Type{typeof(DynamicPPL.tilde_assume!!)}) = true
-is_tilde_instance(::Type{typeof(DynamicPPL.tilde_observe!!)}) = true
-is_tilde_instance(::Type{typeof(DynamicPPL.dot_tilde_assume!!)}) = true
-is_tilde_instance(::Type{typeof(DynamicPPL.dot_tilde_observe!!)}) = true
-
-"""
-    report_has_error_in_tilde(report)
-
-Return `true` if the given error `report` contains a tilde function in its frames, otherwise `false`.
-
-This is used to filter out reports that occur outside of the tilde pipeline, in an attempt to avoid
-warning the user about DynamicPPL doing something wrong when it is in fact an issue with the user's code.
-"""
-function report_has_error_in_tilde(report)
-    frames = report.vst
-    return any(is_tilde_instance, frames)
-end
-
 function DynamicPPL.is_suitable_varinfo(
     model::DynamicPPL.Model,
     context::DynamicPPL.AbstractContext,
     varinfo::DynamicPPL.AbstractVarInfo;
-    only_tilde::Bool=true,
+    only_ddpl::Bool=true,
 )
     # Let's make sure that both evaluation and sampling doesn't result in type errors.
     f, argtypes = DynamicPPL.DebugUtils.gen_evaluator_call_with_types(
         model, varinfo, context
     )
     # If specified, we only check errors originating somewhere in the DynamicPPL.jl.
     # This way we don't just fall back to untyped if the user's code is the issue.
-    result = if only_tilde
+    result = if only_ddpl
         JET.report_call(f, argtypes; target_modules=(JET.AnyFrameModule(DynamicPPL),))
     else
         JET.report_call(f, argtypes)
@@ -58,14 +24,14 @@ function DynamicPPL.is_suitable_varinfo(
 end
 
 function DynamicPPL._determine_varinfo_jet(
-    model::DynamicPPL.Model, context::DynamicPPL.AbstractContext; only_tilde::Bool=true
+    model::DynamicPPL.Model, context::DynamicPPL.AbstractContext; only_ddpl::Bool=true
 )
     # First we try with the typed varinfo.
     varinfo = DynamicPPL.typed_varinfo(model, context)
     issuccess = true
 
     # Let's make sure that both evaluation and sampling doesn't result in type errors.
-    issuccess, result = DynamicPPL.is_suitable_varinfo(model, context, varinfo; only_tilde)
+    issuccess, result = DynamicPPL.is_suitable_varinfo(model, context, varinfo; only_ddpl)
 
     if !issuccess
         # Useful information for debugging.

src/model_utils.jl

@@ -222,7 +222,7 @@ Check if the `model` supports evaluation using the provided `context` and `varin
 - `varinfo`: The varinfo to verify the support for.
 
 # Keyword Arguments
-- `only_tilde`: If `true`, only consider error reports occuring in the tilde pipeline. Default: `true`.
+- `only_ddpl`: If `true`, only consider error reports occuring in the tilde pipeline. Default: `true`.
 
 # Returns
 - `issuccess`: `true` if the model supports the varinfo, otherwise `false`.
@@ -234,7 +234,7 @@ function is_suitable_varinfo end
 function _determine_varinfo_jet end
 
 """
-    determine_suitable_varinfo(model[, context]; verbose::Bool=false, only_tilde::Bool=true)
+    determine_suitable_varinfo(model[, context]; verbose::Bool=false, only_ddpl::Bool=true)
 
 Return a suitable varinfo for the given `model`.
 
@@ -249,14 +249,14 @@ See also: [`DynamicPPL.is_suitable_varinfo`](@ref).
 - `context`: The context to use for the model evaluation. Default: `SamplingContext()`.
 
 # Keyword Arguments
-- `only_tilde`: If `true`, only consider error reports occuring in the tilde pipeline. Default: `true`.
+- `only_ddpl`: If `true`, only consider error reports within DynamicPPL.jl.
 """
 function determine_suitable_varinfo(
-    model::Model, context::AbstractContext=SamplingContext(); only_tilde::Bool=true
+    model::Model, context::AbstractContext=SamplingContext(); only_ddpl::Bool=true
 )
     # If JET.jl has been loaded, and thus `determine_varinfo` has been defined, we use that.
     return if Base.get_extension(DynamicPPL, :DynamicPPLJETExt) !== nothing
-        _determine_varinfo_jet(model, context; only_tilde)
+        _determine_varinfo_jet(model, context; only_ddpl)
     else
         # Warn the user.
         @warn "JET.jl is not loaded. Assumes the model is compatible with typed varinfo."

test/ext/DynamicPPLJETExt.jl

@@ -50,7 +50,7 @@
         # Should pass if we're only checking the tilde statements.
         @test DynamicPPL.determine_suitable_varinfo(demo5()) isa DynamicPPL.TypedVarInfo
         # Should fail if we're including errors in the model body.
-        @test DynamicPPL.determine_suitable_varinfo(demo5(); only_tilde=false) isa
+        @test DynamicPPL.determine_suitable_varinfo(demo5(); only_ddpl=false) isa
             DynamicPPL.UntypedVarInfo
     end