Skip to content

Commit be9fd59

Browse files
Merge branch 'master' into patch-1
2 parents f82c0f8 + 9dc3119 commit be9fd59

Some content is hidden

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

57 files changed

+1816
-813
lines changed

.github/dependabot.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
2+
version: 2
3+
updates:
4+
- package-ecosystem: "github-actions"
5+
directory: "/" # Location of package manifests
6+
schedule:
7+
interval: "weekly"

.github/workflows/CI.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ jobs:
1919
- '1'
2020
- '1.6'
2121
steps:
22-
- uses: actions/checkout@v2
22+
- uses: actions/checkout@v4
2323
- uses: julia-actions/setup-julia@v1
2424
with:
2525
version: ${{ matrix.version }}
26-
- uses: actions/cache@v1
26+
- uses: actions/cache@v3
2727
env:
2828
cache-name: cache-artifacts
2929
with:
@@ -40,6 +40,6 @@ jobs:
4040
- uses: julia-actions/julia-processcoverage@v1
4141
with:
4242
directories: src, ext
43-
- uses: codecov/codecov-action@v1
43+
- uses: codecov/codecov-action@v3
4444
with:
4545
file: lcov.info

.github/workflows/Downstream.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,16 +37,18 @@ jobs:
3737
- {user: SciML, repo: StochasticDiffEq.jl, group: AlgConvergence}
3838
- {user: SciML, repo: Sundials.jl, group: All}
3939
- {user: SciML, repo: SteadyStateDiffEq.jl, group: All}
40+
- {user: SciML, repo: DifferentialEquations.jl, group: All}
41+
- {user: SciML, repo: ModelingToolkit.jl, group: All}
4042

4143
steps:
42-
- uses: actions/checkout@v2
44+
- uses: actions/checkout@v4
4345
- uses: julia-actions/setup-julia@v1
4446
with:
4547
version: ${{ matrix.julia-version }}
4648
arch: x64
4749
- uses: julia-actions/julia-buildpkg@latest
4850
- name: Clone Downstream
49-
uses: actions/checkout@v2
51+
uses: actions/checkout@v4
5052
with:
5153
repository: ${{ matrix.package.user }}/${{ matrix.package.repo }}
5254
path: downstream
@@ -68,6 +70,6 @@ jobs:
6870
exit(0) # Exit immediately, as a success
6971
end
7072
- uses: julia-actions/julia-processcoverage@v1
71-
- uses: codecov/codecov-action@v1
73+
- uses: codecov/codecov-action@v3
7274
with:
7375
file: lcov.info

.github/workflows/FormatCheck.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
with:
2222
version: ${{ matrix.julia-version }}
2323

24-
- uses: actions/checkout@v1
24+
- uses: actions/checkout@v4
2525
- name: Install JuliaFormatter and format
2626
# This will use the latest version by default but you can set the version like so:
2727
#

.github/workflows/Invalidations.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ jobs:
1919
- uses: julia-actions/setup-julia@v1
2020
with:
2121
version: '1'
22-
- uses: actions/checkout@v3
22+
- uses: actions/checkout@v4
2323
- uses: julia-actions/julia-buildpkg@v1
2424
- uses: julia-actions/julia-invalidations@v1
2525
id: invs_pr
2626

27-
- uses: actions/checkout@v3
27+
- uses: actions/checkout@v4
2828
with:
2929
ref: ${{ github.event.repository.default_branch }}
3030
- uses: julia-actions/julia-buildpkg@v1

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@
44
*.jl.*.mem
55
Manifest.toml
66
.DS_Store
7+
.vscode

Project.toml

Lines changed: 24 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,83 +1,93 @@
11
name = "DiffEqBase"
22
uuid = "2b5f629d-d688-5b77-993f-72d75c75574e"
33
authors = ["Chris Rackauckas <[email protected]>"]
4-
version = "6.115.3"
4+
version = "6.130.0"
55

