Merge pull request #2843 from ChrisRackauckas-Claude/remove-parameterizedfunctions

Remove ParameterizedFunctions.jl dependency from tests

Author: ChrisRackauckas

Project.toml

@@ -75,95 +75,37 @@ StaticArrayInterface = "0d7ed370-da01-4f52-bd93-41d350b8b718"
 StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
 TruncatedStacktraces = "781d530d-4396-4725-bb49-402e4bee1e77"
 
-[sources.OrdinaryDiffEqAdamsBashforthMoulton]
-path = "lib/OrdinaryDiffEqAdamsBashforthMoulton"
-
-[sources.OrdinaryDiffEqBDF]
-path = "lib/OrdinaryDiffEqBDF"
-
-[sources.OrdinaryDiffEqCore]
-path = "lib/OrdinaryDiffEqCore"
-
-[sources.OrdinaryDiffEqDefault]
-path = "lib/OrdinaryDiffEqDefault"
-
-[sources.OrdinaryDiffEqDifferentiation]
-path = "lib/OrdinaryDiffEqDifferentiation"
-
-[sources.OrdinaryDiffEqExplicitRK]
-path = "lib/OrdinaryDiffEqExplicitRK"
-
-[sources.OrdinaryDiffEqExponentialRK]
-path = "lib/OrdinaryDiffEqExponentialRK"
-
-[sources.OrdinaryDiffEqExtrapolation]
-path = "lib/OrdinaryDiffEqExtrapolation"
-
-[sources.OrdinaryDiffEqFIRK]
-path = "lib/OrdinaryDiffEqFIRK"
-
-[sources.OrdinaryDiffEqFeagin]
-path = "lib/OrdinaryDiffEqFeagin"
-
-[sources.OrdinaryDiffEqFunctionMap]
-path = "lib/OrdinaryDiffEqFunctionMap"
-
-[sources.OrdinaryDiffEqHighOrderRK]
-path = "lib/OrdinaryDiffEqHighOrderRK"
-
-[sources.OrdinaryDiffEqIMEXMultistep]
-path = "lib/OrdinaryDiffEqIMEXMultistep"
-
-[sources.OrdinaryDiffEqLinear]
-path = "lib/OrdinaryDiffEqLinear"
-
-[sources.OrdinaryDiffEqLowOrderRK]
-path = "lib/OrdinaryDiffEqLowOrderRK"
-
-[sources.OrdinaryDiffEqLowStorageRK]
-path = "lib/OrdinaryDiffEqLowStorageRK"
-
-[sources.OrdinaryDiffEqNonlinearSolve]
-path = "lib/OrdinaryDiffEqNonlinearSolve"
-
-[sources.OrdinaryDiffEqNordsieck]
-path = "lib/OrdinaryDiffEqNordsieck"
-
-[sources.OrdinaryDiffEqPDIRK]
-path = "lib/OrdinaryDiffEqPDIRK"
-
-[sources.OrdinaryDiffEqPRK]
-path = "lib/OrdinaryDiffEqPRK"
-
-[sources.OrdinaryDiffEqQPRK]
-path = "lib/OrdinaryDiffEqQPRK"
-
-[sources.OrdinaryDiffEqRKN]
-path = "lib/OrdinaryDiffEqRKN"
-
-[sources.OrdinaryDiffEqRosenbrock]
-path = "lib/OrdinaryDiffEqRosenbrock"
-
-[sources.OrdinaryDiffEqSDIRK]
-path = "lib/OrdinaryDiffEqSDIRK"
-
-[sources.OrdinaryDiffEqSSPRK]
-path = "lib/OrdinaryDiffEqSSPRK"
-
-[sources.OrdinaryDiffEqStabilizedIRK]
-path = "lib/OrdinaryDiffEqStabilizedIRK"
-
-[sources.OrdinaryDiffEqStabilizedRK]
-path = "lib/OrdinaryDiffEqStabilizedRK"
-
-[sources.OrdinaryDiffEqSymplecticRK]
-path = "lib/OrdinaryDiffEqSymplecticRK"
-
-[sources.OrdinaryDiffEqTsit5]
-path = "lib/OrdinaryDiffEqTsit5"
-
-[sources.OrdinaryDiffEqVerner]
-path = "lib/OrdinaryDiffEqVerner"
+[sources]
+OrdinaryDiffEqAdamsBashforthMoulton = {path = "lib/OrdinaryDiffEqAdamsBashforthMoulton"}
+OrdinaryDiffEqBDF = {path = "lib/OrdinaryDiffEqBDF"}
+OrdinaryDiffEqCore = {path = "lib/OrdinaryDiffEqCore"}
+OrdinaryDiffEqDefault = {path = "lib/OrdinaryDiffEqDefault"}
+OrdinaryDiffEqDifferentiation = {path = "lib/OrdinaryDiffEqDifferentiation"}
+OrdinaryDiffEqExplicitRK = {path = "lib/OrdinaryDiffEqExplicitRK"}
+OrdinaryDiffEqExponentialRK = {path = "lib/OrdinaryDiffEqExponentialRK"}
+OrdinaryDiffEqExtrapolation = {path = "lib/OrdinaryDiffEqExtrapolation"}
+OrdinaryDiffEqFIRK = {path = "lib/OrdinaryDiffEqFIRK"}
+OrdinaryDiffEqFeagin = {path = "lib/OrdinaryDiffEqFeagin"}
+OrdinaryDiffEqFunctionMap = {path = "lib/OrdinaryDiffEqFunctionMap"}
+OrdinaryDiffEqHighOrderRK = {path = "lib/OrdinaryDiffEqHighOrderRK"}
+OrdinaryDiffEqIMEXMultistep = {path = "lib/OrdinaryDiffEqIMEXMultistep"}
+OrdinaryDiffEqLinear = {path = "lib/OrdinaryDiffEqLinear"}
+OrdinaryDiffEqLowOrderRK = {path = "lib/OrdinaryDiffEqLowOrderRK"}
+OrdinaryDiffEqLowStorageRK = {path = "lib/OrdinaryDiffEqLowStorageRK"}
+OrdinaryDiffEqNonlinearSolve = {path = "lib/OrdinaryDiffEqNonlinearSolve"}
+OrdinaryDiffEqNordsieck = {path = "lib/OrdinaryDiffEqNordsieck"}
+OrdinaryDiffEqPDIRK = {path = "lib/OrdinaryDiffEqPDIRK"}
+OrdinaryDiffEqPRK = {path = "lib/OrdinaryDiffEqPRK"}
+OrdinaryDiffEqQPRK = {path = "lib/OrdinaryDiffEqQPRK"}
+OrdinaryDiffEqRKN = {path = "lib/OrdinaryDiffEqRKN"}
+OrdinaryDiffEqRosenbrock = {path = "lib/OrdinaryDiffEqRosenbrock"}
+OrdinaryDiffEqSDIRK = {path = "lib/OrdinaryDiffEqSDIRK"}
+OrdinaryDiffEqSSPRK = {path = "lib/OrdinaryDiffEqSSPRK"}
+OrdinaryDiffEqStabilizedIRK = {path = "lib/OrdinaryDiffEqStabilizedIRK"}
+OrdinaryDiffEqStabilizedRK = {path = "lib/OrdinaryDiffEqStabilizedRK"}
+OrdinaryDiffEqSymplecticRK = {path = "lib/OrdinaryDiffEqSymplecticRK"}
+OrdinaryDiffEqTsit5 = {path = "lib/OrdinaryDiffEqTsit5"}
+OrdinaryDiffEqVerner = {path = "lib/OrdinaryDiffEqVerner"}
 
 [compat]
 ADTypes = "1.16"
