From 44b187dd9bb7c679a024fa0919e0a382648fdd09 Mon Sep 17 00:00:00 2001 From: CompatHelper Julia Date: Fri, 7 Mar 2025 00:33:48 +0000 Subject: [PATCH 1/4] CompatHelper: bump compat for AdvancedHMC to 0.7, (keep existing compat) --- Project.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Project.toml b/Project.toml index c3285fc41b..0f0cc356a8 100644 --- a/Project.toml +++ b/Project.toml @@ -1,6 +1,6 @@ name = "Turing" uuid = "fce5fe82-541a-59a6-adf8-730c64b5f9a0" -version = "0.36.2" +version = "0.36.3" [deps] ADTypes = "47edcb42-4c32-4615-8424-f2b9edc5f35b" @@ -51,7 +51,7 @@ TuringOptimExt = "Optim" ADTypes = "1.9" AbstractMCMC = "5.5" Accessors = "0.1" -AdvancedHMC = "0.3.0, 0.4.0, 0.5.2, 0.6" +AdvancedHMC = "0.3.0, 0.4.0, 0.5.2, 0.6, 0.7" AdvancedMH = "0.8" AdvancedPS = "0.6.0" AdvancedVI = "0.2" From b09f5c5a34149437999d0762e9e4ac554fcdf278 Mon Sep 17 00:00:00 2001 From: Markus Hauru Date: Fri, 14 Mar 2025 10:46:40 +0000 Subject: [PATCH 2/4] Relax two test tolerances a bit --- test/mcmc/gibbs.jl | 2 +- test/test_utils/numerical_tests.jl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/mcmc/gibbs.jl b/test/mcmc/gibbs.jl index 697073d0a5..a720e9243c 100644 --- a/test/mcmc/gibbs.jl +++ b/test/mcmc/gibbs.jl @@ -573,7 +573,7 @@ end # is not ideal # Issue ref: https://github.com/TuringLang/Turing.jl/issues/2402 @test isapprox(mean(num_ms), 8.6087; atol=0.8) - @test isapprox(std(num_ms), 1.8865; atol=0.02) + @test isapprox(std(num_ms), 1.8865; atol=0.03) end # The below test used to sample incorrectly before diff --git a/test/test_utils/numerical_tests.jl b/test/test_utils/numerical_tests.jl index 97d1740141..aa5f641801 100644 --- a/test/test_utils/numerical_tests.jl +++ b/test/test_utils/numerical_tests.jl @@ -57,7 +57,7 @@ function check_numerical(chain, symbols::Vector, exact_vals::Vector; atol=0.2, r end # Wrapper function to quickly check gdemo accuracy. -function check_gdemo(chain; atol=0.2, rtol=0.0) +function check_gdemo(chain; atol=0.25, rtol=0.0) return check_numerical(chain, [:s, :m], [49 / 24, 7 / 6]; atol=atol, rtol=rtol) end From d3e47e20f3d67bd1193a13c62c7b3f40bd0d1987 Mon Sep 17 00:00:00 2001 From: Markus Hauru Date: Fri, 14 Mar 2025 12:14:16 +0000 Subject: [PATCH 3/4] Adjust some tolerances and sample counts in tests --- test/mcmc/Inference.jl | 2 +- test/mcmc/hmc.jl | 2 +- test/test_utils/numerical_tests.jl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/mcmc/Inference.jl b/test/mcmc/Inference.jl index da29e77089..a41fe5b226 100644 --- a/test/mcmc/Inference.jl +++ b/test/mcmc/Inference.jl @@ -115,7 +115,7 @@ using Turing ) check_gdemo(chn3) - chn3_contd = sample(StableRNG(seed), gdemo_default, alg3, 2_000; resume_from=chn3) + chn3_contd = sample(StableRNG(seed), gdemo_default, alg3, 5_000; resume_from=chn3) check_gdemo(chn3_contd) end diff --git a/test/mcmc/hmc.jl b/test/mcmc/hmc.jl index d45846f3d4..a81ed22296 100644 --- a/test/mcmc/hmc.jl +++ b/test/mcmc/hmc.jl @@ -251,7 +251,7 @@ using Turing gdemo_default_prior = DynamicPPL.contextualize( demo_hmc_prior(), DynamicPPL.PriorContext() ) - chain = sample(gdemo_default_prior, alg, 500; initial_params=[3.0, 0.0]) + chain = sample(gdemo_default_prior, alg, 5_000; initial_params=[3.0, 0.0]) check_numerical( chain, [:s, :m], [mean(truncated(Normal(3, 1); lower=0)), 0]; atol=0.2 ) diff --git a/test/test_utils/numerical_tests.jl b/test/test_utils/numerical_tests.jl index aa5f641801..97d1740141 100644 --- a/test/test_utils/numerical_tests.jl +++ b/test/test_utils/numerical_tests.jl @@ -57,7 +57,7 @@ function check_numerical(chain, symbols::Vector, exact_vals::Vector; atol=0.2, r end # Wrapper function to quickly check gdemo accuracy. -function check_gdemo(chain; atol=0.25, rtol=0.0) +function check_gdemo(chain; atol=0.2, rtol=0.0) return check_numerical(chain, [:s, :m], [49 / 24, 7 / 6]; atol=atol, rtol=rtol) end From 00ff5c772224ab7b077bfa832ff7f529001c20c4 Mon Sep 17 00:00:00 2001 From: Markus Hauru Date: Fri, 14 Mar 2025 15:47:22 +0000 Subject: [PATCH 4/4] Adjust more test sample counts --- test/mcmc/gibbs.jl | 2 +- test/mcmc/hmc.jl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/mcmc/gibbs.jl b/test/mcmc/gibbs.jl index a720e9243c..9af000e2c8 100644 --- a/test/mcmc/gibbs.jl +++ b/test/mcmc/gibbs.jl @@ -655,7 +655,7 @@ end # Run the Gibbs sampler and NUTS on the same model, compare statistics of the # chains. @testset "comparison with 'gold-standard' samples" begin - num_iterations = 1_000 + num_iterations = 2_000 thinning = 10 num_chains = 4 diff --git a/test/mcmc/hmc.jl b/test/mcmc/hmc.jl index a81ed22296..2a9ee871b7 100644 --- a/test/mcmc/hmc.jl +++ b/test/mcmc/hmc.jl @@ -172,7 +172,7 @@ using Turing @testset "nuts inference" begin alg = NUTS(1000, 0.8; adtype=adbackend) - res = sample(StableRNG(seed), gdemo_default, alg, 500) + res = sample(StableRNG(seed), gdemo_default, alg, 5_000) check_gdemo(res) end