Skip to content

Commit 8cb50fd

Browse files
Merge branch 'master' into master
2 parents 885c77e + 600e4a4 commit 8cb50fd

File tree

135 files changed

+2044
-1764
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

135 files changed

+2044
-1764
lines changed

.github/dependabot.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,6 @@ updates:
55
directory: "/" # Location of package manifests
66
schedule:
77
interval: "weekly"
8+
ignore:
9+
- dependency-name: "crate-ci/typos"
10+
update-types: ["version-update:semver-patch", "version-update:semver-minor"]

.github/workflows/CI.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ jobs:
2525
- Downstream
2626
- ODEInterfaceRegression
2727
- Multithreading
28+
- QA
2829

2930
- OrdinaryDiffEqAdamsBashforthMoulton
3031
- OrdinaryDiffEqBDF

Project.toml

Lines changed: 237 additions & 174 deletions
Large diffs are not rendered by default.
Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,39 @@
11
name = "ImplicitDiscreteSolve"
22
uuid = "3263718b-31ed-49cf-8a0f-35a466e8af96"
33
authors = ["vyudu <vincent.duyuan@gmail.com>"]
4-
version = "0.1.3"
5-
6-
[sources]
7-
OrdinaryDiffEqCore = {path = "../OrdinaryDiffEqCore"}
4+
version = "1.0.0"
85

96
[deps]
10-
DiffEqBase = "2b5f629d-d688-5b77-993f-72d75c75574e"
11-
OrdinaryDiffEqCore = "bbf590c4-e513-4bbe-9b18-05decba2e5d8"
12-
Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
13-
SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462"
147
SimpleNonlinearSolve = "727e6d20-b764-4bd8-a329-72de5adea6c7"
158
SymbolicIndexingInterface = "2efcf032-c050-4f8e-a9bb-153293bab1f5"
169
UnPack = "3a884ed6-31ef-47d7-9d2a-63182c4928ed"
10+
DiffEqBase = "2b5f629d-d688-5b77-993f-72d75c75574e"
11+
Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
12+
OrdinaryDiffEqCore = "bbf590c4-e513-4bbe-9b18-05decba2e5d8"
13+
SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462"
14+
15+
[extras]
16+
JET = "c3a54625-cd67-489e-a8e7-0a5a0ff4e31b"
17+
OrdinaryDiffEqSDIRK = "2d112036-d095-4a1e-ab9a-08536f3ecdbf"
18+
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
19+
Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
1720

1821
[compat]
19-
DiffEqBase = "6.164.1"
20-
OrdinaryDiffEqCore = "1.18.1"
22+
Test = "1.10.0"
2123
OrdinaryDiffEqSDIRK = "1.2.0"
22-
Reexport = "1.2.2"
2324
SciMLBase = "2.74.1"
2425
SimpleNonlinearSolve = "2.1.0"
26+
OrdinaryDiffEqCore = "1.18.1"
27+
Aqua = "0.8.11"
2528
SymbolicIndexingInterface = "0.3.38"
26-
Test = "1.10.0"
27-
UnPack = "1.0.2"
2829
julia = "1.10"
2930
JET = "0.9.18, 0.10.4"
30-
Aqua = "0.8.11"
31-
32-
[extras]
33-
OrdinaryDiffEqSDIRK = "2d112036-d095-4a1e-ab9a-08536f3ecdbf"
34-
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
35-
JET = "c3a54625-cd67-489e-a8e7-0a5a0ff4e31b"
36-
Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
31+
UnPack = "1.0.2"
32+
DiffEqBase = "6.164.1"
33+
Reexport = "1.2.2"
3734

3835
[targets]
3936
test = ["OrdinaryDiffEqSDIRK", "Test", "JET", "Aqua"]
37+
38+
[sources.OrdinaryDiffEqCore]
39+
path = "../OrdinaryDiffEqCore"

lib/ImplicitDiscreteSolve/src/ImplicitDiscreteSolve.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import OrdinaryDiffEqCore: OrdinaryDiffEqAlgorithm, alg_cache, OrdinaryDiffEqMut
1111
_initialize_dae!, DefaultInit, BrownFullBasicInit, OverrideInit
1212