@@ -254,7 +196,6 @@ JLArrays = "27aeb0d3-9eb9-45fb-866b-73c2ecf80fcb"
 ModelingToolkit = "961ee093-0014-501f-94e3-6117800e7a78"
 NLsolve = "2774e3e8-f4cf-5e23-947b-6d7e65073b56"
 ODEProblemLibrary = "fdc4e326-1af4-4b90-96e7-779fcce2daa5"
-ParameterizedFunctions = "65888b18-ceab-5e60-b2b9-181511a3b968"
 Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
 Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
 RecursiveFactorization = "f2c3362d-daeb-58d1-803e-2bc74f2840b4"
@@ -270,4 +211,4 @@ Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 Unitful = "1986cc42-f94f-5a68-af5c-568840ba703d"
 
 [targets]
-test = ["ComponentArrays", "Symbolics", "AlgebraicMultigrid", "IncompleteLU", "DiffEqCallbacks", "DifferentiationInterface", "DiffEqDevTools", "ODEProblemLibrary", "ElasticArrays", "ExplicitImports", "InteractiveUtils", "ParameterizedFunctions", "JLArrays", "Random", "ReverseDiff", "SafeTestsets", "SparseArrays", "Statistics", "StructArrays", "Test", "Unitful", "ModelingToolkit", "Pkg", "NLsolve", "RecursiveFactorization", "SparseConnectivityTracer", "SparseMatrixColorings"]
+test = ["ComponentArrays", "Symbolics", "AlgebraicMultigrid", "IncompleteLU", "DiffEqCallbacks", "DifferentiationInterface", "DiffEqDevTools", "ODEProblemLibrary", "ElasticArrays", "ExplicitImports", "InteractiveUtils", "JLArrays", "Random", "ReverseDiff", "SafeTestsets", "SparseArrays", "Statistics", "StructArrays", "Test", "Unitful", "ModelingToolkit", "Pkg", "NLsolve", "RecursiveFactorization", "SparseConnectivityTracer", "SparseMatrixColorings"]

test/interface/linear_solver_test.jl

@@ -31,7 +31,7 @@ odef = ODEFunction(foop; jac = jac, jac_prototype = jac(u0, p, 0.0), paramjac =
 function g_helper(p; alg = Rosenbrock23(linsolve = LUFactorization()))
     prob = ODEProblem(odef, u0, tspan, p)
     soln = Array(solve(prob, alg; u0 = prob.u0, p = prob.p, abstol = 1e-4, reltol = 1e-4))[
-        :, end]
+    :, end]
     return soln
 end
 function g(p; kwargs...)
