Stop exporting any VNV stuff

TuringLang · Oct 4, 2024 · 65c94ca · 65c94ca
1 parent b3f92c2
commit 65c94ca
Show file tree

Hide file tree

Showing 7 changed files with 121 additions and 114 deletions.
diff --git a/src/DynamicPPL.jl b/src/DynamicPPL.jl
@@ -45,27 +45,9 @@ export AbstractVarInfo,
     VarInfo,
     UntypedVarInfo,
     TypedVarInfo,
-    VectorVarInfo,
     SimpleVarInfo,
-    VarNamedVector,
-    length_internal,
-    getindex_internal,
-    update!,
-    reset!,
-    setindex_internal!,
-    update_internal!,
-    insert_internal!,
-    update!!,
-    insert!!,
-    reset!!,
-    setindex!!,
-    setindex_internal!!,
-    update_internal!!,
-    insert_internal!!,
     push!!,
     empty!!,
-    loosen_types!!,
-    tighten_types,
     subset,
     getlogp,
     setlogp!!,

diff --git a/src/test_utils.jl b/src/test_utils.jl
@@ -47,12 +47,12 @@ function setup_varinfos(
     # SimpleVarInfo
     svi_typed = SimpleVarInfo(example_values)
     svi_untyped = SimpleVarInfo(OrderedDict())
-    svi_vnv = SimpleVarInfo(VarNamedVector())
+    svi_vnv = SimpleVarInfo(DynamicPPL.VarNamedVector())
 
     # SimpleVarInfo{<:Any,<:Ref}
     svi_typed_ref = SimpleVarInfo(example_values, Ref(getlogp(svi_typed)))
     svi_untyped_ref = SimpleVarInfo(OrderedDict(), Ref(getlogp(svi_untyped)))
-    svi_vnv_ref = SimpleVarInfo(VarNamedVector(), Ref(getlogp(svi_vnv)))
+    svi_vnv_ref = SimpleVarInfo(DynamicPPL.VarNamedVector(), Ref(getlogp(svi_vnv)))
 
     lp = getlogp(vi_typed_metadata)
     varinfos = map((

diff --git a/src/varnamedvector.jl b/src/varnamedvector.jl
@@ -49,7 +49,7 @@ $(FIELDS)
 The values for different variables are internally all stored in a single vector. For
 instance,
 ```jldoctest varnamedvector-struct
-julia> using DynamicPPL: ReshapeTransform, VarNamedVector, @varname, setindex!, update!
+julia> using DynamicPPL: ReshapeTransform, VarNamedVector, @varname, setindex!, update!, getindex_internal
 
 julia> vnv = VarNamedVector();
 

diff --git a/test/simple_varinfo.jl b/test/simple_varinfo.jl
@@ -58,27 +58,29 @@
         end
 
         @testset "VarNamedVector" begin
-            svi = SimpleVarInfo(push!!(VarNamedVector(), @varname(m) => 1.0))
+            svi = SimpleVarInfo(push!!(DynamicPPL.VarNamedVector(), @varname(m) => 1.0))
             @test getlogp(svi) == 0.0
             @test haskey(svi, @varname(m))
             @test !haskey(svi, @varname(m[1]))
 
-            svi = SimpleVarInfo(push!!(VarNamedVector(), @varname(m) => [1.0]))
+            svi = SimpleVarInfo(push!!(DynamicPPL.VarNamedVector(), @varname(m) => [1.0]))
             @test getlogp(svi) == 0.0
             @test haskey(svi, @varname(m))
             @test haskey(svi, @varname(m[1]))
             @test !haskey(svi, @varname(m[2]))
             @test svi[@varname(m)][1] == svi[@varname(m[1])]
 
-            svi = SimpleVarInfo(push!!(VarNamedVector(), @varname(m.a) => [1.0]))
+            svi = SimpleVarInfo(push!!(DynamicPPL.VarNamedVector(), @varname(m.a) => [1.0]))
             @test haskey(svi, @varname(m))
             @test haskey(svi, @varname(m.a))
             @test haskey(svi, @varname(m.a[1]))
             @test !haskey(svi, @varname(m.a[2]))
             @test !haskey(svi, @varname(m.a.b))
             # The implementation of haskey and getvalue fo VarNamedVector is incomplete, the
             # next test is here to remind of us that.
-            svi = SimpleVarInfo(push!!(VarNamedVector(), @varname(m.a.b) => [1.0]))
+            svi = SimpleVarInfo(
+                push!!(DynamicPPL.VarNamedVector(), @varname(m.a.b) => [1.0])
+            )
             @test_broken !haskey(svi, @varname(m.a.b.c.d))
         end
     end
@@ -89,7 +91,7 @@
         @testset "$(typeof(vi))" for vi in (
             SimpleVarInfo(Dict()),
             SimpleVarInfo(values_constrained),
-            SimpleVarInfo(VarNamedVector()),
+            SimpleVarInfo(DynamicPPL.VarNamedVector()),
             VarInfo(model),
         )
             for vn in DynamicPPL.TestUtils.varnames(model)
@@ -143,7 +145,7 @@
         # to see whether this is the case.
         svi_nt = SimpleVarInfo(DynamicPPL.TestUtils.rand_prior_true(model))
         svi_dict = SimpleVarInfo(VarInfo(model), Dict)
-        vnv = VarNamedVector()
+        vnv = DynamicPPL.VarNamedVector()
         for (k, v) in pairs(DynamicPPL.TestUtils.rand_prior_true(model))
             vnv = push!!(vnv, VarName{k}() => v)
         end
@@ -232,7 +234,7 @@
         # Initialize.
         svi_nt = DynamicPPL.settrans!!(SimpleVarInfo(), true)
         svi_nt = last(DynamicPPL.evaluate!!(model, svi_nt, SamplingContext()))
-        svi_vnv = DynamicPPL.settrans!!(SimpleVarInfo(VarNamedVector()), true)
+        svi_vnv = DynamicPPL.settrans!!(SimpleVarInfo(DynamicPPL.VarNamedVector()), true)
         svi_vnv = last(DynamicPPL.evaluate!!(model, svi_vnv, SamplingContext()))
 
         for svi in (svi_nt, svi_vnv)

diff --git a/test/test_util.jl b/test/test_util.jl
@@ -89,10 +89,12 @@ function short_varinfo_name(vi::TypedVarInfo)
     return "TypedVarInfo"
 end
 short_varinfo_name(::UntypedVarInfo) = "UntypedVarInfo"
-short_varinfo_name(::VectorVarInfo) = "VectorVarInfo"
+short_varinfo_name(::DynamicPPL.VectorVarInfo) = "VectorVarInfo"
 short_varinfo_name(::SimpleVarInfo{<:NamedTuple}) = "SimpleVarInfo{<:NamedTuple}"
 short_varinfo_name(::SimpleVarInfo{<:OrderedDict}) = "SimpleVarInfo{<:OrderedDict}"
-short_varinfo_name(::SimpleVarInfo{<:VarNamedVector}) = "SimpleVarInfo{<:VarNamedVector}"
+function short_varinfo_name(::SimpleVarInfo{<:DynamicPPL.VarNamedVector})
+    return "SimpleVarInfo{<:VarNamedVector}"
+end
 
 # convenient functions for testing model.jl
 # function to modify the representation of values based on their length

diff --git a/test/varinfo.jl b/test/varinfo.jl
@@ -112,7 +112,7 @@ DynamicPPL.getspace(::DynamicPPL.Sampler{MySAlg}) = (:s,)
             @test vi[SampleFromPrior()][1] == 3 * r
 
             # TODO(mhauru) Implement these functions for other VarInfo types too.
-            if vi isa VectorVarInfo
+            if vi isa DynamicPPL.VectorVarInfo
                 delete!(vi, vn)
                 @test isempty(vi)
                 vi = push!!(vi, vn, r, dist, gid)
@@ -128,7 +128,7 @@ DynamicPPL.getspace(::DynamicPPL.Sampler{MySAlg}) = (:s,)
         test_base!!(TypedVarInfo(vi))
         test_base!!(SimpleVarInfo())
         test_base!!(SimpleVarInfo(Dict()))
-        test_base!!(SimpleVarInfo(VarNamedVector()))
+        test_base!!(SimpleVarInfo(DynamicPPL.VarNamedVector()))
     end
     @testset "flags" begin
         # Test flag setting:
@@ -209,7 +209,7 @@ DynamicPPL.getspace(::DynamicPPL.Sampler{MySAlg}) = (:s,)
                 model, SampleFromPrior(), DefaultContext(), DynamicPPL.Metadata
             )
             vi_untyped = VarInfo(DynamicPPL.Metadata())
-            vi_vnv = VarInfo(VarNamedVector())
+            vi_vnv = VarInfo(DynamicPPL.VarNamedVector())
             vi_vnv_typed = VarInfo(
                 model, SampleFromPrior(), DefaultContext(), DynamicPPL.VarNamedVector
             )
@@ -374,7 +374,7 @@ DynamicPPL.getspace(::DynamicPPL.Sampler{MySAlg}) = (:s,)
         @test getlogp(vi) ≈ Bijectors.logpdf_with_trans(dist, x, true)
 
         ## `SimpleVarInfo{<:VarNamedVector}`
-        vi = DynamicPPL.settrans!!(SimpleVarInfo(VarNamedVector()), true)
+        vi = DynamicPPL.settrans!!(SimpleVarInfo(DynamicPPL.VarNamedVector()), true)
         # Sample in unconstrained space.
         vi = last(DynamicPPL.evaluate!!(model, vi, SamplingContext()))
         f = DynamicPPL.from_linked_internal_transform(vi, vn, dist)