Use SimpleUnPack.jl instead of UnPack.jl

SciML · Sep 27, 2023 · e8504f5 · e8504f5
1 parent 1aa4806
commit e8504f5
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 10 deletions.
diff --git a/Project.toml b/Project.toml
@@ -40,14 +40,14 @@ SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462"
 Serialization = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
 Setfield = "efcf1570-3423-57d1-acb7-fd33fddbac46"
 SimpleNonlinearSolve = "727e6d20-b764-4bd8-a329-72de5adea6c7"
+SimpleUnPack = "ce78b400-467f-4804-87d8-8f486da07d0a"
 SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
 SpecialFunctions = "276daf66-3868-5448-9aa4-cd146d93841b"
 StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
 SymbolicIndexingInterface = "2efcf032-c050-4f8e-a9bb-153293bab1f5"
 SymbolicUtils = "d1185830-fcd6-423d-90d6-eec64667417b"
 Symbolics = "0c5d862f-8b57-4792-8d23-62f2024744c7"
 URIs = "5c2747f8-b7ea-4ff2-ba2e-563bfd36b1d4"
-UnPack = "3a884ed6-31ef-47d7-9d2a-63182c4928ed"
 Unitful = "1986cc42-f94f-5a68-af5c-568840ba703d"
 
 [weakdeps]
@@ -88,13 +88,13 @@ RuntimeGeneratedFunctions = "0.5.9"
 SciMLBase = "2.0.1"
 Setfield = "0.7, 0.8, 1"
 SimpleNonlinearSolve = "0.1.0"
+SimpleUnPack = "1.1"
 SpecialFunctions = "0.7, 0.8, 0.9, 0.10, 1.0, 2"
 StaticArrays = "0.10, 0.11, 0.12, 1.0"
 SymbolicIndexingInterface = "0.1, 0.2"
 SymbolicUtils = "1.0"
 Symbolics = "5.0"
 URIs = "1"
-UnPack = "0.1, 1.0"
 Unitful = "1.1"
 julia = "1.6"
 

diff --git a/src/ModelingToolkit.jl b/src/ModelingToolkit.jl
@@ -70,7 +70,7 @@ using PrecompileTools, Reexport
 
     import Graphs: SimpleDiGraph, add_edge!, incidence_matrix
 
-    @reexport using UnPack
+    @reexport using SimpleUnPack
 end
 RuntimeGeneratedFunctions.init(@__MODULE__)
 

diff --git a/src/bipartite_graph.jl b/src/bipartite_graph.jl
@@ -11,7 +11,7 @@ export 𝑠vertices, 𝑑vertices, has_𝑠vertex, has_𝑑vertex, 𝑠neighbors
     delete_srcs!, delete_dsts!
 
 using DocStringExtensions
-using UnPack
+using SimpleUnPack
 using SparseArrays
 using Graphs
 using Setfield

diff --git a/src/structural_transformation/StructuralTransformations.jl b/src/structural_transformation/StructuralTransformations.jl
@@ -1,7 +1,7 @@
 module StructuralTransformations
 
 using Setfield: @set!, @set
-using UnPack: @unpack
+using SimpleUnPack: @unpack
 
 using Symbolics: unwrap, linear_expansion
 using SymbolicUtils

diff --git a/src/systems/abstractsystem.jl b/src/systems/abstractsystem.jl
@@ -1800,10 +1800,6 @@ function compose(syss...; name = nameof(first(syss)))
 end
 Base.:(∘)(sys1::AbstractSystem, sys2::AbstractSystem) = compose(sys1, sys2)
 
-function UnPack.unpack(sys::ModelingToolkit.AbstractSystem, ::Val{p}) where {p}
-    getproperty(sys, p; namespace = false)
-end
-
 """
     missing_variable_defaults(sys::AbstractSystem, default = 0.0)
 

diff --git a/src/systems/systemstructure.jl b/src/systems/systemstructure.jl
@@ -14,7 +14,7 @@ import ..ModelingToolkit: isdiffeq, var_from_nested_derivative, vars!, flatten,
 using ..BipartiteGraphs
 import ..BipartiteGraphs: invview, complete
 using Graphs
-using UnPack
+using SimpleUnPack
 using Setfield
 using SparseArrays