Skip to content

Commit 7a45694

Browse files
committed
Reenable Turing tests (#230)
The new release of Libtask_jll is compatible with Julia 1.6.0 (to fix the multithreading issues on Julia 1.5.4 a different version is needed which should be available soon).
1 parent 1f2f160 commit 7a45694

File tree

5 files changed

+34
-28
lines changed

5 files changed

+34
-28
lines changed

.github/workflows/CI.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ jobs:
5252
- uses: julia-actions/julia-buildpkg@latest
5353
- uses: julia-actions/julia-runtest@latest
5454
env:
55+
GROUP: All
5556
JULIA_NUM_THREADS: ${{ matrix.num_threads }}
5657
- uses: julia-actions/julia-processcoverage@v1
5758
if: matrix.version == '1' && matrix.os == 'ubuntu-latest' && matrix.num_threads == 1

.github/workflows/IntegrationTest.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- uses: actions/checkout@v2
2525
- uses: julia-actions/setup-julia@v1
2626
with:
27-
version: 1.5
27+
version: 1
2828
arch: x64
2929
- uses: julia-actions/julia-buildpkg@latest
3030
- name: Clone Downstream

.github/workflows/JuliaNightly.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,5 @@ jobs:
3131
${{ runner.os }}-
3232
- uses: julia-actions/julia-buildpkg@latest
3333
- uses: julia-actions/julia-runtest@latest
34+
env:
35+
GROUP: DynamicPPL

bors.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@ required_approvals = 1
2424
use_squash_merge = true
2525
# Uncomment this to use a two hour timeout.
2626
# The default is one hour.
27-
#timeout_sec = 7200
27+
timeout_sec = 7200

test/runtests.jl

Lines changed: 29 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -21,31 +21,46 @@ using DynamicPPL: getargs_dottilde, getargs_tilde, Selector
2121

2222
const DIRECTORY_DynamicPPL = dirname(dirname(pathof(DynamicPPL)))
2323
const DIRECTORY_Turing_tests = joinpath(DIRECTORY_DynamicPPL, "test", "turing")
24+
const GROUP = get(ENV, "GROUP", "All")
2425

2526
Random.seed!(100)
2627

2728
include("test_util.jl")
2829

2930
@testset "DynamicPPL.jl" begin
30-
include("utils.jl")
31-
include("compiler.jl")
32-
include("varinfo.jl")
33-
include("model.jl")
34-
include("sampler.jl")
35-
include("prob_macro.jl")
36-
include("independence.jl")
37-
include("distribution_wrappers.jl")
38-
include("context_implementations.jl")
31+
if GROUP == "All" || GROUP == "DynamicPPL"
32+
@testset "interface" begin
33+
include("utils.jl")
34+
include("compiler.jl")
35+
include("varinfo.jl")
36+
include("model.jl")
37+
include("sampler.jl")
38+
include("prob_macro.jl")
39+
include("independence.jl")
40+
include("distribution_wrappers.jl")
41+
include("context_implementations.jl")
3942

40-
include("threadsafe.jl")
43+
include("threadsafe.jl")
4144

42-
include("serialization.jl")
45+
include("serialization.jl")
46+
end
47+
48+
@testset "compat" begin
49+
include(joinpath("compat", "ad.jl"))
50+
end
4351

44-
@testset "compat" begin
45-
include(joinpath("compat", "ad.jl"))
52+
@testset "doctests" begin
53+
DocMeta.setdocmeta!(
54+
DynamicPPL,
55+
:DocTestSetup,
56+
:(using DynamicPPL);
57+
recursive=true,
58+
)
59+
doctest(DynamicPPL; manual=false)
60+
end
4661
end
4762

48-
@static if VERSION <= v"1.5.3"
63+
if GROUP == "All" || GROUP == "Downstream"
4964
@testset "turing" begin
5065
# activate separate test environment
5166
Pkg.activate(DIRECTORY_Turing_tests)
@@ -61,16 +76,4 @@ include("test_util.jl")
6176
include(joinpath("turing", "runtests.jl"))
6277
end
6378
end
64-
65-
@testset "doctests" begin
66-
DocMeta.setdocmeta!(
67-
DynamicPPL,
68-
:DocTestSetup,
69-
quote
70-
using DynamicPPL
71-
end;
72-
recursive=true,
73-
)
74-
doctest(DynamicPPL; manual=false)
75-
end
7679
end

0 commit comments

Comments
 (0)