Skip to content

Commit ba781bc

Browse files
Merge branch 'master' into myb/nonSI
2 parents 88e7fe2 + 3fe0d7e commit ba781bc

File tree

130 files changed

+7735
-3095
lines changed

Some content is hidden

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

130 files changed

+7735
-3095
lines changed

.github/workflows/Downstream.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
- {user: SciML, repo: NeuralPDE.jl, group: NNPDE}
3333
- {user: SciML, repo: DataDrivenDiffEq.jl, group: Downstream}
3434
- {user: SciML, repo: StructuralIdentifiability.jl, group: All}
35-
- {user: SciML, repo: ModelingToolkitStandardLibrary.jl}
35+
- {user: SciML, repo: ModelingToolkitStandardLibrary.jl, group: Core}
3636
- {user: SciML, repo: ModelOrderReduction.jl, group: All}
3737
- {user: SciML, repo: MethodOfLines.jl, group: Interface}
3838
- {user: SciML, repo: MethodOfLines.jl, group: 2D_Diffusion}

.github/workflows/FormatCheck.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
name: "Format Check"
2+
3+
on:
4+
push:
5+
branches:
6+
- 'master'
7+
tags: '*'
8+
pull_request:
9+
10+
jobs:
11+
format-check:
12+
name: "Format Check"
13+
uses: "SciML/.github/.github/workflows/format-suggestions-on-pr.yml@v1"

.github/workflows/Invalidations.yml

Lines changed: 5 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
name: Invalidations
1+
name: "Invalidations"
22

33
on:
44
pull_request:
55
paths-ignore:
6-
- 'docs/**'
6+
- 'docs/**'
77

88
concurrency:
99
# Skip intermediate builds: always.
@@ -12,31 +12,6 @@ concurrency:
1212
cancel-in-progress: true
1313

1414
jobs:
15-
evaluate:
16-
# Only run on PRs to the default branch.
17-
# In the PR trigger above branches can be specified only explicitly whereas this check should work for master, main, or any other default branch
18-
if: github.base_ref == github.event.repository.default_branch
19-
runs-on: ubuntu-latest
20-
steps:
21-
- uses: julia-actions/setup-julia@v1
22-
with:
23-
version: '1'
24-
- uses: actions/checkout@v4
25-
- uses: julia-actions/julia-buildpkg@v1
26-
- uses: julia-actions/julia-invalidations@v1
27-
id: invs_pr
28-
29-
- uses: actions/checkout@v4
30-
with:
31-
ref: ${{ github.event.repository.default_branch }}
32-
- uses: julia-actions/julia-buildpkg@v1
33-
- uses: julia-actions/julia-invalidations@v1
34-
id: invs_default
35-
36-
- name: Report invalidation counts
37-
run: |
38-
echo "Invalidations on default branch: ${{ steps.invs_default.outputs.total }} (${{ steps.invs_default.outputs.deps }} via deps)" >> $GITHUB_STEP_SUMMARY
39-
echo "This branch: ${{ steps.invs_pr.outputs.total }} (${{ steps.invs_pr.outputs.deps }} via deps)" >> $GITHUB_STEP_SUMMARY
40-
- name: Check if the PR does increase number of invalidations
41-
if: steps.invs_pr.outputs.total > steps.invs_default.outputs.total
42-
run: exit 1
15+
evaluate-invalidations:
16+
name: "Evaluate Invalidations"
17+
uses: "SciML/.github/.github/workflows/invalidations.yml@v1"

.github/workflows/Tests.yml

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
name: "Tests"
2+
3+
on:
4+
pull_request:
5+
branches:
6+
- master
7+
- 'release-'
8+
paths-ignore:
9+
- 'docs/**'
10+
push:
11+
branches:
12+
- master
13+
paths-ignore:
14+
- 'docs/**'
15+
16+
concurrency:
17+
# Skip intermediate builds: always, but for the master branch.
18+
# Cancel intermediate builds: always, but for the master branch.
19+
group: ${{ github.workflow }}-${{ github.ref }}
20+
cancel-in-progress: ${{ github.ref != 'refs/heads/master' }}
21+
22+
jobs:
23+
tests:
24+
name: "Tests"
25+
strategy:
26+
fail-fast: false
27+
matrix:
28+
group:
29+
- InterfaceI
30+
- InterfaceII
31+
- Extensions
32+
- Downstream
33+
- RegressionI
34+
uses: "SciML/.github/.github/workflows/tests.yml@v1"
35+
with:
36+
group: "${{ matrix.group }}"
37+
secrets: "inherit"

