From 0db208384a4893ad9ca5dcf49d6924cc8f851cab Mon Sep 17 00:00:00 2001 From: Xianda Sun Date: Fri, 12 Apr 2024 08:59:12 +0100 Subject: [PATCH] fix more errors --- src/compiler.jl | 6 +++--- src/utils.jl | 24 ++++++++++++------------ test/runtests.jl | 2 +- test/turing/varinfo.jl | 2 +- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/compiler.jl b/src/compiler.jl index 65efe00a7..f8a04a557 100644 --- a/src/compiler.jl +++ b/src/compiler.jl @@ -202,13 +202,13 @@ variables. # Example ```jldoctest; setup=:(using Distributions, LinearAlgebra) julia> _, _, vns = DynamicPPL.unwrap_right_left_vns(MvNormal(ones(2), I), randn(2, 2), @varname(x)); vns[end] -x[:,2] +x[:, 2] julia> _, _, vns = DynamicPPL.unwrap_right_left_vns(Normal(), randn(1, 2), @varname(x)); vns[end] -x[1,2] +x[1, 2] julia> _, _, vns = DynamicPPL.unwrap_right_left_vns(Normal(), randn(1, 2), @varname(x[:])); vns[end] -x[:][1,2] +x[:][1, 2] julia> _, _, vns = DynamicPPL.unwrap_right_left_vns(Normal(), randn(3), @varname(x[1])); vns[end] x[1][3] diff --git a/src/utils.jl b/src/utils.jl index 4aa5d910b..06528a72d 100644 --- a/src/utils.jl +++ b/src/utils.jl @@ -967,27 +967,27 @@ julia> x = reshape(1:4, 2, 2); julia> # `LowerTriangular` foreach(println, varname_and_value_leaves(@varname(x), LowerTriangular(x))) -(x[1,1], 1) -(x[2,1], 2) -(x[2,2], 4) +(x[1, 1], 1) +(x[2, 1], 2) +(x[2, 2], 4) julia> # `UpperTriangular` foreach(println, varname_and_value_leaves(@varname(x), UpperTriangular(x))) -(x[1,1], 1) -(x[1,2], 3) -(x[2,2], 4) +(x[1, 1], 1) +(x[1, 2], 3) +(x[2, 2], 4) julia> # `Cholesky` with lower-triangular foreach(println, varname_and_value_leaves(@varname(x), Cholesky([1.0 0.0; 0.0 1.0], 'L', 0))) -(x.L[1,1], 1.0) -(x.L[2,1], 0.0) -(x.L[2,2], 1.0) +(x.L[1, 1], 1.0) +(x.L[2, 1], 0.0) +(x.L[2, 2], 1.0) julia> # `Cholesky` with upper-triangular foreach(println, varname_and_value_leaves(@varname(x), Cholesky([1.0 0.0; 0.0 1.0], 'U', 0))) -(x.U[1,1], 1.0) -(x.U[1,2], 0.0) -(x.U[2,2], 1.0) +(x.U[1, 1], 1.0) +(x.U[1, 2], 0.0) +(x.U[2, 2], 1.0) ``` """ function varname_and_value_leaves(vn::VarName, x) diff --git a/test/runtests.jl b/test/runtests.jl index 290d2e10f..efa595516 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -90,7 +90,7 @@ include("test_util.jl") DocMeta.setdocmeta!( DynamicPPL, :DocTestSetup, - :(using DynamicPPL, Distributions); + :(using DynamicPPL, Distributions, Accessors); recursive=true, ) doctestfilters = [ diff --git a/test/turing/varinfo.jl b/test/turing/varinfo.jl index c4e3fa87b..30408e598 100644 --- a/test/turing/varinfo.jl +++ b/test/turing/varinfo.jl @@ -192,7 +192,7 @@ return p end chain = sample(mat_name_test(), HMC(0.2, 4), 1000) - check_numerical(chain, ["p[1,1]"], [0]; atol=0.25) + check_numerical(chain, ["p[1, 1]"], [0]; atol=0.25) @model function marr_name_test() p = Array{Array{Any}}(undef, 2)