Merge pull request #243 from JuliaDynamics/hw/workshop

updates for workshop

Author: hexaeder

NetworkDynamicsInspector/Project.toml

@@ -23,7 +23,7 @@ Electron = "a1bb12fb-d4d1-54b4-b10a-ee7951ef7ad3"
 NetworkDynamics = {path = ".."}
 
 [extensions]
-ElectronExt = ["Electron"]
+NetworkDynamicsInspectorElectronExt = ["Electron"]
 
 [compat]
 Bonito = "4.0.0"

NetworkDynamicsInspector/assets/app.css

@@ -20,6 +20,7 @@ span {
 .maingrid {
     display: grid;
     grid-template-columns: min-content auto;
+    align-items: start; /* make sure ts col is as short as possible for resize event */
     width: 100%;
     gap: 0px;
 }

NetworkDynamicsInspector/ext/ElectronExt.jl renamed to NetworkDynamicsInspector/ext/NetworkDynamicsInspectorElectronExt.jl

@@ -1,4 +1,4 @@
-module ElectronExt
+module NetworkDynamicsInspectorElectronExt
 
 using NetworkDynamicsInspector: NetworkDynamicsInspector as NDI
 using Electron: Electron, windows

NetworkDynamicsInspector/src/NetworkDynamicsInspector.jl

@@ -7,7 +7,7 @@ using NetworkDynamics: NetworkDynamics, SII, EIndex, VIndex, Network,
                        obssym, psym, sym, extract_nw
 
 using Graphs: nv, ne
-using WGLMakie: WGLMakie
+using WGLMakie: WGLMakie, WithConfig
 using WGLMakie.Makie: Makie, @lift, MouseEvent, Point2f, with_theme,
                       lines!, vlines!, Theme, Figure, Colorbar, Axis,
                       xlims!, ylims!, autolimits!, hidespines!, hidedecorations!,
@@ -65,7 +65,6 @@ function get_webapp(app)
             @info "GUI Session updated"
         end
 
-        WGLMakie.activate!(resize_to=:parent)
         clear_obs!(app)
 
         resize_gp = js"""

NetworkDynamicsInspector/src/graphplot.jl

@@ -220,7 +220,7 @@ function graphplot_card(app, session)
     <li><strong>Ctrl + Click</strong> resets axis after zoom</li>
     </ul>
     """)
-    Card([fig, help]; class="bonito-card graphplot-card")
+    Card([WithConfig(fig; resize_to=:parent), help]; class="bonito-card graphplot-card")
 end
 function _gracefully_extract_states!(vec, sol, t, idxs, rel)
     isvalid(s) = SII.is_variable(sol, s) || SII.is_parameter(sol, s) || SII.is_observed(sol, s)
