From 19506887b8d7ef06fb61d6dc529dda25883d0985 Mon Sep 17 00:00:00 2001 From: Penelope Yong Date: Fri, 27 Sep 2024 16:26:54 +0100 Subject: [PATCH 1/2] Reapply "Bump Optimization to v4, and related packages accordingly (#2327)" (#2343) This reverts commit 3c91eec43176d26048b810aae0f6f2fac0686cfa. --- Project.toml | 8 ++++---- test/Project.toml | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Project.toml b/Project.toml index 5f5c86b04e..e835cc1efd 100644 --- a/Project.toml +++ b/Project.toml @@ -58,13 +58,13 @@ AdvancedPS = "0.6.0" AdvancedVI = "0.2" BangBang = "0.4" Bijectors = "0.13.6" +Compat = "4.15.0" DataStructures = "0.18" Distributions = "0.23.3, 0.24, 0.25" DistributionsAD = "0.6" DocStringExtensions = "0.8, 0.9" DynamicHMC = "3.4" DynamicPPL = "0.28.2" -Compat = "4.15.0" EllipticalSliceSampling = "0.5, 1, 2" ForwardDiff = "0.10.3" Libtask = "0.7, 0.8" @@ -73,12 +73,12 @@ LogDensityProblems = "2" LogDensityProblemsAD = "1.7.0" MCMCChains = "5, 6" NamedArrays = "0.9, 0.10" -Optimization = "3" -OptimizationOptimJL = "0.1, 0.2, 0.3" +Optim = "1" +Optimization = "3, 4" +OptimizationOptimJL = "0.1, 0.2, 0.3, 0.4" OrderedCollections = "1" Printf = "1" Random = "1" -Optim = "1" Reexport = "0.2, 1" Requires = "0.5, 1.0" SciMLBase = "1.92.1, 2" diff --git a/test/Project.toml b/test/Project.toml index 67292d2af5..4e8f2ce380 100644 --- a/test/Project.toml +++ b/test/Project.toml @@ -55,10 +55,10 @@ LogDensityProblemsAD = "1.4" MCMCChains = "5, 6" NamedArrays = "0.9.4, 0.10" Optim = "1" -Optimization = "3" -OptimizationBBO = "0.1, 0.2, 0.3" -OptimizationNLopt = "0.1, 0.2" -OptimizationOptimJL = "0.1, 0.2, 0.3" +Optimization = "3, 4" +OptimizationBBO = "0.1, 0.2, 0.3, 0.4" +OptimizationNLopt = "0.1, 0.2, 0.3" +OptimizationOptimJL = "0.1, 0.2, 0.3, 0.4" PDMats = "0.10, 0.11" Pkg = "1" Random = "1" From 850548d50b05b32d08fcaf29e562e1fb319aa377 Mon Sep 17 00:00:00 2001 From: Penelope Yong Date: Wed, 23 Oct 2024 17:42:25 +0100 Subject: [PATCH 2/2] Unmark Mooncake as broken on Optimization v4 --- test/optimisation/Optimisation.jl | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/test/optimisation/Optimisation.jl b/test/optimisation/Optimisation.jl index d8afd83dbb..a5d4f994af 100644 --- a/test/optimisation/Optimisation.jl +++ b/test/optimisation/Optimisation.jl @@ -624,14 +624,7 @@ using Turing m = DynamicPPL.contextualize( gdemo_default, ADUtils.ADTypeCheckContext(adbackend, gdemo_default.context) ) - if adbackend isa AutoMooncake - # Optimization.jl does not support Mooncake as an AD backend, see - # https://docs.sciml.ai/Optimization/stable/API/ad/#ad - # If it ever does, then we should just run them to make sure they don't error - err_msg = "The passed automatic differentiation backend choice is not available" - @test_throws err_msg maximum_likelihood(m; adtype=adbackend) - @test_throws err_msg maximum_a_posteriori(m; adtype=adbackend) - elseif adbackend isa AutoForwardDiff + if adbackend isa AutoForwardDiff # TODO: Figure out why this is happening. # https://github.com/TuringLang/Turing.jl/issues/2369 @test_throws DivideError maximum_likelihood(m; adtype=adbackend)