Skip to content

Commit 83697ae

Browse files
ChrisRackauckasChrisRackauckas
committed
Add explicit imports for OrdinaryDiffEq v7 narrowed exports
OrdinaryDiffEq v7 only re-exports a small surface (DefaultODEAlgorithm, Tsit5, AutoTsit5, Vern6-9, Rosenbrock23, Rodas5P, FBDF). Tests were relying on it to pull in SciMLBase, ImplicitMidpoint and NLNewton, which no longer works. - Add OrdinaryDiffEqSDIRK / OrdinaryDiffEqNonlinearSolve / SciMLBase to test extras + targets, with v1/v2 and v2/v3 compat respectively. - Import ImplicitMidpoint from OrdinaryDiffEqSDIRK in test/Mechanical/translational_modelica.jl. - Import NLNewton from OrdinaryDiffEqNonlinearSolve in test/Hydraulic/isothermal_compressible.jl. - Add `using SciMLBase` to the nine test files that reference SciMLBase.successful_retcode / SciMLBase.FullSpecialize. Co-Authored-By: Chris Rackauckas <accounts@chrisrackauckas.com>
1 parent 53ddce6 commit 83697ae

12 files changed

Lines changed: 18 additions & 1 deletion

File tree

‎Project.toml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,13 @@ ModelingToolkitBase = "1"
2828
OrdinaryDiffEq = "6, 7"
2929
OrdinaryDiffEqBDF = "1, 2"
3030
OrdinaryDiffEqDefault = "1, 2"
31+
OrdinaryDiffEqNonlinearSolve = "1, 2"
3132
OrdinaryDiffEqRosenbrock = "1, 2"
33+
OrdinaryDiffEqSDIRK = "1, 2"
3234
PreallocationTools = "0.4.27, 1"
3335
SafeTestsets = "0.1"
3436
SciCompDSL = "1"
37+
SciMLBase = "2, 3"
3538
SciMLStructures = "1.7.0"
3639
SymbolicIndexingInterface = "0.3.39"
3740
Symbolics = "7.4.1"
@@ -50,12 +53,15 @@ ModelingToolkit = "961ee093-0014-501f-94e3-6117800e7a78"
5053
OrdinaryDiffEq = "1dea7af3-3e70-54e6-95c3-0bf5283fa5ed"
5154
OrdinaryDiffEqBDF = "6ad6398a-0878-4a85-9266-38940aa047c8"
5255
OrdinaryDiffEqDefault = "50262376-6c5a-4cf5-baba-aaf4f84d72d7"
56+
OrdinaryDiffEqNonlinearSolve = "127b3ac7-2247-4354-8eb6-78cf4e7c58e8"
5357
OrdinaryDiffEqRosenbrock = "43230ef6-c299-4910-a778-202eb28ce4ce"
58+
OrdinaryDiffEqSDIRK = "2d112036-d095-4a1e-ab9a-08536f3ecdbf"
5459
SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f"
5560
SciCompDSL = "91a8cdf1-4ca6-467b-a780-87fda3fff15e"
61+
SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462"
5662
SciMLStructures = "53ae85a6-f571-4167-b2af-e1d143709226"
5763
SymbolicIndexingInterface = "2efcf032-c050-4f8e-a9bb-153293bab1f5"
5864
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
5965

6066
[targets]
61-
test = ["ADTypes", "Aqua", "LinearAlgebra", "OrdinaryDiffEqBDF", "OrdinaryDiffEqDefault", "OrdinaryDiffEq", "OrdinaryDiffEqRosenbrock", "SafeTestsets", "Test", "ControlSystemsBase", "DataFrames", "DataInterpolations", "SciMLStructures", "SymbolicIndexingInterface", "ForwardDiff", "SciCompDSL", "ModelingToolkit"]
67+
test = ["ADTypes", "Aqua", "LinearAlgebra", "OrdinaryDiffEqBDF", "OrdinaryDiffEqDefault", "OrdinaryDiffEq", "OrdinaryDiffEqNonlinearSolve", "OrdinaryDiffEqRosenbrock", "OrdinaryDiffEqSDIRK", "SafeTestsets", "Test", "ControlSystemsBase", "DataFrames", "DataInterpolations", "SciMLBase", "SciMLStructures", "SymbolicIndexingInterface", "ForwardDiff", "SciCompDSL", "ModelingToolkit"]

