Skip to content

Commit b3f3bd1

Browse files
update to reusable closures and fix tests
1 parent 7072cfc commit b3f3bd1

File tree

3 files changed

+11
-14
lines changed

3 files changed

+11
-14
lines changed

src/build_function.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ function _build_function(target::JuliaTarget, rhss, args...;
210210
build_expr(:vect, [conv(rhs) for rhs rhss_flat[((numworks-1)*lens+1):end]]))
211211

212212
spawn_exprs = [quote
213-
$(spawnvars[i]) = Distributed.@spawnat $(i+1) begin
213+
$(spawnvars[i]) = ModelingToolkit.Distributed.remotecall($(i+1)) do
214214
$(spawnvectors[i])
215215
end
216216
end for i in 1:numworks]

test/bigsystem.jl

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,15 @@ serialjac = eval(ModelingToolkit.build_function(vec(jac),u)[2])
5959
multithreadedjac = eval(ModelingToolkit.build_function(vec(jac),u,parallel=ModelingToolkit.MultithreadedForm())[2])
6060
distributedjac = eval(ModelingToolkit.build_function(vec(jac),u,parallel=ModelingToolkit.DistributedForm())[2])
6161

62-
#=
6362
MyA = zeros(N,N)
6463
AMx = zeros(N,N)
6564
DA = zeros(N,N)
65+
66+
f(_du,_u,nothing,0.0)
67+
multithreadedf(_du,_u)
68+
distributedf(_du,_u)
69+
70+
#=
6671
using BenchmarkTools
6772
@btime f(_du,_u,nothing,0.0)
6873
@btime multithreadedf(_du,_u)

test/latexify.jl

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ eqs = [D(x) ~ σ*(y-x)*D(x-y)/D(z),
3030
raw"\begin{align}
3131
\frac{dx(t)}{dt} =& \frac{\sigma \left( \mathrm{y}\left( t \right) - \mathrm{x}\left( t \right) \right) \frac{d\left(\mathrm{x}\left( t \right) - \mathrm{y}\left( t \right)\right)}{dt}}{\frac{dz(t)}{dt}} \\
3232
0 =& \frac{\sigma \mathrm{x}\left( t \right) \left( \rho - \mathrm{z}\left( t \right) \right)}{10} - \mathrm{y}\left( t \right) \\
33-
\frac{dz(t)}{dt} =& \mathrm{x}\left( t \right) \left( \mathrm{y}\left( t \right) \right)^{\frac{2}{3}} - \beta \mathrm{z}\left( t \right)
33+
\frac{dz(t)}{dt} =& \mathrm{x}\left( t \right) \mathrm{y}\left( t \right)^{\frac{2}{3}} - \beta \mathrm{z}\left( t \right)
3434
\end{align}
3535
"
3636

@@ -46,7 +46,7 @@ eqs = [D(u[1]) ~ p[3]*(u[2]-u[1]),
4646
raw"\begin{align}
4747
\frac{du_1(t)}{dt} =& p_3 \left( \mathrm{u_2}\left( t \right) - \mathrm{u_1}\left( t \right) \right) \\
4848
0 =& \frac{p_2 p_3 \mathrm{u_1}\left( t \right) \left( p_1 - \mathrm{u_1}\left( t \right) \right)}{10} - \mathrm{u_2}\left( t \right) \\
49-
\frac{du_3(t)}{dt} =& \mathrm{u_1}\left( t \right) \left( \mathrm{u_2}\left( t \right) \right)^{\frac{2}{3}} - p_3 \mathrm{u_3}\left( t \right)
49+
\frac{du_3(t)}{dt} =& \mathrm{u_1}\left( t \right) \mathrm{u_2}\left( t \right)^{\frac{2}{3}} - p_3 \mathrm{u_3}\left( t \right)
5050
\end{align}
5151
"
5252

@@ -56,18 +56,10 @@ eqs = [D(u[1]) ~ p[3]*(u[2]-u[1]),
5656

5757
sys = ODESystem(eqs)
5858

59-
@test latexify(sys.eqs) ==
59+
@test latexify(eqs) ==
6060
raw"\begin{align}
6161
\frac{du_1(t)}{dt} =& p_3 \left( \mathrm{u_2}\left( t \right) - \mathrm{u_1}\left( t \right) \right) \\
6262
\frac{du_2(t)}{dt} =& \frac{p_2 p_3 \mathrm{u_1}\left( t \right) \left( p_1 - \mathrm{u_1}\left( t \right) \right)}{10} - \mathrm{u_2}\left( t \right) \\
63-
\frac{du_3(t)}{dt} =& \mathrm{u_1}\left( t \right) \left( \mathrm{u_2}\left( t \right) \right)^{\frac{2}{3}} - p_3 \mathrm{u_3}\left( t \right)
63+
\frac{du_3(t)}{dt} =& \mathrm{u_1}\left( t \right) \mathrm{u_2}\left( t \right)^{\frac{2}{3}} - p_3 \mathrm{u_3}\left( t \right)
6464
\end{align}
6565
"
66-
67-
@test latexify(sys) ==
68-
raw"$\begin{align}
69-
\frac{du_1(t)}{dt} =& p_3 \left( \mathrm{u_2}\left( t \right) - \mathrm{u_1}\left( t \right) \right) \\
70-
\frac{du_2(t)}{dt} =& \frac{p_2 p_3 \mathrm{u_1}\left( t \right) \left( p_1 - \mathrm{u_1}\left( t \right) \right)}{10} - \mathrm{u_2}\left( t \right) \\
71-
\frac{du_3(t)}{dt} =& \mathrm{u_1}\left( t \right) \left( \mathrm{u_2}\left( t \right) \right)^{\frac{2}{3}} - p_3 \mathrm{u_3}\left( t \right)
72-
\end{align}
73-
$"

0 commit comments

Comments
 (0)