Test restructuring

.github/workflows/Tests.yml

@@ -0,0 +1,77 @@
+name: Tests
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+
+jobs:
+  test:
+    runs-on: ${{ matrix.os }}
+    continue-on-error: ${{ matrix.version == 'nightly' }}
+
+    strategy:
+      matrix:
+        test-args:
+          # Run some of the slower test files individually. The last one catches everything
+          # not included in the others.
+          - "mcmc/gibbs.jl"
+          - "mcmc/hmc.jl"
+          - "mcmc/Inference.jl"
+          - "experimental/gibbs.jl"
+          - "mcmc/ess.jl"
+          - "--skip mcmc/gibbs.jl mcmc/hmc.jl mcmc/Inference.jl experimental/gibbs.jl mcmc/ess.jl"
+        version:
+          - '1.7'
+          - '1'
+        os:
+          - ubuntu-latest
+          - windows-latest
+          - macOS-latest
+        arch:
+          - x64
+          - x86
+        num_threads:
+          - 1
+          - 2
+        exclude:
+          # With Windows and macOS, only run Julia 1.7, x64, 2 threads. We just want to see
+          # some combination work on OSes other than Ubuntu.
+          - os: windows-latest
+            version: '1'
+          - os: macOS-latest
+            version: '1'
+          - os: windows-latest
+            arch: x86
+          - os: macOS-latest
+            arch: x86
+          - os: windows-latest
+            num_threads: 1
+          - os: macOS-latest
+            num_threads: 1
+          # It's sufficient to test x86 with one version of Julia and one thread.
+          - version: '1'
+            arch: x86
+          - num_threads: 2
+            arch: x86
+
+    steps:
+      - uses: actions/checkout@v4
+      - uses: julia-actions/setup-julia@v2
+        with:
+          version: '${{ matrix.version }}'
+          arch: ${{ matrix.arch }}
+      - uses: actions/cache@v4
+        env:
+          cache-name: cache-artifacts
+        with:
+          path: ~/.julia/artifacts
+          key: ${{ runner.os }}-test-${{ env.cache-name }}-${{ hashFiles('**/Project.toml') }}
+          restore-keys: |
+            ${{ runner.os }}-test-${{ env.cache-name }}-
+            ${{ runner.os }}-test-
+            ${{ runner.os }}-
+      - uses: julia-actions/julia-buildpkg@latest
+      - name: Call Pkg.test
+        run: julia --color=yes --depwarn=yes --check-bounds=yes --threads=${{ matrix.num_threads }} --project=@. -e 'import Pkg; Pkg.test(; test_args=ARGS)' -- ${{ matrix.test-args }}

test/essential/ad.jl

@@ -1,5 +1,24 @@
+module AdTests
+
+using LinearAlgebra
+using Test: @testset, @test
+
+using ForwardDiff
+using ReverseDiff
+using Distributions: logpdf
+import LogDensityProblems
+import LogDensityProblemsAD
+using Zygote
+
+using Turing
+using DynamicPPL: getval, getlogp
+using Turing: SampleFromPrior
+
+include(pkgdir(Turing)*"/test/test_utils/models.jl")
+include(pkgdir(Turing)*"/test/test_utils/ad_utils.jl")
+
 @testset "ad.jl" begin
-    @turing_testset "adr" begin
+    @testset "adr" begin
         ad_test_f = gdemo_default
         vi = Turing.VarInfo(ad_test_f)
         ad_test_f(vi, SampleFromPrior())
@@ -50,7 +69,8 @@
         ∇E2 = LogDensityProblems.logdensity_and_gradient(zygoteℓ, x)[2]
         @test sort(∇E2) ≈ grad_FWAD atol = 1e-9
     end
-    @turing_testset "general AD tests" begin
+
+    @testset "general AD tests" begin
         # Tests gdemo gradient.
         function logp1(x::Vector)
             dist_s = InverseGamma(2, 3)
@@ -179,3 +199,5 @@
         @test ℓ_grad == ℓ_grad_compiled
     end
 end
+
+end

test/essential/container.jl

@@ -1,3 +1,13 @@
+module ContainerTests
+
+using Test: @test, @testset
+
+using AdvancedPS: AdvancedPS
+using Distributions: Normal, Bernoulli, Gamma, Beta
+using DynamicPPL: @model, Sampler
+
+using Turing
+
 @testset "container.jl" begin
     @model function test()
         a ~ Normal(0, 1)
@@ -9,7 +19,7 @@
         x
     end
 
-    @turing_testset "constructor" begin
+    @testset "constructor" begin
       vi = DynamicPPL.VarInfo()
       sampler = Sampler(PG(10))
       model = test()
@@ -29,7 +39,7 @@
       @test DynamicPPL.get_num_produce(newtrace.model.f.varinfo) == 1
     end
 
-    @turing_testset "fork" begin
+    @testset "fork" begin
       @model function normal()
           a ~ Normal(0, 1)
           3 ~ Normal(a, 2)
@@ -48,3 +58,5 @@
       @test AdvancedPS.advance!(trace) ≈ AdvancedPS.advance!(newtrace) 
     end
 end
+
+end

test/experimental/gibbs.jl

@@ -1,4 +1,14 @@
-using Test, Random, Turing, DynamicPPL
+module ExperimentalGibbsTests
+
+using Random
+using Test
+
+using DynamicPPL
+
+using Turing
+
+include(pkgdir(Turing)*"/test/test_utils/models.jl")
+include(pkgdir(Turing)*"/test/test_utils/numerical_tests.jl")
 
 function check_transition_varnames(
     transition::Turing.Inference.Transition,
@@ -187,3 +197,5 @@ end
         check_MoGtest_default_z_vector(chain, atol = 0.2)
     end
 end
+
+end

test/ext/Optimisation.jl

@@ -1,3 +1,15 @@
+module OptimisationTests
+
+using Random: Random
+using Test: @testset, @test
+
+using Optimization
+using OptimizationOptimJL: optimize, NelderMead, LBFGS, Fminbox, BFGS
+
+using Turing
+
+include(pkgdir(Turing)*"/test/test_utils/models.jl")
+
 @testset "ext/Optimisation.jl" begin
     @testset "gdemo" begin
         @testset "MLE" begin
@@ -121,3 +133,5 @@
         end
     end
 end
+
+end

test/ext/dynamichmc.jl

@@ -1,5 +1,19 @@
+module DynamicHMCTests
+
+using Test: @testset, @test
+using Random: Random
+
+using Distributions: sample
+using DynamicPPL: DynamicPPL
+using DynamicPPL: Sampler
+using DynamicHMC: DynamicHMC
+
+using Turing
+
+include(pkgdir(Turing)*"/test/test_utils/models.jl")
+include(pkgdir(Turing)*"/test/test_utils/numerical_tests.jl")
+
 @testset "TuringDynamicHMCExt" begin
-    import DynamicHMC
     Random.seed!(100)
 
     @test DynamicPPL.alg_str(Sampler(externalsampler(DynamicHMC.NUTS()))) == "DynamicNUTS"
@@ -8,3 +22,5 @@
     chn = sample(gdemo_default, spl, 10_000)
     check_gdemo(chn)
 end
+
+end