Skip to content

Commit 1d51c59

Browse files
committed
modify tests
1 parent 6c63654 commit 1d51c59

File tree

4 files changed

+19
-12
lines changed

4 files changed

+19
-12
lines changed

test/compiler.jl

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
using .Turing, Random, MacroTools, Distributions, Test
2-
using DynamicPPL: split_var_str, VarInfo, VarName
2+
using DynamicPPL: DynamicPPL, split_var_str, @varname, VarInfo, VarName
33

4-
include("./test_utils/AllUtils.jl")
4+
dir = splitdir(splitdir(pathof(DynamicPPL))[1])[1]
5+
include(dir*"/test/test_utils/AllUtils.jl")
56

67
Random.seed!(129)
78

@@ -207,7 +208,7 @@ priors = 0 # See "new grammar" test.
207208
return x
208209
end
209210
model = testmodel([1.0])
210-
varinfo = VarInfo(model)
211+
varinfo = DynamicPPL.VarInfo(model)
211212
model(varinfo)
212213
@test varinfo.logp == lp
213214
@test varinfo === _varinfo

test/prob_macro.jl

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
using .Turing, Distributions, Test, Random
22
using DynamicPPL: VarInfo
33

4-
include("./test_utils/AllUtils.jl")
4+
Random.seed!(129)
5+
6+
dir = splitdir(splitdir(pathof(DynamicPPL))[1])[1]
7+
include(dir*"/test/test_utils/AllUtils.jl")
58

69
Random.seed!(129)
710

test/runtests.jl

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
using Test
2-
include("./Turing/Turing.jl")
1+
using Test, DynamicPPL
2+
dir = splitdir(splitdir(pathof(DynamicPPL))[1])[1]
3+
include(dir*"/test/Turing/Turing.jl")
34
using .Turing
45

56
@testset "DynamicPPL.jl" begin
6-
include("compiler.jl")
7-
include("varinfo.jl")
8-
include("prob_macro.jl")
7+
#include("compiler2.jl")
8+
#include("varinfo.jl")
9+
#include("prob_macro.jl")
910
end

test/varinfo.jl

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,19 @@ using DynamicPPL: Selector, reconstruct, invlink, CACHERESET,
33
SampleFromPrior, Sampler, runmodel!, SampleFromUniform, uid,
44
_getidcs, set_retained_vns_del_by_spl!, is_flagged,
55
set_flag!, unset_flag!, VarInfo, TypedVarInfo,
6-
getlogp, setlogp!, resetlogp!, acclogp!
6+
getlogp, setlogp!, resetlogp!, acclogp!, vectorize,
7+
setorder!, updategid!
78
using DynamicPPL
89
using Distributions
910
using ForwardDiff: Dual
1011
using Test
1112

1213
i, j, k = 1, 2, 3
1314

14-
include("./test_utils/AllUtils.jl")
15+
dir = splitdir(splitdir(pathof(DynamicPPL))[1])[1]
16+
include(dir*"/test/test_utils/AllUtils.jl")
1517

16-
@testset "varinfo" begin
18+
@testset "RandomVariables.jl" begin
1719
@testset "TypedVarInfo" begin
1820
@model gdemo(x, y) = begin
1921
s ~ InverseGamma(2,3)

0 commit comments

Comments
 (0)