Merge pull request #25 from thomvet/patch

addresses #24. Also propagated changes to tests and Project.toml; bumped patch version.

Author: ChrisRackauckas

Project.toml

@@ -1,7 +1,7 @@
 name = "PreallocationTools"
 uuid = "d236fae5-4411-538c-8e31-a6e3d9e00b46"
 authors = ["Chris Rackauckas <accounts@chrisrackauckas.com>"]
-version = "0.3.1"
+version = "0.3.2"
 
 [deps]
 Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e"
@@ -18,13 +18,13 @@ julia = "1.6"
 
 [extras]
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
+Optimization = "7f7a1694-90dd-40f0-9382-eb1efda571ba"
+OptimizationOptimJL = "36348300-93cb-4f02-beb5-3c3902f8871e"
 OrdinaryDiffEq = "1dea7af3-3e70-54e6-95c3-0bf5283fa5ed"
 Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
 RecursiveArrayTools = "731186ca-8d62-57ce-b412-fbd966d074cd"
 SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
-GalacticOptim = "a75be94c-b780-496d-a8a9-0878b188d577"
-GalacticOptimJL = "9d3c5eb1-403b-401b-8c0f-c11105342e6b"
 
 [targets]
-test = ["LinearAlgebra", "OrdinaryDiffEq", "Test", "RecursiveArrayTools", "Pkg", "SafeTestsets", "GalacticOptim", "GalacticOptimJL"]
+test = ["LinearAlgebra", "OrdinaryDiffEq", "Test", "RecursiveArrayTools", "Pkg", "SafeTestsets", "Optimization", "OptimizationOptimJL"]

README.md

@@ -140,7 +140,7 @@ solve(prob, TRBDF2())
 ### dualcache Example 3: Nested AD calls in an optimization problem involving a Hessian matrix
 
 ```julia
-using LinearAlgebra, OrdinaryDiffEq, PreallocationTools, Optim, GalacticOptim
+using LinearAlgebra, OrdinaryDiffEq, PreallocationTools, Optim, Optimization
 function foo(du, u, p, t)
     tmp = p[2]
     A = reshape(p[1], size(tmp.du))
@@ -168,7 +168,7 @@ function objfun(x, prob, realsol, cache)
     return ofv
 end
 fn(x,p) = objfun(x, p[1], p[2], p[3])
-optfun = OptimizationFunction(fn, GalacticOptim.AutoForwardDiff())
+optfun = OptimizationFunction(fn, Optimization.AutoForwardDiff())
 optprob = OptimizationProblem(optfun, zeros(length(coeffs)), (prob, realsol, cache))
 solve(optprob, Newton())
 ```

test/core_nesteddual.jl

@@ -1,4 +1,4 @@
-using LinearAlgebra, OrdinaryDiffEq, Test, PreallocationTools, ForwardDiff, GalacticOptim, GalacticOptimJL
+using LinearAlgebra, OrdinaryDiffEq, Test, PreallocationTools, ForwardDiff, Optimization, OptimizationOptimJL
 
 randmat = rand(5, 3)
 sto = similar(randmat)
@@ -71,7 +71,7 @@ function objfun(x, prob, realsol, cache)
     return ofv
 end
 fn(x,p) = objfun(x, p[1], p[2], p[3])
-optfun = OptimizationFunction(fn, GalacticOptim.AutoForwardDiff())
+optfun = OptimizationFunction(fn, Optimization.AutoForwardDiff())
 optprob = OptimizationProblem(optfun, zeros(length(coeffs)), (prob, realsol, cache))
 newtonsol = solve(optprob, Newton())
 
@@ -97,7 +97,7 @@ end
 
 fn(x,p) = objfun(x, p[1], p[2], p[3])
 
-optfun = OptimizationFunction(fn, GalacticOptim.AutoForwardDiff())
+optfun = OptimizationFunction(fn, Optimization.AutoForwardDiff())
 optprob = OptimizationProblem(optfun, zeros(length(coeffs)), (prob, realsol, cache))
 newtonsol2 = solve(optprob, Newton())