.github/workflows/ci.yml

Lines changed: 0 additions & 91 deletions
This file was deleted.

Project.toml

Lines changed: 29 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,41 @@
11
name = "ModelingToolkit"
22
uuid = "961ee093-0014-501f-94e3-6117800e7a78"
33
authors = ["Yingbo Ma <[email protected]>", "Chris Rackauckas <[email protected]> and contributors"]
4-
version = "9.9.0"
4+
version = "9.33.1"
55

66
[deps]
77
AbstractTrees = "1520ce14-60c1-5f80-bbc7-55ef81b5835c"
88
ArrayInterface = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9"
9+
BlockArrays = "8e7c35d0-a365-5155-bbbb-fb81a777f24e"
910
Combinatorics = "861a8166-3701-5b0c-9a16-15d98fcdc6aa"
1011
Compat = "34da2185-b29b-5c13-b0c7-acf172513d20"
1112
ConstructionBase = "187b0558-2788-49d3-abe0-74a17ed4e7c9"
1213
DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
1314
DiffEqBase = "2b5f629d-d688-5b77-993f-72d75c75574e"
1415
DiffEqCallbacks = "459566f4-90b8-5000-8ac3-15dfb0a30def"
16+
DiffEqNoiseProcess = "77a26b50-5914-5dd7-bc55-306e6241c503"
1517
DiffRules = "b552c78f-8df3-52c6-915a-8e097449b14b"
1618
Distributed = "8ba89e20-285c-5b6f-9357-94700520ee1b"
1719
Distributions = "31c24e10-a181-5473-b8eb-7969acd0382f"
1820
DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
1921
DomainSets = "5b8099bc-c8ec-5219-889f-1d9e522a28bf"
2022
DynamicQuantities = "06fc5a27-2a28-4c7c-a15d-362465fb6821"
2123
ExprTools = "e2ba6199-217a-4e67-a87a-7c52f15ade04"
24+
Expronicon = "6b7a57c9-7cc1-4fdf-b7f5-e857abae3636"
2225
FindFirstFunctions = "64ca27bc-2ba2-4a57-88aa-44e436879224"
2326
ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210"
2427
FunctionWrappersWrappers = "77dc65aa-8811-40c2-897b-53d922fa7daf"
2528
Graphs = "86223c79-3864-5bf0-83f7-82e725a168b6"
2629
InteractiveUtils = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
2730
JuliaFormatter = "98e50ef6-434e-11e9-1051-2b60c6c9e899"
2831
JumpProcesses = "ccbc3e58-028d-4f4c-8cd5-9ae44345cda5"
29-
LabelledArrays = "2ee39098-c373-598a-b85f-a56591580800"
3032
Latexify = "23fbe1c1-3f47-55db-b15f-69d7ec21a316"
3133
Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
3234
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
3335
MLStyle = "d8e11817-5142-5d16-987a-aa16d5891078"
3436
NaNMath = "77ba4419-2d1f-58cd-9bb1-8ffee604a2e3"
35-
OrdinaryDiffEq = "1dea7af3-3e70-54e6-95c3-0bf5283fa5ed"
37+
NonlinearSolve = "8913a72c-1f9b-4ce2-8d82-65094dcecaec"
38+
OrderedCollections = "bac558e1-5e72-5ebc-8fee-abe8a469f55d"
3639
PrecompileTools = "aea7be01-6a6a-4083-8856-8a6e6704d82a"
3740
RecursiveArrayTools = "731186ca-8d62-57ce-b412-fbd966d074cd"
3841
Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
@@ -54,57 +57,69 @@ Unitful = "1986cc42-f94f-5a68-af5c-568840ba703d"
5457

5558
[weakdeps]
5659
BifurcationKit = "0f109fa4-8a5d-4b75-95aa-f515264e7665"
60+
ChainRulesCore = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4"
5761
DeepDiffs = "ab62b9b5-e342-54a8-a765-a90f495de1a6"
62+
LabelledArrays = "2ee39098-c373-598a-b85f-a56591580800"
5863