‎test/Blocks/nonlinear.jl‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using ModelingToolkit, OrdinaryDiffEq
22
using SciCompDSL
3+
using SciMLBase
34
using ModelingToolkitStandardLibrary.Blocks
45
using ModelingToolkit: t_nounits as t
56
using ModelingToolkitStandardLibrary.Blocks: _dead_zone

‎test/Blocks/sources.jl‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using ModelingToolkit, ModelingToolkitStandardLibrary, OrdinaryDiffEq
22
using SciCompDSL
3+
using SciMLBase
34
using ModelingToolkitStandardLibrary.Blocks
45
using ModelingToolkit: t_nounits as t, D_nounits as D
56
using ModelingToolkitStandardLibrary.Blocks: smooth_sin, smooth_cos, smooth_damped_sin,

‎test/Electrical/analog.jl‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using ModelingToolkitStandardLibrary.Electrical, ModelingToolkit, OrdinaryDiffEq, Test
22
using SciCompDSL
3+
using SciMLBase
34
using ModelingToolkit: t_nounits as t, D_nounits as D
45
using ModelingToolkitStandardLibrary.Blocks: Step,
56
Constant, Sine, Cosine, ExpSine, Ramp,

‎test/Hydraulic/isothermal_compressible.jl‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using ModelingToolkit, OrdinaryDiffEq, Test
22
using SciCompDSL
3+
using OrdinaryDiffEqNonlinearSolve: NLNewton
34
using ModelingToolkit: t_nounits as t, D_nounits as D
45
import ModelingToolkitStandardLibrary.Hydraulic.IsothermalCompressible as IC
56
import ModelingToolkitStandardLibrary.Blocks as B

‎test/Magnetic/magnetic.jl‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using ModelingToolkitStandardLibrary.Magnetic, ModelingToolkit, OrdinaryDiffEq, Test
22
using SciCompDSL
3+
using SciMLBase
34

45
import ModelingToolkitStandardLibrary.Electrical
56
import ModelingToolkitStandardLibrary.Blocks

‎test/Mechanical/rotational.jl‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ using ModelingToolkitStandardLibrary.Mechanical.Rotational,
22
ModelingToolkit, OrdinaryDiffEq,
33
Test
44
using SciCompDSL
5+
using SciMLBase
56
using ModelingToolkit: t_nounits as t, D_nounits as D
67
import ModelingToolkitStandardLibrary.Blocks
78
using OrdinaryDiffEq: ReturnCode.Success

‎test/Mechanical/translational_modelica.jl‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ using ModelingToolkit, OrdinaryDiffEq, Test
22
using SciCompDSL
33
using ModelingToolkit: t_nounits as t, D_nounits as D
44
using OrdinaryDiffEqRosenbrock: Rodas4
5+
using OrdinaryDiffEqSDIRK: ImplicitMidpoint
56

67
using ModelingToolkitStandardLibrary.Blocks: Sine
78
using ModelingToolkitStandardLibrary.Mechanical.TranslationalModelica: Damper, Spring, Mass,

‎test/Thermal/demo.jl‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using ModelingToolkitStandardLibrary.Thermal, ModelingToolkit, OrdinaryDiffEq, Test
22
using SciCompDSL
3+
using SciMLBase
34
using ModelingToolkit: t_nounits as t, D_nounits as D
45
using OrdinaryDiffEq: ReturnCode.Success
56

‎test/Thermal/motor.jl‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using ModelingToolkit, Test
22
using SciCompDSL
3+
using SciMLBase
34
using ModelingToolkitStandardLibrary.Thermal
45
using ModelingToolkitStandardLibrary.Blocks
56

0 commit comments

Comments
 (0)