Skip to content

refactor: do not use internal API in several places #1318

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
+7 −4
Open

refactor: do not use internal API in several places #1318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
233dbca
build: add SymbolicIndexingInterface dependency
AayushSabharwal Aug 11, 2025
f80b053
refactor: do not use Symbolics/SymbolicUtils internals to detect arra…
AayushSabharwal Aug 11, 2025
4a26422
refactor: import BasicSymbolic from SymbolicUtils instead of Symbolics
AayushSabharwal Aug 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ RuntimeGeneratedFunctions = "7e49a35a-f44a-4d26-94aa-eba1b4ca6b47"
SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462"
Setfield = "efcf1570-3423-57d1-acb7-fd33fddbac46"
SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
SymbolicIndexingInterface = "2efcf032-c050-4f8e-a9bb-153293bab1f5"
SymbolicUtils = "d1185830-fcd6-423d-90d6-eec64667417b"
Symbolics = "0c5d862f-8b57-4792-8d23-62f2024744c7"
Unitful = "1986cc42-f94f-5a68-af5c-568840ba703d"
Expand Down Expand Up @@ -71,6 +72,7 @@ RuntimeGeneratedFunctions = "0.5.12"
SciMLBase = "2.84"
Setfield = "1"
StructuralIdentifiability = "0.5.11"
SymbolicIndexingInterface = "0.3.42"
SymbolicUtils = "3.20"
Symbolics = "6.31.1"
Unitful = "1.12.4"
Expand Down
4 changes: 2 additions & 2 deletions src/Catalyst.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ using LinearAlgebra
using RuntimeGeneratedFunctions
RuntimeGeneratedFunctions.init(@__MODULE__)

import Symbolics: BasicSymbolic
using Symbolics: iscall, sorted_arguments
using ModelingToolkit: Symbolic, value, get_unknowns, get_ps, get_iv, get_systems,
get_eqs, get_defaults, toparam, get_var_to_name, get_observed,
Expand All @@ -47,7 +46,8 @@ import DataStructures: OrderedDict, OrderedSet
import Parameters: @with_kw_noshow
import Symbolics: occursin, wrap
import Symbolics.RewriteHelpers: hasnode, replacenode
import SymbolicUtils: getmetadata, hasmetadata, setmetadata
import SymbolicUtils: BasicSymbolic, getmetadata, hasmetadata, setmetadata
import SymbolicIndexingInterface as SII

# globals for the modulate
function default_time_deriv()
Expand Down
5 changes: 3 additions & 2 deletions src/spatial_reaction_systems/lattice_reaction_systems.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,9 +154,10 @@ struct LatticeReactionSystem{Q, R, S, T} <: MT.AbstractTimeDependentSystem
spatial_reactions)

# Additional error checks.
if any(haskey(Symbolics.unwrap(symvar).metadata, Symbolics.ArrayShapeCtx)
if any(SII.symbolic_type(symvar) === SII.ArraySymbolic()
for symvar in [ps; species(rs)])
throw(ArgumentError("Some species and/or parameters used to create the `LatticeReactionSystem` are array variables ($(filter(symvar -> haskey(Symbolics.unwrap(symvar).metadata, Symbolics.ArrayShapeCtx), [ps; species(rs)]))). This is currently not supported."))
arrvars = filter(x -> SII.symbolic_type(x) === SII.ArraySymbolic(), [ps; species(rs)])
throw(ArgumentError("Some species and/or parameters used to create the `LatticeReactionSystem` are array variables ($(arrvars). This is currently not supported."))
end

return new{Q, R, S, T}(
Expand Down
Loading