Merge pull request #2985 from SebastianM-C/smc/la_ext

make LabelledArrays an extension

Author: ChrisRackauckas

Project.toml

@@ -29,7 +29,6 @@ Graphs = "86223c79-3864-5bf0-83f7-82e725a168b6"
 InteractiveUtils = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
 JuliaFormatter = "98e50ef6-434e-11e9-1051-2b60c6c9e899"
 JumpProcesses = "ccbc3e58-028d-4f4c-8cd5-9ae44345cda5"
-LabelledArrays = "2ee39098-c373-598a-b85f-a56591580800"
 Latexify = "23fbe1c1-3f47-55db-b15f-69d7ec21a316"
 Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
@@ -60,11 +59,13 @@ Unitful = "1986cc42-f94f-5a68-af5c-568840ba703d"
 BifurcationKit = "0f109fa4-8a5d-4b75-95aa-f515264e7665"
 ChainRulesCore = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4"
 DeepDiffs = "ab62b9b5-e342-54a8-a765-a90f495de1a6"
+LabelledArrays = "2ee39098-c373-598a-b85f-a56591580800"
 
 [extensions]
 MTKBifurcationKitExt = "BifurcationKit"
 MTKChainRulesCoreExt = "ChainRulesCore"
 MTKDeepDiffsExt = "DeepDiffs"
+MTKLabelledArraysExt = "LabelledArrays"
 
 [compat]
 AbstractTrees = "0.3, 0.4"
@@ -134,6 +135,7 @@ ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210"
 Ipopt = "b6b21f68-93f8-5de0-b562-5493be1d77c9"
 Ipopt_jll = "9cc047cb-c261-5740-88fc-0cf96f7bdcc7"
 JET = "c3a54625-cd67-489e-a8e7-0a5a0ff4e31b"
+LabelledArrays = "2ee39098-c373-598a-b85f-a56591580800"
 ModelingToolkitStandardLibrary = "16a59e39-deab-5bd0-87e4-056b12336739"
 NonlinearSolve = "8913a72c-1f9b-4ce2-8d82-65094dcecaec"
 Optimization = "7f7a1694-90dd-40f0-9382-eb1efda571ba"
@@ -153,4 +155,4 @@ Sundials = "c3572dad-4567-51f8-b174-8c6c989267f4"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [targets]
-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"]
+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"]

ext/MTKLabelledArraysExt.jl

@@ -0,0 +1,18 @@
+module MTKLabelledArraysExt
+
+using ModelingToolkit, LabelledArrays
+
+function ModelingToolkit.define_vars(u::Union{SLArray, LArray}, t)
+    [_defvar(x)(t) for x in LabelledArrays.symnames(typeof(u))]
+end
+
+function ModelingToolkit.define_params(p::Union{SLArray, LArray}, names = nothing)
+    if names === nothing
+        [toparam(variable(x)) for x in LabelledArrays.symnames(typeof(p))]
+    else
+        varnames_length_check(p, names)
+        [toparam(variable(names[i])) for i in eachindex(p)]
+    end
+end
+
+end

src/ModelingToolkit.jl

@@ -25,7 +25,7 @@ import OrderedCollections
 using DiffEqNoiseProcess: DiffEqNoiseProcess, WienerProcess
 
 using SymbolicIndexingInterface
-using LinearAlgebra, SparseArrays, LabelledArrays
+using LinearAlgebra, SparseArrays
 using InteractiveUtils
 using JumpProcesses
 using DataStructures

src/systems/diffeqs/modelingtoolkitize.jl

@@ -109,10 +109,6 @@ function define_vars(u, t)
     [_defvaridx(:x, i)(t) for i in eachindex(u)]
 end
 
-function define_vars(u::Union{SLArray, LArray}, t)
-    [_defvar(x)(t) for x in LabelledArrays.symnames(typeof(u))]
-end
-
 function define_vars(u::NTuple{<:Number}, t)
     tuple((_defvaridx(:x, i)(ModelingToolkit.value(t)) for i in eachindex(u))...)
 end
@@ -184,15 +180,6 @@ function define_params(p::AbstractDict, names = nothing)
     end
 end
 
-function define_params(p::Union{SLArray, LArray}, names = nothing)
-    if names === nothing
-        [toparam(variable(x)) for x in LabelledArrays.symnames(typeof(p))]
-    else
-        varnames_length_check(p, names)
-        [toparam(variable(names[i])) for i in eachindex(p)]
-    end
-end
-
 function define_params(p::Tuple, names = nothing)
     if names === nothing
         tuple((toparam(variable(:α, i)) for i in eachindex(p))...)