66
[deps]
7-
ArrayInterfaceCore = "30b0a656-2188-435a-8636-2ec0e6a096e2"
7+
ArrayInterface = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9"
88
ChainRulesCore = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4"
99
DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
1010
Distributions = "31c24e10-a181-5473-b8eb-7969acd0382f"
1111
DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
12+
EnumX = "4e289a0a-7415-4d19-859d-a7e5c4648b56"
1213
FastBroadcast = "7034ab61-46d4-4ed7-9d0f-46aef9175898"
1314
ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210"
1415
FunctionWrappers = "069b7b12-0de2-55c6-9aab-29f3d0a68a2e"
1516
FunctionWrappersWrappers = "77dc65aa-8811-40c2-897b-53d922fa7daf"
1617
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
1718
Logging = "56ddb016-857b-54e1-b83d-db4d58db5568"
19+
Markdown = "d6f4376e-aef5-505a-96c1-9c027394607a"
1820
MuladdMacro = "46d2c3a1-f734-5fdb-9937-b9b9aeba4221"
1921
Parameters = "d96e819e-fc66-5662-9728-84c9c7592b0a"
2022
PreallocationTools = "d236fae5-4411-538c-8e31-a6e3d9e00b46"
23+
PrecompileTools = "aea7be01-6a6a-4083-8856-8a6e6704d82a"
2124
Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
2225
RecursiveArrayTools = "731186ca-8d62-57ce-b412-fbd966d074cd"
2326
Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
2427
Requires = "ae029012-a4dd-5104-9daa-d747884805df"
2528
SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462"
29+
SciMLOperators = "c0aeaf25-5076-4817-a8d5-81caf7dfa961"
2630
Setfield = "efcf1570-3423-57d1-acb7-fd33fddbac46"
2731
SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
2832
Static = "aedffcd0-7271-4cad-89d0-dc628f76c6d3"
29-
StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
33+
StaticArraysCore = "1e83bf80-4336-4d27-bf5d-d5a4f845583c"
3034
Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
3135
Tricks = "410a4b4d-49e4-4fbc-ab6d-cb71b17b3775"
36+
TruncatedStacktraces = "781d530d-4396-4725-bb49-402e4bee1e77"
3237
ZygoteRules = "700de1a5-db45-46bc-99cf-38207098b444"
3338

3439
[weakdeps]
3540
Distributions = "31c24e10-a181-5473-b8eb-7969acd0382f"
3641
GeneralizedGenerated = "6b9d7cbe-bcb9-11e9-073f-15a7a543e2eb"
37-
Measurements = "eff96d63-e80a-5855-80a2-b1b0885c5ab7"
3842
MPI = "da04e1cc-30fd-572f-bb4f-1f8673147195"
43+
Measurements = "eff96d63-e80a-5855-80a2-b1b0885c5ab7"
3944
MonteCarloMeasurements = "0987c9cc-fe09-11e8-30f0-b96dd679fdca"
4045
ReverseDiff = "37e2e3b7-166d-5795-8a7a-e32c996b4267"
4146
Tracker = "9f7883ad-71c0-57eb-9f7f-b5c9e6d3789c"
4247
Unitful = "1986cc42-f94f-5a68-af5c-568840ba703d"
4348
Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f"
4449

4550
[extensions]
46-
DiffEqBaseZygoteExt = "Zygote"
47-
DiffEqBaseReverseDiffExt = "ReverseDiff"
48-
DiffEqBaseTrackerExt = "Tracker"
4951
DiffEqBaseDistributionsExt = "Distributions"
52+
DiffEqBaseGeneralizedGeneratedExt = "GeneralizedGenerated"
53+
DiffEqBaseMPIExt = "MPI"
5054
DiffEqBaseMeasurementsExt = "Measurements"
5155
DiffEqBaseMonteCarloMeasurementsExt = "MonteCarloMeasurements"
52-
DiffEqBaseGeneralizedGeneratedExt = "GeneralizedGenerated"
56+
DiffEqBaseReverseDiffExt = "ReverseDiff"
57+
DiffEqBaseTrackerExt = "Tracker"
5358
DiffEqBaseUnitfulExt = "Unitful"
54-
DiffEqBaseMPIExt = "MPI"
59+
DiffEqBaseZygoteExt = "Zygote"
5560

5661
[compat]
57-
ArrayInterfaceCore = "0.1.26"
62+
ArrayInterface = "7"
5863
ChainRulesCore = "1"
5964
DataStructures = "0.18"
6065
Distributions = "0.25"
6166
DocStringExtensions = "0.9"
67+
EnumX = "1"
6268
FastBroadcast = "0.2"
6369
ForwardDiff = "0.10"
6470
FunctionWrappers = "1.0"
6571
FunctionWrappersWrappers = "0.1"
6672
MuladdMacro = "0.2.1"
6773
Parameters = "0.12.0"
6874
PreallocationTools = "0.4"
75+
PrecompileTools = "1"
6976
RecursiveArrayTools = "2"
7077
Reexport = "1.0"
7178
Requires = "1.0"
72-
SciMLBase = "1.84"
79+
SciMLBase = "1.93.3"
80+
SciMLOperators = "0.2, 0.3"
7381
Setfield = "0.8, 1"
7482
Static = "0.7, 0.8"
75-
StaticArrays = "1.0"
83+
StaticArraysCore = "1.4"
7684
Tricks = "0.1.6"
85+
TruncatedStacktraces = "1"
7786
ZygoteRules = "0.2"
7887
julia = "1.6"
7988

8089
[extras]
90+
Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
8191
Distributed = "8ba89e20-285c-5b6f-9357-94700520ee1b"
8292
Distributions = "31c24e10-a181-5473-b8eb-7969acd0382f"
8393
ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210"
@@ -91,11 +101,12 @@ Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
91101
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
92102
ReverseDiff = "37e2e3b7-166d-5795-8a7a-e32c996b4267"
93103
SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f"
104+
StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
94105
Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
95106
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
96107
Tracker = "9f7883ad-71c0-57eb-9f7f-b5c9e6d3789c"
97108
Unitful = "1986cc42-f94f-5a68-af5c-568840ba703d"
98109
Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f"
99110

