Omit unnecessary first argument of vectorize.

Can't remove the two-argument method completely though because it's
exported.

Author: mhauru

src/context_implementations.jl

@@ -75,7 +75,7 @@ end
 
 function tilde_assume(context::PriorContext{<:NamedTuple}, right, vn, vi)
     if haskey(context.vars, getsym(vn))
-        vi = setindex!!(vi, vectorize(right, get(context.vars, vn)), vn)
+        vi = setindex!!(vi, vectorize(get(context.vars, vn)), vn)
         settrans!!(vi, false, vn)
     end
     return tilde_assume(PriorContext(), right, vn, vi)
@@ -84,15 +84,15 @@ function tilde_assume(
     rng::Random.AbstractRNG, context::PriorContext{<:NamedTuple}, sampler, right, vn, vi
 )
     if haskey(context.vars, getsym(vn))
-        vi = setindex!!(vi, vectorize(right, get(context.vars, vn)), vn)
+        vi = setindex!!(vi, vectorize(get(context.vars, vn)), vn)
         settrans!!(vi, false, vn)
     end
     return tilde_assume(rng, PriorContext(), sampler, right, vn, vi)
 end
 
 function tilde_assume(context::LikelihoodContext{<:NamedTuple}, right, vn, vi)
     if haskey(context.vars, getsym(vn))
-        vi = setindex!!(vi, vectorize(right, get(context.vars, vn)), vn)
+        vi = setindex!!(vi, vectorize(get(context.vars, vn)), vn)
         settrans!!(vi, false, vn)
     end
     return tilde_assume(LikelihoodContext(), right, vn, vi)
@@ -106,7 +106,7 @@ function tilde_assume(
     vi,
 )
     if haskey(context.vars, getsym(vn))
-        vi = setindex!!(vi, vectorize(right, get(context.vars, vn)), vn)
+        vi = setindex!!(vi, vectorize(get(context.vars, vn)), vn)
         settrans!!(vi, false, vn)
     end
     return tilde_assume(rng, LikelihoodContext(), sampler, right, vn, vi)
@@ -236,7 +236,7 @@ function assume(
             unset_flag!(vi, vn, "del")
             r = init(rng, dist, sampler)
             BangBang.setindex!!(
-                vi, vectorize(dist, maybe_reconstruct_and_link(vi, vn, dist, r)), vn
+                vi, vectorize(maybe_reconstruct_and_link(vi, vn, dist, r)), vn
             )
             setorder!(vi, vn, get_num_produce(vi))
         else
@@ -500,7 +500,7 @@ function get_and_set_val!(
                 vn = vns[i]
                 setindex!!(
                     vi,
-                    vectorize(dist, maybe_reconstruct_and_link(vi, vn, dist, r[:, i])),
+                    vectorize(maybe_reconstruct_and_link(vi, vn, dist, r[:, i])),
                     vn,
                 )
                 setorder!(vi, vn, get_num_produce(vi))
@@ -541,7 +541,7 @@ function get_and_set_val!(
                 vn = vns[i]
                 dist = dists isa AbstractArray ? dists[i] : dists
                 setindex!!(
-                    vi, vectorize(dist, maybe_reconstruct_and_link(vi, vn, dist, r[i])), vn
+                    vi, vectorize(maybe_reconstruct_and_link(vi, vn, dist, r[i])), vn
                 )
                 setorder!(vi, vn, get_num_produce(vi))
             end
@@ -595,7 +595,7 @@ function set_val!(
     @assert size(val) == size(vns)
     foreach(CartesianIndices(val)) do ind
         dist = dists isa AbstractArray ? dists[ind] : dists
-        setindex!!(vi, vectorize(dist, val[ind]), vns[ind])
+        setindex!!(vi, vectorize(val[ind]), vns[ind])
     end
     return val
 end

src/varinfo.jl

@@ -554,7 +554,7 @@ function setval!(md::Metadata, val::AbstractVector, vn::VarName)
     return md.vals[getrange(md, vn)] = val
 end
 function setval!(md::Metadata, val, vn::VarName)
-    return md.vals[getrange(md, vn)] = vectorize(getdist(md, vn), val)
+    return md.vals[getrange(md, vn)] = vectorize(val)
 end
 
 """
@@ -1138,7 +1138,7 @@ end
 function _inner_transform!(vi::VarInfo, vn::VarName, dist, f)
     # TODO: Use inplace versions to avoid allocations
     y, logjac = with_logabsdet_jacobian_and_reconstruct(f, dist, getval(vi, vn))
-    yvec = vectorize(dist, y)
+    yvec = vectorize(y)
     # Determine the new range.
     start = first(getrange(vi, vn))
     # NOTE: `length(yvec)` should never be longer than `getrange(vi, vn)`.
@@ -1221,7 +1221,7 @@ function _link_metadata!(varinfo::VarInfo, metadata::Metadata, target_vns)
         f = link_transform(dist)
         y, logjac = with_logabsdet_jacobian_and_reconstruct(f, dist, x)
         # Vectorize value.
-        yvec = vectorize(dist, y)
+        yvec = vectorize(y)
         # Accumulate the log-abs-det jacobian correction.
         acclogp!!(varinfo, -logjac)
         # Mark as no longer transformed.
@@ -1317,7 +1317,7 @@ function _invlink_metadata!(varinfo::VarInfo, metadata::Metadata, target_vns)
         f = invlink_transform(dist)
         x, logjac = with_logabsdet_jacobian_and_reconstruct(f, dist, y)
         # Vectorize value.
-        xvec = vectorize(dist, x)
+        xvec = vectorize(x)
         # Accumulate the log-abs-det jacobian correction.
         acclogp!!(varinfo, -logjac)
         # Mark as no longer transformed.
@@ -1593,7 +1593,7 @@ function BangBang.push!!(
         @assert ~(haskey(vi, vn)) "[push!!] attempt to add an exisitng variable $(getsym(vn)) ($(vn)) to TypedVarInfo of syms $(syms(vi)) with dist=$dist, gid=$gidset"
     end
 
-    val = vectorize(dist, r)
+    val = vectorize(r)
 
     meta = getmetadata(vi, vn)
     meta.idcs[vn] = length(meta.idcs) + 1