reverted merge with torfjelde/extract-realizations

TuringLang · Apr 19, 2024 · 33a84c7 · 33a84c7
1 parent af64356
commit 33a84c7
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 208 deletions.
diff --git a/docs/src/api.md b/docs/src/api.md
@@ -143,12 +143,6 @@ Sometimes it can be useful to extract the priors of a model. This is the possibl
 extract_priors
 ```
 
-Safe extraction of values from a given [`AbstractVarInfo`](@ref) as they are seen in the model can be done using [`values_as_in_model`](@ref).
-
-```@docs
-values_as_in_model
-```
-
 ```@docs
 NamedDist
 ```

diff --git a/src/DynamicPPL.jl b/src/DynamicPPL.jl
@@ -93,7 +93,6 @@ export AbstractVarInfo,
     getargnames,
     generated_quantities,
     extract_priors,
-    values_as_in_model,
     # Samplers
     Sampler,
     SampleFromPrior,
@@ -179,7 +178,6 @@ include("transforming.jl")
 include("logdensityfunction.jl")
 include("model_utils.jl")
 include("extract_priors.jl")
-include("values_as_in_model.jl")
 
 if !isdefined(Base, :get_extension)
     using Requires

diff --git a/src/values_as_in_model.jl b/src/values_as_in_model.jl
diff --git a/test/model.jl b/test/model.jl
@@ -356,7 +356,7 @@ is_typed_varinfo(varinfo::DynamicPPL.SimpleVarInfo{<:NamedTuple}) = true
         ]
         @testset "$(model.f)" for model in models_to_test
             vns = DynamicPPL.TestUtils.varnames(model)
-            example_values = DynamicPPL.TestUtils.rand_prior_true(model)
+            example_values = DynamicPPL.TestUtils.rand(model)
             varinfos = filter(
                 is_typed_varinfo,
                 DynamicPPL.TestUtils.setup_varinfos(model, example_values, vns),
@@ -375,22 +375,4 @@ is_typed_varinfo(varinfo::DynamicPPL.SimpleVarInfo{<:NamedTuple}) = true
             end
         end
     end
-
-    @testset "values_as_in_model" begin
-        @testset "$(model.f)" for model in DynamicPPL.TestUtils.DEMO_MODELS
-            vns = DynamicPPL.TestUtils.varnames(model)
-            example_values = DynamicPPL.TestUtils.rand_prior_true(model)
-            varinfos = DynamicPPL.TestUtils.setup_varinfos(model, example_values, vns)
-            @testset "$(short_varinfo_name(varinfo))" for varinfo in varinfos
-                realizations = values_as_in_model(model, varinfo)
-                # Ensure that all variables are found.
-                vns_found = collect(keys(realizations))
-                @test vns ∩ vns_found == vns ∪ vns_found
-                # Ensure that the values are the same.
-                for vn in vns
-                    @test realizations[vn] == varinfo[vn]
-                end
-            end
-        end
-    end
 end