100111
[targets]
101-
test = ["Distributed", "GeneralizedGenerated", "Measurements", "MonteCarloMeasurements", "Unitful", "LabelledArrays", "ForwardDiff", "InteractiveUtils", "Plots", "Pkg", "Random", "SafeTestsets", "Statistics", "Test", "Distributions"]
112+
test = ["Distributed", "GeneralizedGenerated", "Measurements", "MonteCarloMeasurements", "Unitful", "LabelledArrays", "ForwardDiff", "InteractiveUtils", "Plots", "Pkg", "Random", "StaticArrays", "SafeTestsets", "Statistics", "Test", "Distributions", "Aqua"]

ext/DiffEqBaseGeneralizedGeneratedExt.jl

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
module DiffEqBaseGeneralizedGeneratedExt
22

3-
using DiffEqBase
4-
isdefined(Base, :get_extension) ? (using GeneralizedGenerated) :
5-
(using ..GeneralizedGenerated)
3+
if isdefined(Base, :get_extension)
4+
using DiffEqBase
5+
using GeneralizedGenerated
6+
else
7+
using ..DiffEqBase
8+
using ..GeneralizedGenerated
9+
end
610

711
function SciMLBase.numargs(::GeneralizedGenerated.RuntimeFn{Args}) where {Args}
812
GeneralizedGenerated.from_type(Args) |> length

ext/DiffEqBaseMPIExt.jl

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,16 @@
11
module DiffEqBaseMPIExt
22

3-
import DiffEqBase
4-
isdefined(Base, :get_extension) ? (import MPI) : (import ..MPI)
3+
if isdefined(Base, :get_extension)
4+
using DiffEqBase
5+
import MPI
6+
else
7+
using ..DiffEqBase
8+
import ..MPI
9+
end
510

611
if isdefined(MPI, :AbstractMultiRequest)
712
function DiffEqBase.anyeltypedual(::Type{T},
8-
counter = 0) where {T <: MPI.AbstractMultiRequest}
13+
counter = 0) where {T <: MPI.AbstractMultiRequest}
914
Any
1015
end
1116
end

ext/DiffEqBaseMeasurementsExt.jl

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,17 @@
11
module DiffEqBaseMeasurementsExt
22

3-
using DiffEqBase
4-
import DiffEqBase: value
5-
isdefined(Base, :get_extension) ? (using Measurements) : (using ..Measurements)
3+
if isdefined(Base, :get_extension)
4+
using DiffEqBase
5+
import DiffEqBase: value
6+
using Measurements
7+
else
8+
using ..DiffEqBase
9+
import ..DiffEqBase: value
10+
using ..Measurements
11+
end
612

713
function DiffEqBase.promote_u0(u0::AbstractArray{<:Measurements.Measurement},
8-
p::AbstractArray{<:Measurements.Measurement}, t0)
14+
p::AbstractArray{<:Measurements.Measurement}, t0)
915
u0
1016
end
1117
DiffEqBase.promote_u0(u0, p::AbstractArray{<:Measurements.Measurement}, t0) = eltype(p).(u0)
@@ -16,16 +22,18 @@ value(x::Measurements.Measurement) = Measurements.value(x)
1622
@inline DiffEqBase.fastpow(x::Measurements.Measurement, y::Measurements.Measurement) = x^y
1723

1824
# Support adaptive steps should be errorless
19-
@inline function DiffEqBase.ODE_DEFAULT_NORM(u::AbstractArray{<:Measurements.Measurement, N
20-
},
21-
t) where {N}
25+
@inline function DiffEqBase.ODE_DEFAULT_NORM(u::AbstractArray{
26+
<:Measurements.Measurement,
27+
N,
28+
},
29+
t) where {N}
2230
sqrt(sum(x -> DiffEqBase.ODE_DEFAULT_NORM(x[1], x[2]),
23-
zip((value(x) for x in u), Iterators.repeated(t))) / length(u))
31+
zip((value(x) for x in u), Iterators.repeated(t))) / length(u))
2432
end
2533
@inline function DiffEqBase.ODE_DEFAULT_NORM(u::Array{<:Measurements.Measurement, N},
26-
t) where {N}
34+
t) where {N}
2735
sqrt(sum(x -> DiffEqBase.ODE_DEFAULT_NORM(x[1], x[2]),
28-
zip((value(x) for x in u), Iterators.repeated(t))) / length(u))
36+
zip((value(x) for x in u), Iterators.repeated(t))) / length(u))
2937
end
3038
@inline function DiffEqBase.ODE_DEFAULT_NORM(u::Measurements.Measurement, t)
3139
abs(Measurements.value(u))

0 commit comments

Comments
 (0)