From 46313e7ff139888e9d30182fa6c981e66dc383df Mon Sep 17 00:00:00 2001
From: David Widmann <devmotion@users.noreply.github.com>
Date: Wed, 8 Jun 2022 17:16:17 +0200
Subject: [PATCH] Switch to Optimization.jl (#1836)

---
 Project.toml                 | 4 ++--
 test/Project.toml            | 8 ++++----
 test/modes/ModeEstimation.jl | 4 ++--
 test/runtests.jl             | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Project.toml b/Project.toml
index d02bfb107..7ca63e77f 100644
--- a/Project.toml
+++ b/Project.toml
@@ -1,6 +1,6 @@
 name = "Turing"
 uuid = "fce5fe82-541a-59a6-adf8-730c64b5f9a0"
-version = "0.21.4"
+version = "0.21.5"
 
 [deps]
 AbstractMCMC = "80f14c24-f653-4e6a-9b94-39d6b0f70001"
@@ -53,7 +53,7 @@ MCMCChains = "5"
 NamedArrays = "0.9"
 Reexport = "0.2, 1"
 Requires = "0.5, 1.0"
-SciMLBase = "1.8.1"
+SciMLBase = "1.37.1"
 SpecialFunctions = "0.7.2, 0.8, 0.9, 0.10, 1, 2"
 StatsBase = "0.32, 0.33"
 StatsFuns = "0.8, 0.9, 1"
diff --git a/test/Project.toml b/test/Project.toml
index cbbace607..6f26bb388 100644
--- a/test/Project.toml
+++ b/test/Project.toml
@@ -11,13 +11,13 @@ DynamicHMC = "bbc10e6e-7c05-544b-b16e-64fede858acb"
 DynamicPPL = "366bfd00-2699-11ea-058f-f148b4cae6d8"
 FiniteDifferences = "26cc04aa-876d-5657-8c51-4c34ba976000"
 ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210"
-GalacticOptim = "a75be94c-b780-496d-a8a9-0878b188d577"
-GalacticOptimJL = "9d3c5eb1-403b-401b-8c0f-c11105342e6b"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 MCMCChains = "c7f686f2-ff18-58e9-bc7b-31028e88f75d"
 Memoization = "6fafb56a-5788-4b4e-91ca-c0cea6611c73"
 NamedArrays = "86f7a689-2022-50b4-a561-43c23ac3c673"
 Optim = "429524aa-4258-5aef-a3af-852621145aeb"
+Optimization = "7f7a1694-90dd-40f0-9382-eb1efda571ba"
+OptimizationOptimJL = "36348300-93cb-4f02-beb5-3c3902f8871e"
 PDMats = "90014a1f-27ba-587c-ab20-58faa44d9150"
 Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
 Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
@@ -44,12 +44,12 @@ DynamicHMC = "2.1.6, 3.0"
 DynamicPPL = "0.19.1"
 FiniteDifferences = "0.10.8, 0.11, 0.12"
 ForwardDiff = "0.10.12"
-GalacticOptim = "3"
-GalacticOptimJL = "0.1"
 MCMCChains = "5"
 Memoization = "0.1.4"
 NamedArrays = "0.9.4"
 Optim = "0.22, 1.0"
+Optimization = "3.5"
+OptimizationOptimJL = "0.1"
 PDMats = "0.10, 0.11"
 ReverseDiff = "1.4.2"
 SpecialFunctions = "0.10.3, 1, 2"
diff --git a/test/modes/ModeEstimation.jl b/test/modes/ModeEstimation.jl
index fa0b5e849..2e84f2426 100644
--- a/test/modes/ModeEstimation.jl
+++ b/test/modes/ModeEstimation.jl
@@ -71,7 +71,7 @@
             ub = [2.0, 2.0]
 
             f1 = optim_function(gdemo_default, MLE();constrained=true)
-            p1 = GalacticOptim.OptimizationProblem(f1.func, f1.init(true_value); lb=lb, ub=ub)
+            p1 = OptimizationProblem(f1.func, f1.init(true_value); lb=lb, ub=ub)
 
             p2 = optim_objective(gdemo_default, MLE();constrained=true)
             
@@ -99,7 +99,7 @@
             ub = [2.0, 2.0]
 
             f1 = optim_function(gdemo_default, MAP();constrained=true)
-            p1 = GalacticOptim.OptimizationProblem(f1.func, f1.init(true_value); lb=lb, ub=ub)
+            p1 = OptimizationProblem(f1.func, f1.init(true_value); lb=lb, ub=ub)
 
             p2 = optim_objective(gdemo_default, MAP();constrained=true)
             
diff --git a/test/runtests.jl b/test/runtests.jl
index e3d2eebb1..5e0c1f0e2 100644
--- a/test/runtests.jl
+++ b/test/runtests.jl
@@ -6,12 +6,12 @@ using Distributions.FillArrays
 using DistributionsAD
 using FiniteDifferences
 using ForwardDiff
-using GalacticOptim
-using GalacticOptimJL
 using MCMCChains
 using Memoization
 using NamedArrays
 using Optim
+using Optimization
+using OptimizationOptimJL
 using PDMats
 using ReverseDiff
 using SpecialFunctions