1313
using Reexport
14-
@reexport using DiffEqBase
14+
@reexport using SciMLBase
1515

1616
"""
1717
IDSolve()
Lines changed: 35 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,55 @@
11
name = "OrdinaryDiffEqAdamsBashforthMoulton"
22
uuid = "89bda076-bce5-4f1c-845f-551c83cdda9a"
33
authors = ["ParamThakkar123 <paramthakkar864@gmail.com>"]
4-
version = "1.2.0"
5-
6-
[sources]
7-
OrdinaryDiffEqCore = {path = "../OrdinaryDiffEqCore"}
8-
OrdinaryDiffEqLowOrderRK = {path = "../OrdinaryDiffEqLowOrderRK"}
4+
version = "1.3.0"
95

106
[deps]
11-
DiffEqBase = "2b5f629d-d688-5b77-993f-72d75c75574e"
7+
Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
8+
Polyester = "f517fe37-dbe3-4b94-8317-1923a5111588"
9+
Static = "aedffcd0-7271-4cad-89d0-dc628f76c6d3"
1210
FastBroadcast = "7034ab61-46d4-4ed7-9d0f-46aef9175898"
13-
MuladdMacro = "46d2c3a1-f734-5fdb-9937-b9b9aeba4221"
14-
OrdinaryDiffEqCore = "bbf590c4-e513-4bbe-9b18-05decba2e5d8"
1511
OrdinaryDiffEqLowOrderRK = "1344f307-1e59-4825-a18e-ace9aa3fa4c6"
16-
Polyester = "f517fe37-dbe3-4b94-8317-1923a5111588"
1712
RecursiveArrayTools = "731186ca-8d62-57ce-b412-fbd966d074cd"
18-
Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
19-
Static = "aedffcd0-7271-4cad-89d0-dc628f76c6d3"
13+
SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462"
14+
DiffEqBase = "2b5f629d-d688-5b77-993f-72d75c75574e"
15+
MuladdMacro = "46d2c3a1-f734-5fdb-9937-b9b9aeba4221"
16+
OrdinaryDiffEqCore = "bbf590c4-e513-4bbe-9b18-05decba2e5d8"
17+
18+
[extras]
19+
JET = "c3a54625-cd67-489e-a8e7-0a5a0ff4e31b"
20+
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
21+
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
22+
DiffEqDevTools = "f3b72e0c-5b89-59e1-b016-84e28bfd966d"
23+
ODEProblemLibrary = "fdc4e326-1af4-4b90-96e7-779fcce2daa5"
24+
Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
25+
DiffEqBase = "2b5f629d-d688-5b77-993f-72d75c75574e"
26+
SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f"
2027

2128
[compat]
22-
DiffEqBase = "6.152.2"
23-
DiffEqDevTools = "2.44.4"
29+
Test = "<0.0.1, 1"
2430
FastBroadcast = "0.3.5"
31+
Random = "<0.0.1, 1"
32+
DiffEqDevTools = "2.44.4"
2533
MuladdMacro = "0.2.4"
26-
ODEProblemLibrary = "0.1.8"
34+
Polyester = "0.7.16"
35+
SciMLBase = "2"
2736
OrdinaryDiffEqCore = "1.1"
37+
Static = "1.1.1"
2838
OrdinaryDiffEqLowOrderRK = "<0.0.1, 1"
29-
Polyester = "0.7.16"
30-
Random = "<0.0.1, 1"
39+
Aqua = "0.8.11"
40+
julia = "1.10"
41+
JET = "0.9.18, 0.10.4"
3142
RecursiveArrayTools = "3.27.0"
43+
ODEProblemLibrary = "0.1.8"
44+
DiffEqBase = "6.152.2"
3245
Reexport = "1.2.2"
3346
SafeTestsets = "0.1.0"
34-
Static = "1.1.1"
35-
Test = "<0.0.1, 1"
36-
julia = "1.10"
37-
JET = "0.9.18, 0.10.4"
38-
Aqua = "0.8.11"
39-
40-
[extras]
41-
DiffEqBase = "2b5f629d-d688-5b77-993f-72d75c75574e"
42-
DiffEqDevTools = "f3b72e0c-5b89-59e1-b016-84e28bfd966d"
43-
ODEProblemLibrary = "fdc4e326-1af4-4b90-96e7-779fcce2daa5"
44-
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
45-
SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f"
46-
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
47-
JET = "c3a54625-cd67-489e-a8e7-0a5a0ff4e31b"
48-
Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
4947

5048
[targets]
5149
test = ["DiffEqDevTools", "ODEProblemLibrary", "Random", "SafeTestsets", "Test", "DiffEqBase", "JET", "Aqua"]
50+
51+
[sources.OrdinaryDiffEqLowOrderRK]
52+
path = "../OrdinaryDiffEqLowOrderRK"
53+
54+
[sources.OrdinaryDiffEqCore]
55+
path = "../OrdinaryDiffEqCore"

lib/OrdinaryDiffEqAdamsBashforthMoulton/src/OrdinaryDiffEqAdamsBashforthMoulton.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import Static: False
1818
import OrdinaryDiffEqCore
1919

2020
using Reexport
21-
@reexport using DiffEqBase
21+
@reexport using SciMLBase
2222

2323
include("algorithms.jl")
2424
include("alg_utils.jl")

lib/OrdinaryDiffEqBDF/Project.toml

Lines changed: 59 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,77 +1,85 @@
11
name = "OrdinaryDiffEqBDF"
22
uuid = "6ad6398a-0878-4a85-9266-38940aa047c8"
33
authors = ["ParamThakkar123 <paramthakkar864@gmail.com>"]
4-
version = "1.7.0"
4+
version = "1.8.0"
55

66
[deps]
7-
ADTypes = "47edcb42-4c32-4615-8424-f2b9edc5f35b"
8-
ArrayInterface = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9"
9-
DiffEqBase = "2b5f629d-d688-5b77-993f-72d75c75574e"
107
FastBroadcast = "7034ab61-46d4-4ed7-9d0f-46aef9175898"
11-
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
12-
MacroTools = "1914dd2f-81c6-5fcd-8719-6d5c9610ff09"
138
MuladdMacro = "46d2c3a1-f734-5fdb-9937-b9b9aeba4221"
14-
OrdinaryDiffEqCore = "bbf590c4-e513-4bbe-9b18-05decba2e5d8"
9+
PrecompileTools = "aea7be01-6a6a-4083-8856-8a6e6704d82a"
10+
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
1511
OrdinaryDiffEqDifferentiation = "4302a76b-040a-498a-8c04-15b101fed76b"
16-
OrdinaryDiffEqNonlinearSolve = "127b3ac7-2247-4354-8eb6-78cf4e7c58e8"
1712
OrdinaryDiffEqSDIRK = "2d112036-d095-4a1e-ab9a-08536f3ecdbf"
18-
PrecompileTools = "aea7be01-6a6a-4083-8856-8a6e6704d82a"
13+
TruncatedStacktraces = "781d530d-4396-4725-bb49-402e4bee1e77"
14+
SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462"
15+
OrdinaryDiffEqCore = "bbf590c4-e513-4bbe-9b18-05decba2e5d8"
16+
ArrayInterface = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9"
1917
Preferences = "21216c6a-2e73-6563-6e65-726566657250"
18+
MacroTools = "1914dd2f-81c6-5fcd-8719-6d5c9610ff09"
19+
StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
20+
ADTypes = "47edcb42-4c32-4615-8424-f2b9edc5f35b"
2021
RecursiveArrayTools = "731186ca-8d62-57ce-b412-fbd966d074cd"
22+
OrdinaryDiffEqNonlinearSolve = "127b3ac7-2247-4354-8eb6-78cf4e7c58e8"
23+
DiffEqBase = "2b5f629d-d688-5b77-993f-72d75c75574e"
2124
Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
22-
StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
23-
TruncatedStacktraces = "781d530d-4396-4725-bb49-402e4bee1e77"
2425

25-
[sources]
26-
OrdinaryDiffEqCore = {path = "../OrdinaryDiffEqCore"}
27-
OrdinaryDiffEqDifferentiation = {path = "../OrdinaryDiffEqDifferentiation"}
28-
OrdinaryDiffEqNonlinearSolve = {path = "../OrdinaryDiffEqNonlinearSolve"}
29-
OrdinaryDiffEqSDIRK = {path = "../OrdinaryDiffEqSDIRK"}
26+
[extras]
27+
NonlinearSolve = "8913a72c-1f9b-4ce2-8d82-65094dcecaec"
28+
ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210"
29+
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
30+
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
31+
DiffEqDevTools = "f3b72e0c-5b89-59e1-b016-84e28bfd966d"
32+
LinearSolve = "7ed4a6bd-45f5-4d41-b270-4a48e9bafcae"
33+
Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
34+
Enzyme = "7da242da-08ed-463a-9acd-ee780be4f1d9"
35+
JET = "c3a54625-cd67-489e-a8e7-0a5a0ff4e31b"
36+
StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
37+
ODEProblemLibrary = "fdc4e326-1af4-4b90-96e7-779fcce2daa5"
38+
SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f"
3039

3140
[compat]
32-
ADTypes = "1.11"
33-
Aqua = "0.8.11"
34-
ArrayInterface = "7.15.0"
35-
DiffEqBase = "6.169.1"
36-
DiffEqDevTools = "2.44.4"
37-
Enzyme = "0.13"
38-
FastBroadcast = "0.3.5"
41+
NonlinearSolve = "4"
3942
ForwardDiff = "0.10.36, 1"
40-
JET = "0.9.18, 0.10.4"
41-
LinearAlgebra = "<0.0.1, 1"
42-
LinearSolve = "3"
43-
MacroTools = "0.5.13"
43+
Test = "<0.0.1, 1"
44+
FastBroadcast = "0.3.5"
45+
Random = "<0.0.1, 1"
46+
DiffEqDevTools = "2.44.4"
4447
MuladdMacro = "0.2.4"
45-
NonlinearSolve = "4"
46-
ODEProblemLibrary = "0.1.8"
47-
OrdinaryDiffEqCore = "1.21"
48+
LinearSolve = "3"
49+
PrecompileTools = "1.2.1"
50+
LinearAlgebra = "<0.0.1, 1"
4851
OrdinaryDiffEqDifferentiation = "1.5"
49-
OrdinaryDiffEqNonlinearSolve = "1.6"
5052
OrdinaryDiffEqSDIRK = "1.3"
51-
PrecompileTools = "1.2.1"
53+
TruncatedStacktraces = "1.4.0"
54+
SciMLBase = "2"
55+
OrdinaryDiffEqCore = "1.21"
56+
Aqua = "0.8.11"
57+
ArrayInterface = "7.15.0"
58+
Enzyme = "0.13"
5259
Preferences = "1.4.3"
53-
Random = "<0.0.1, 1"
60+
MacroTools = "0.5.13"
61+
JET = "0.9.18, 0.10.4"
62+
StaticArrays = "1.9.7"
63+
julia = "1.10"
64+
ADTypes = "1.11"
5465
RecursiveArrayTools = "3.27.0"
66+
ODEProblemLibrary = "0.1.8"
67+
OrdinaryDiffEqNonlinearSolve = "1.6"
68+
DiffEqBase = "6.169.1"
5569
Reexport = "1.2.2"
5670
SafeTestsets = "0.1.0"
57-
StaticArrays = "1.9.7"
58-
Test = "<0.0.1, 1"
59-
TruncatedStacktraces = "1.4.0"
60-
julia = "1.10"
61-
62-
[extras]
63-
Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
64-
DiffEqDevTools = "f3b72e0c-5b89-59e1-b016-84e28bfd966d"
65-
Enzyme = "7da242da-08ed-463a-9acd-ee780be4f1d9"
66-
ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210"
67-
JET = "c3a54625-cd67-489e-a8e7-0a5a0ff4e31b"
68-
LinearSolve = "7ed4a6bd-45f5-4d41-b270-4a48e9bafcae"
69-
NonlinearSolve = "8913a72c-1f9b-4ce2-8d82-65094dcecaec"
70-
ODEProblemLibrary = "fdc4e326-1af4-4b90-96e7-779fcce2daa5"
71-
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
72-
SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f"
73-
StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
74-
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
7571

7672
[targets]
7773
test = ["DiffEqDevTools", "ForwardDiff", "Random", "SafeTestsets", "Test", "ODEProblemLibrary", "NonlinearSolve", "StaticArrays", "Enzyme", "LinearSolve", "JET", "Aqua"]
74+
75+
[sources.OrdinaryDiffEqSDIRK]
76+
path = "../OrdinaryDiffEqSDIRK"
77+
78+
[sources.OrdinaryDiffEqDifferentiation]
79+
path = "../OrdinaryDiffEqDifferentiation"
80+
81+
[sources.OrdinaryDiffEqNonlinearSolve]
82+
path = "../OrdinaryDiffEqNonlinearSolve"
83+
84+
[sources.OrdinaryDiffEqCore]
85+
path = "../OrdinaryDiffEqCore"

lib/OrdinaryDiffEqBDF/src/OrdinaryDiffEqBDF.jl

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,21 +24,25 @@ import OrdinaryDiffEqCore: alg_order, calculate_residuals!,
2424
_process_AD_choice
2525
using OrdinaryDiffEqSDIRK: ImplicitEulerConstantCache, ImplicitEulerCache
2626

27-
using TruncatedStacktraces, MuladdMacro, MacroTools, FastBroadcast, RecursiveArrayTools
27+
using TruncatedStacktraces: @truncate_stacktrace
28+
using MuladdMacro: @muladd
29+
using MacroTools: @capture
30+
using FastBroadcast: @..
31+
using RecursiveArrayTools: recursivefill!
2832
import StaticArrays: SArray, MVector, SVector, @SVector, StaticArray, MMatrix, SA
2933
using LinearAlgebra: mul!, I
30-
using ArrayInterface
34+
import ArrayInterface
35+
using ArrayInterface: ismutable
3136
import OrdinaryDiffEqCore
3237
using OrdinaryDiffEqDifferentiation: UJacobianWrapper
3338
using OrdinaryDiffEqNonlinearSolve: NLNewton, du_alias_or_new, build_nlsolver,
3439
nlsolve!, nlsolvefail, isnewton, markfirststage!,
3540
set_new_W!, DIRK, compute_step!, COEFFICIENT_MULTISTEP,
3641
NonlinearSolveAlg
37-
import ADTypes
3842
import ADTypes: AutoForwardDiff, AutoFiniteDiff, AbstractADType
3943

4044
using Reexport
41-
@reexport using DiffEqBase
45+
@reexport using SciMLBase
4246

4347
include("algorithms.jl")
4448
include("alg_utils.jl")

lib/OrdinaryDiffEqBDF/src/algorithms.jl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -444,7 +444,7 @@ function QNDF(; max_order::Val{MO} = Val{5}(), chunk_size = Val{0}(),
444444
extrapolant, kappa, controller, step_limiter!, AD_choice)
445445
end
446446

447-
TruncatedStacktraces.@truncate_stacktrace QNDF
447+
@truncate_stacktrace QNDF
448448

449449
@doc BDF_docstring("The second order Modified Extended BDF method,
450450
which has improved stability properties over the standard BDF.
@@ -549,7 +549,7 @@ function FBDF(; max_order::Val{MO} = Val{5}(), chunk_size = Val{0}(),
549549
controller, step_limiter!, AD_choice)
550550
end
551551

552-
TruncatedStacktraces.@truncate_stacktrace FBDF
552+
@truncate_stacktrace FBDF
553553

554554
"""
555555
QBDF1: Multistep Method
@@ -773,4 +773,4 @@ function DFBDF(; max_order::Val{MO} = Val{5}(), chunk_size = Val{0}(),
773773
controller, AD_choice)
774774
end
775775

776-
TruncatedStacktraces.@truncate_stacktrace DFBDF
776+
@truncate_stacktrace DFBDF

0 commit comments

Comments
 (0)