Skip to content

Commit c98fe49

Browse files
torfjeldetorfjelde
committed
more debugging: try with new bijectors.jl
1 parent 889c370 commit c98fe49

File tree

1 file changed

+59
-55
lines changed

1 file changed

+59
-55
lines changed

‎test/runtests.jl‎

Lines changed: 59 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
using Pkg
2+
# Add Bijectors.jl#torfjelde/logabsdetjac-dist-fix
3+
Pkg.add(url="https://github.com/TuringLang/Bijectors.jl", rev="torfjelde/logabsdetjac-dist-fix")
4+
15
using Accessors
26
using ADTypes
37
using DynamicPPL
@@ -76,63 +80,63 @@ include("test_util.jl")
7680
include("ext/DynamicPPLJETExt.jl")
7781
end
7882

79-
@testset "ad" begin
80-
include("ext/DynamicPPLForwardDiffExt.jl")
81-
include("ad.jl")
82-
end
83+
# @testset "ad" begin
84+
# include("ext/DynamicPPLForwardDiffExt.jl")
85+
# include("ad.jl")
86+
# end
8387

84-
@testset "prob and logprob macro" begin
85-
@test_throws ErrorException prob"..."
86-
@test_throws ErrorException logprob"..."
87-
end
88+
# @testset "prob and logprob macro" begin
89+
# @test_throws ErrorException prob"..."
90+
# @test_throws ErrorException logprob"..."
91+
# end
8892

89-
@testset "doctests" begin
90-
DocMeta.setdocmeta!(
91-
DynamicPPL,
92-
:DocTestSetup,
93-
:(using DynamicPPL, Distributions);
94-
recursive=true,
95-
)
96-
doctestfilters = [
97-
# Older versions will show "0 element Array" instead of "Type[]".
98-
r"(Any\[\]|0-element Array{.+,[0-9]+})",
99-
# Older versions will show "Array{...,1}" instead of "Vector{...}".
100-
r"(Array{.+,\s?1}|Vector{.+})",
101-
# Older versions will show "Array{...,2}" instead of "Matrix{...}".
102-
r"(Array{.+,\s?2}|Matrix{.+})",
103-
# Errors from macros sometimes result in `LoadError: LoadError:`
104-
# rather than `LoadError:`, depending on Julia version.
105-
r"ERROR: (LoadError:\s)+",
106-
# Older versions do not have `;;]` but instead just `]` at end of the line
107-
# => need to treat `;;]` and `]` as the same, i.e. ignore them if at the end of a line
108-
r"(;;){0,1}\]$"m,
109-
]
110-
doctest(DynamicPPL; manual=false, doctestfilters=doctestfilters)
111-
end
93+
# @testset "doctests" begin
94+
# DocMeta.setdocmeta!(
95+
# DynamicPPL,
96+
# :DocTestSetup,
97+
# :(using DynamicPPL, Distributions);
98+
# recursive=true,
99+
# )
100+
# doctestfilters = [
101+
# # Older versions will show "0 element Array" instead of "Type[]".
102+
# r"(Any\[\]|0-element Array{.+,[0-9]+})",
103+
# # Older versions will show "Array{...,1}" instead of "Vector{...}".
104+
# r"(Array{.+,\s?1}|Vector{.+})",
105+
# # Older versions will show "Array{...,2}" instead of "Matrix{...}".
106+
# r"(Array{.+,\s?2}|Matrix{.+})",
107+
# # Errors from macros sometimes result in `LoadError: LoadError:`
108+
# # rather than `LoadError:`, depending on Julia version.
109+
# r"ERROR: (LoadError:\s)+",
110+
# # Older versions do not have `;;]` but instead just `]` at end of the line
111+
# # => need to treat `;;]` and `]` as the same, i.e. ignore them if at the end of a line
112+
# r"(;;){0,1}\]$"m,
113+
# ]
114+
# doctest(DynamicPPL; manual=false, doctestfilters=doctestfilters)
115+
# end
112116
end
113117

114-
if GROUP == "All" || GROUP == "Downstream"
115-
@testset "turing" begin
116-
try
117-
# activate separate test environment
118-
Pkg.activate(DIRECTORY_Turing_tests)
119-
Pkg.develop(PackageSpec(; path=DIRECTORY_DynamicPPL))
120-
Pkg.instantiate()
121-
122-
# make sure that the new environment is considered `using` and `import` statements
123-
# (not added automatically on Julia 1.3, see e.g. PR #209)
124-
if !(joinpath(DIRECTORY_Turing_tests, "Project.toml") in Base.load_path())
125-
pushfirst!(LOAD_PATH, DIRECTORY_Turing_tests)
126-
end
127-
128-
include(joinpath("turing", "runtests.jl"))
129-
catch err
130-
err isa Pkg.Resolve.ResolverError || rethrow()
131-
# If we can't resolve that means this is incompatible by SemVer and this is fine
132-
# It means we marked this as a breaking change, so we don't need to worry about
133-
# Mistakenly introducing a breaking change, as we have intentionally made one
134-
@info "Not compatible with this release. No problem." exception = err
135-
end
136-
end
137-
end
118+
# if GROUP == "All" || GROUP == "Downstream"
119+
# @testset "turing" begin
120+
# try
121+
# # activate separate test environment
122+
# Pkg.activate(DIRECTORY_Turing_tests)
123+
# Pkg.develop(PackageSpec(; path=DIRECTORY_DynamicPPL))
124+
# Pkg.instantiate()
125+
126+
# # make sure that the new environment is considered `using` and `import` statements
127+
# # (not added automatically on Julia 1.3, see e.g. PR #209)
128+
# if !(joinpath(DIRECTORY_Turing_tests, "Project.toml") in Base.load_path())
129+
# pushfirst!(LOAD_PATH, DIRECTORY_Turing_tests)
130+
# end
131+
132+
# include(joinpath("turing", "runtests.jl"))
133+
# catch err
134+
# err isa Pkg.Resolve.ResolverError || rethrow()
135+
# # If we can't resolve that means this is incompatible by SemVer and this is fine
136+
# # It means we marked this as a breaking change, so we don't need to worry about
137+
# # Mistakenly introducing a breaking change, as we have intentionally made one
138+
# @info "Not compatible with this release. No problem." exception = err
139+
# end
140+
# end
141+
# end
138142
end

0 commit comments

Comments
 (0)