@@ -379,7 +379,7 @@ function gpstate_control_card(app, type)
 
     childs = Any[DOM.div(
         selector,
-        DOM.div(fig; style=Styles("height" => "40px")),
+        DOM.div(WithConfig(fig; resize_to=:parent); style=Styles("height" => "40px")),
         # fig,
         # RoundedLabel(@lift $maxrange[1]; style=Styles("text-align"=>"right")),
         cslider,

NetworkDynamicsInspector/src/timeseries.jl

@@ -444,7 +444,7 @@ function timeseries_card(app, key, session)
     card = Card(
         [DOM.div(
             comp_state_sel_dom,
-            DOM.div(fig; class="timeseries-axis-container"),
+            DOM.div(WithConfig(fig; resize_to=:parent); class="timeseries-axis-container"),
             closebutton(app, key);
             class="timeseries-card-container"
         ), help];

src/aggregators.jl

@@ -27,7 +27,7 @@ end
 NaiveAggregator(f) = (im, batches) -> NaiveAggregator(im, batches, f)
 
 function aggregate!(a::NaiveAggregator, aggbuf, data)
-    fill!(aggbuf, zero(eltype(aggbuf)))
+    fill!(aggbuf, _appropriate_zero(aggbuf))
     _aggregate!(a, a.batches, aggbuf, data)
 end
 function _aggregate!(a::NaiveAggregator, batches, aggbuf, data)
@@ -101,7 +101,7 @@ KAAggregator(im, batches, f) = KAAggregator(f, AggregationMap(im, batches))
 
 function aggregate!(a::KAAggregator, aggbuf, data)
     am = a.m
-    fill!(aggbuf, zero(eltype(aggbuf)))
+    fill!(aggbuf, _appropriate_zero(aggbuf))
     _backend = get_backend(data)
     # kernel = agg_kernel!(_backend, 1024, length(am.map))
     # kernel(a.f, aggbuf, view(data, am.range), am.map)
@@ -140,7 +140,7 @@ SequentialAggregator(f) = (im, batches) -> SequentialAggregator(im, batches, f)
 SequentialAggregator(im, batches, f) = SequentialAggregator(f, AggregationMap(im, batches))
 
 function aggregate!(a::SequentialAggregator, aggbuf, data)
-    fill!(aggbuf, zero(eltype(aggbuf)))
+    fill!(aggbuf, _appropriate_zero(aggbuf))
 
     am = a.m
     @inbounds begin
@@ -169,7 +169,7 @@ PolyesterAggregator(im, batches, f) = PolyesterAggregator(f, _inv_aggregation_ma
 
 function aggregate!(a::PolyesterAggregator, aggbuf, data)
     length(a.m) == length(aggbuf) || throw(DimensionMismatch("length of aggbuf and a.m must be equal"))
-    fill!(aggbuf, zero(eltype(aggbuf)))
+    fill!(aggbuf, _appropriate_zero(aggbuf))
 
     maxdepth = mapreduce(x -> length(x[2]), max, a.m)
 
@@ -196,7 +196,7 @@ ThreadedAggregator(im, batches, f) = ThreadedAggregator(f, _inv_aggregation_map(
 
 function aggregate!(a::ThreadedAggregator, aggbuf, data)
     length(a.m) == length(aggbuf) || throw(DimensionMismatch("length of aggbuf and a.m must be equal"))
-    fill!(aggbuf, zero(eltype(aggbuf)))
+    fill!(aggbuf, _appropriate_zero(aggbuf))
 
     Threads.@threads for (dstidx, srcidxs) in a.m
        @inbounds for srcidx in srcidxs
@@ -299,3 +299,11 @@ get_aggr_constructor(a::SparseAggregator) = SparseAggregator(+)
 
 iscudacompatible(::Type{<:KAAggregator}) = true
 iscudacompatible(::Type{<:SparseAggregator}) = true
+
+function _appropriate_zero(x)
+    if isconcretetype(eltype(x))
+        zero(eltype(x))
+    else
+        0.0 # hopefully that casts to what is needed
+    end
+end

src/metadata.jl

@@ -393,7 +393,7 @@ Sets the callback function for the component. Overwrites any existing callback.
 See also [`add_callback!`](@ref).
 """
 function set_callback!(c::ComponentModel, cb; check=true)
-    if !(cb isa ComponentCallback) && !(cb isa NTuple{N, <:ComponentCallback} where N)
+    if !(cb isa ComponentCallback) && !(cb isa Tuple && all(c -> c isa ComponentCallback, cb))
         throw(ArgumentError("Callback must be a ComponentCallback or a tuple of ComponentCallbacks, got $(typeof(cb))."))
     end
     check && assert_cb_compat(c, cb)

src/symbolicindexing.jl

@@ -555,10 +555,11 @@ function _get_observed_f(im::IndexManager, cf::VertexModel, vidx, _obsf::O) wher
     aggr = im.v_aggr[vidx]
     extr = im.v_out[vidx]
     pr   = im.v_para[vidx]
-    ret = Vector{Float64}(undef, N)
+    retcache = DiffCache(Vector{Float64}(undef, N))
     _hasext = has_external_input(cf)
 
     (u, outbuf, aggbuf, extbuf, p, t) -> begin
+        ret = PreallocationTools.get_tmp(retcache, first(u)*first(p)*first(t))
         ins = if _hasext
             (view(aggbuf, aggr), view(extbuf, extr))
         else

test/aggregators_test.jl

@@ -6,6 +6,8 @@ using Chairmarks
 using InteractiveUtils
 using Test
 using StableRNGs
+using ForwardDiff: Dual
+using Symbolics
 
 (isinteractive() && @__MODULE__()==Main ? includet : include)("ComponentLibrary.jl")
 
@@ -61,3 +63,14 @@ using StableRNGs
         @test issame
     end
 end
+
+@testset "Test _appropriate_zero" begin
+    @test NetworkDynamics._appropriate_zero([1,2,3]) isa Int
+    @test NetworkDynamics._appropriate_zero([1,2,3]) == 0
+    @test NetworkDynamics._appropriate_zero([1.0,2,3]) isa Float64
+    @test NetworkDynamics._appropriate_zero([1.0,2,3]) == 0.0
+    @test NetworkDynamics._appropriate_zero([Dual(1.0), 2, 3]) == Dual(0.0)
+    @variables x, y, z
+    @test NetworkDynamics._appropriate_zero([x,y,z]) isa Num
+    @test NetworkDynamics._appropriate_zero(Any[x,y,z]) isa Float64
+end