5964
[extensions]
6065
MTKBifurcationKitExt = "BifurcationKit"
66+
MTKChainRulesCoreExt = "ChainRulesCore"
6167
MTKDeepDiffsExt = "DeepDiffs"
68+
MTKLabelledArraysExt = "LabelledArrays"
6269

6370
[compat]
6471
AbstractTrees = "0.3, 0.4"
6572
ArrayInterface = "6, 7"
73+
BifurcationKit = "0.3"
74+
BlockArrays = "1.1"
75+
ChainRulesCore = "1"
6676
Combinatorics = "1"
6777
Compat = "3.42, 4"
6878
ConstructionBase = "1"
6979
DataStructures = "0.17, 0.18"
80+
DeepDiffs = "1"
7081
DiffEqBase = "6.103.0"
7182
DiffEqCallbacks = "2.16, 3"
83+
DiffEqNoiseProcess = "5"
7284
DiffRules = "0.1, 1.0"
7385
Distributed = "1"
7486
Distributions = "0.23, 0.24, 0.25"
7587
DocStringExtensions = "0.7, 0.8, 0.9"
7688
DomainSets = "0.6, 0.7"
7789
DynamicQuantities = "^0.11.2, 0.12, 0.13"
7890
ExprTools = "0.1.10"
91+
Expronicon = "0.8"
7992
FindFirstFunctions = "1"
8093
ForwardDiff = "0.10.3"
8194
FunctionWrappersWrappers = "0.1"
8295
Graphs = "1.5.2"
8396
InteractiveUtils = "1"
8497
JuliaFormatter = "1.0.47"
85-
JumpProcesses = "9.1"
98+
JumpProcesses = "9.13.1"
8699
LabelledArrays = "1.3"
87100
Latexify = "0.11, 0.12, 0.13, 0.14, 0.15, 0.16"
88101
Libdl = "1"
89102
LinearAlgebra = "1"
90103
MLStyle = "0.4.17"
91104
NaNMath = "0.3, 1"
92-
OrdinaryDiffEq = "6.73.0"
105+
NonlinearSolve = "3.14"
106+
OrderedCollections = "1"
107+
OrdinaryDiffEq = "6.82.0"
93108
PrecompileTools = "1"
94-
RecursiveArrayTools = "2.3, 3"
109+
RecursiveArrayTools = "3.26"
95110
Reexport = "0.2, 1"
96111
RuntimeGeneratedFunctions = "0.5.9"
97-
SciMLBase = "2.28.0"
112+
SciMLBase = "2.46"
98113
SciMLStructures = "1.0"
99114
Serialization = "1"
100115
Setfield = "0.7, 0.8, 1"
101116
SimpleNonlinearSolve = "0.1.0, 1"
102117
SparseArrays = "1"
103118
SpecialFunctions = "0.7, 0.8, 0.9, 0.10, 1.0, 2"
104119
StaticArrays = "0.10, 0.11, 0.12, 1.0"
105-
SymbolicIndexingInterface = "0.3.12"
106-
SymbolicUtils = "1.0"
107-
Symbolics = "5.26"
120+
SymbolicIndexingInterface = "0.3.28"
121+
SymbolicUtils = "3.2"
122+
Symbolics = "6"
108123
URIs = "1"
109124
UnPack = "0.1, 1.0"
110125
Unitful = "1.1"
@@ -119,11 +134,14 @@ DelayDiffEq = "bcd4f6db-9728-5f36-b5f7-82caef46ccdb"
119134
ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210"
120135
Ipopt = "b6b21f68-93f8-5de0-b562-5493be1d77c9"
121136
Ipopt_jll = "9cc047cb-c261-5740-88fc-0cf96f7bdcc7"
137+
JET = "c3a54625-cd67-489e-a8e7-0a5a0ff4e31b"
138+
LabelledArrays = "2ee39098-c373-598a-b85f-a56591580800"
122139
ModelingToolkitStandardLibrary = "16a59e39-deab-5bd0-87e4-056b12336739"
123140
NonlinearSolve = "8913a72c-1f9b-4ce2-8d82-65094dcecaec"
124141
Optimization = "7f7a1694-90dd-40f0-9382-eb1efda571ba"
125142
OptimizationMOI = "fd9f6733-72f4-499f-8506-86b2bdd0dea1"
126143
OptimizationOptimJL = "36348300-93cb-4f02-beb5-3c3902f8871e"
144+
OrdinaryDiffEq = "1dea7af3-3e70-54e6-95c3-0bf5283fa5ed"
127145
Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
128146
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
129147
ReferenceTests = "324d217c-45ce-50fc-942e-d289b448e8cf"
@@ -137,4 +155,4 @@ Sundials = "c3572dad-4567-51f8-b174-8c6c989267f4"
137155
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
138156

