Skip to content

Commit cc03e30

Browse files
fix: reference Symbolics-owned names through Symbolics in tests
SciML#4989 trimmed `hessian_sparsity`, `MultithreadedForm`, `SerialForm`, `CTarget` and `derivative` from ModelingToolkitBase's Symbolics import list, as ExplicitImports reported them unused in `src`. They were still reached as `ModelingToolkitBase.<name>` from tests, and none is exported by Symbolics, so the re-export does not cover them. That broke InterfaceII and Extended. Reference them through Symbolics, which owns them. Co-Authored-By: Chris Rackauckas <accounts@chrisrackauckas.com>
1 parent 1162b87 commit cc03e30

4 files changed

Lines changed: 10 additions & 8 deletions

File tree

lib/ModelingToolkitBase/test/bigsystem.jl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ f(du, u, nothing, 0.0)
5757
multithreadedf = eval(
5858
ModelingToolkitBase.build_function(
5959
du, u, fillzeros = true,
60-
parallel = ModelingToolkitBase.MultithreadedForm()
60+
parallel = Symbolics.MultithreadedForm()
6161
)[2]
6262
)
6363

@@ -76,8 +76,8 @@ end
7676

7777
#=
7878
jac = sparse(ModelingToolkit.jacobian(vec(du),vec(u)))
79-
fjac = eval(ModelingToolkit.build_function(jac,u,parallel=ModelingToolkit.SerialForm())[2])
80-
multithreadedfjac = eval(ModelingToolkit.build_function(jac,u,parallel=ModelingToolkit.MultithreadedForm())[2])
79+
fjac = eval(ModelingToolkit.build_function(jac,u,parallel=Symbolics.SerialForm())[2])
80+
multithreadedfjac = eval(ModelingToolkit.build_function(jac,u,parallel=Symbolics.MultithreadedForm())[2])
8181
8282
u = rand(N,N,3)
8383
J = similar(jac,Float64)
@@ -96,7 +96,7 @@ maximum(J2 .- Array(J)) < 1e-5
9696
jac = ModelingToolkitBase.sparsejacobian(vec(du), vec(u))
9797
serialjac = eval(ModelingToolkitBase.build_function(vec(jac), u)[2])
9898
#multithreadedjac = eval(ModelingToolkit.build_function(vec(jac), u,
99-
# parallel = ModelingToolkit.MultithreadedForm())[2])
99+
# parallel = Symbolics.MultithreadedForm())[2])
100100

101101
MyA = zeros(N, N)
102102
AMx = zeros(N, N)

lib/ModelingToolkitBase/test/ccompile.jl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using ModelingToolkitBase, Test
2+
using Symbolics: CTarget
23
using ModelingToolkitBase: t_nounits as t, D_nounits as D
34

45
@parameters a
@@ -9,7 +10,7 @@ eqs = [
910
]
1011
f = build_function(
1112
[x.rhs for x in eqs], [x, y], [a], t, expression = Val{false},
12-
target = ModelingToolkitBase.CTarget()
13+
target = CTarget()
1314
)
1415
f2 = eval(build_function([x.rhs for x in eqs], [x, y], [a], t)[2])
1516
du = rand(2);

lib/ModelingToolkitBase/test/nonlinearsystem.jl

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using ModelingToolkitBase, StaticArrays, LinearAlgebra
2+
using Symbolics: hessian_sparsity
23
using DiffEqBase, SparseArrays
34
using Test
45
using NonlinearSolve
@@ -92,9 +93,9 @@ jac = calculate_jacobian(ns)
9293
jac = generate_jacobian(ns)
9394

9495
sH = calculate_hessian(ns)
95-
@test getfield.(ModelingToolkitBase.hessian_sparsity(ns), :colptr) ==
96+
@test getfield.(hessian_sparsity(ns), :colptr) ==
9697
getfield.(sparse.(sH), :colptr)
97-
@test getfield.(ModelingToolkitBase.hessian_sparsity(ns), :rowval) ==
98+
@test getfield.(hessian_sparsity(ns), :rowval) ==
9899
getfield.(sparse.(sH), :rowval)
99100

100101
prob = NonlinearProblem(ns, [x => 1.0, y => 1.0, z => 1.0, σ => 1.0, ρ => 1.0, β => 1.0])

test/reduction.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ sys = mtkcompile(sys0)
267267
eq = equations(tearing_substitution(sys))[1]
268268
vv = only(unknowns(sys))
269269
@test isequal(eq.lhs, D(vv))
270-
dvv = ModelingToolkit.value(ModelingToolkit.derivative(eq.rhs, vv))
270+
dvv = ModelingToolkit.value(Symbolics.derivative(eq.rhs, vv))
271271
@test dvv -60
272272

273273
# Don't reduce inputs

0 commit comments

Comments
 (0)