@@ -104,7 +104,7 @@ odef = ODEFunction{true}(fiip; jac = jac, jac_prototype = jac(u0, p, 0.0),
 function g_helper(p; alg = Rosenbrock23(linsolve = LUFactorization()))
     prob = ODEProblem(odef, u0, tspan, p)
     soln = Array(solve(prob, alg; u0 = prob.u0, p = prob.p, abstol = 1e-4, reltol = 1e-4))[
-        :, end]
+    :, end]
     return soln
 end
 function g(p; kwargs...)
@@ -158,27 +158,50 @@ end
 @test isapprox(exp.(p), g_helper(p; alg = KenCarp47(linsolve = KrylovJL_GMRES()));
     atol = 1e-1, rtol = 1e-1)
 
-using OrdinaryDiffEq, StaticArrays, LinearSolve, ParameterizedFunctions
+using OrdinaryDiffEq, StaticArrays, LinearSolve
+
+# In-place version
+function hires!(du, u, p, t)
+    T = eltype(u)
+    du[1] = T(-1.71) * u[1] + T(0.43) * u[2] + T(8.32) * u[3] + T(0.0007) + T(1.0e-18) * t
+    du[2] = T(1.71) * u[1] - T(8.75) * u[2]
+    du[3] = T(-10.03) * u[3] + T(0.43) * u[4] + T(0.035) * u[5]
+    du[4] = T(8.32) * u[2] + T(1.71) * u[3] - T(1.12) * u[4]
+    du[5] = T(-1.745) * u[5] + T(0.43) * u[6] + T(0.43) * u[7]
+    du[6] = T(-280.0) * u[6] * u[8] + T(0.69) * u[4] + T(1.71) * u[5] - T(0.43) * u[6] +
+            T(0.69) * u[7]
+    du[7] = T(280.0) * u[6] * u[8] - T(1.81) * u[7]
+    du[8] = T(-280.0) * u[6] * u[8] + T(1.81) * u[7]
+end
 
-hires = @ode_def Hires begin
-    dy1 = -1.71f0 * y1 + 0.43f0 * y2 + 8.32f0 * y3 + 0.0007f0 + 1.0f-18 * t
-    dy2 = 1.71f0 * y1 - 8.75f0 * y2
-    dy3 = -10.03f0 * y3 + 0.43f0 * y4 + 0.035f0 * y5
-    dy4 = 8.32f0 * y2 + 1.71f0 * y3 - 1.12f0 * y4
-    dy5 = -1.745f0 * y5 + 0.43f0 * y6 + 0.43f0 * y7
-    dy6 = -280.0f0 * y6 * y8 + 0.69f0 * y4 + 1.71f0 * y5 - 0.43f0 * y6 + 0.69f0 * y7
-    dy7 = 280.0f0 * y6 * y8 - 1.81f0 * y7
-    dy8 = -280.0f0 * y6 * y8 + 1.81f0 * y7
+# Out-of-place version
+function hires(u, p, t)
+    T = eltype(u)
+    du1 = T(-1.71) * u[1] + T(0.43) * u[2] + T(8.32) * u[3] + T(0.0007) + T(1.0e-18) * t
+    du2 = T(1.71) * u[1] - T(8.75) * u[2]
+    du3 = T(-10.03) * u[3] + T(0.43) * u[4] + T(0.035) * u[5]
+    du4 = T(8.32) * u[2] + T(1.71) * u[3] - T(1.12) * u[4]
+    du5 = T(-1.745) * u[5] + T(0.43) * u[6] + T(0.43) * u[7]
+    du6 = T(-280.0) * u[6] * u[8] + T(0.69) * u[4] + T(1.71) * u[5] - T(0.43) * u[6] +
+          T(0.69) * u[7]
+    du7 = T(280.0) * u[6] * u[8] - T(1.81) * u[7]
+    du8 = T(-280.0) * u[6] * u[8] + T(1.81) * u[7]
+
+    if u isa SVector
+        return SVector(du1, du2, du3, du4, du5, du6, du7, du8)
+    else
+        return [du1, du2, du3, du4, du5, du6, du7, du8]
+    end
 end
 
 u0 = zeros(8)
 u0[1] = 1
 u0[8] = 0.0057
 
-probiip = ODEProblem{true}(hires, u0, (0.0, 10.0))
+probiip = ODEProblem{true}(hires!, u0, (0.0, 10.0))
 proboop = ODEProblem{false}(hires, u0, (0.0, 10.0))
 probstatic = ODEProblem{false}(hires, SVector{8}(u0), (0.0, 10.0))
-probiipf32 = ODEProblem{true}(hires, Float32.(u0), (0.0f0, 10.0f0))
+probiipf32 = ODEProblem{true}(hires!, Float32.(u0), (0.0f0, 10.0f0))
 proboopf32 = ODEProblem{false}(hires, Float32.(u0), (0.0f0, 10.0f0))
 probstaticf32 = ODEProblem{false}(hires, SVector{8}(Float32.(u0)), (0.0f0, 10.0f0))
 probs = (; probiip, proboop, probstatic)