139157
[targets]
140-
test = ["AmplNLWriter", "BenchmarkTools", "ControlSystemsBase", "DelayDiffEq", "NonlinearSolve", "ForwardDiff", "Ipopt", "Ipopt_jll", "ModelingToolkitStandardLibrary", "Optimization", "OptimizationOptimJL", "OptimizationMOI", "Random", "ReferenceTests", "SafeTestsets", "StableRNGs", "Statistics", "SteadyStateDiffEq", "Test", "StochasticDiffEq", "Sundials", "StochasticDelayDiffEq", "Pkg"]
158+
test = ["AmplNLWriter", "BenchmarkTools", "ControlSystemsBase", "DelayDiffEq", "NonlinearSolve", "ForwardDiff", "Ipopt", "Ipopt_jll", "ModelingToolkitStandardLibrary", "Optimization", "OptimizationOptimJL", "OptimizationMOI", "OrdinaryDiffEq", "Random", "ReferenceTests", "SafeTestsets", "StableRNGs", "Statistics", "SteadyStateDiffEq", "Test", "StochasticDiffEq", "Sundials", "StochasticDelayDiffEq", "Pkg", "JET", "LabelledArrays"]

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,13 +83,13 @@ eqs = [D(x) ~ σ * (y - x),
8383
D(y) ~ x *- z) - y,
8484
D(z) ~ x * y - β * z]
8585

86-
@mtkbuild lorenz1 = ODESystem(eqs)
87-
@mtkbuild lorenz2 = ODESystem(eqs)
86+
@named lorenz1 = ODESystem(eqs, t)
87+
@named lorenz2 = ODESystem(eqs, t)
8888

8989
@variables a(t)
9090
@parameters γ
9191
connections = [0 ~ lorenz1.x + lorenz2.y + a * γ]
92-
@mtkbuild connected = ODESystem(connections, t, [a], [γ], systems = [lorenz1, lorenz2])
92+
@mtkbuild connected = ODESystem(connections, t, systems = [lorenz1, lorenz2])
9393

9494
u0 = [lorenz1.x => 1.0,
9595
lorenz1.y => 0.0,

docs/Project.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Distributions = "0.25"
2828
Documenter = "1"
2929
DynamicQuantities = "^0.11.2, 0.12"
3030
ModelingToolkit = "8.33, 9"
31-
NonlinearSolve = "0.3, 1, 2, 3"
31+
NonlinearSolve = "3"
3232
Optim = "1.7"
3333
Optimization = "3.9"
3434
OptimizationOptimJL = "0.1"
@@ -37,6 +37,6 @@ Plots = "1.36"
3737
SciMLStructures = "1.1"
3838
StochasticDiffEq = "6"
3939
SymbolicIndexingInterface = "0.3.1"
40-
SymbolicUtils = "1"
41-
Symbolics = "5"
40+
SymbolicUtils = "3"
41+
Symbolics = "6"
4242
Unitful = "1.12"

docs/make.jl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using Documenter, ModelingToolkit
2+
using ModelingToolkit: SciMLBase
23

34
# Make sure that plots don't throw a bunch of warnings / errors!
45
ENV["GKSwstype"] = "100"

docs/pages.jl

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,11 @@ pages = [
2828
"basics/Composition.md",
2929
"basics/Events.md",
3030
"basics/Linearization.md",
31-
"basics/MTKModel_Connector.md",
31+
"basics/InputOutput.md",
32+
"basics/MTKLanguage.md",
3233
"basics/Validation.md",
3334
"basics/DependencyGraphs.md",
35+
"basics/Precompilation.md",
3436
"basics/FAQ.md"],
3537
"System Types" => Any["systems/ODESystem.md",
3638
"systems/SDESystem.md",

0 commit comments

Comments
 (0)