VtMS: absorb .Plot submodule (cause PyPlot import is instant with sysimg)

Author: tfiers

nb/2022-09-15__Two-pass_conntest_ptp-then-cor.ipynb

@@ -22,8 +22,6 @@
 #
 # -
 
-using Revise
-
 using MyToolbox
 
 using VoltoMapSim
@@ -46,14 +44,15 @@ p = get_params(
 
 @time s = cached(sim, [p.sim]);
 
+# (To speed this up: SnoopCompile. Not now).
+
 s = augment(s, p);
 
-using PyPlot
 using VoltoMapSim.Plot
 
+using Pkg
+
 @time plotSTA(1=>1,s,p);
 # plotSTA(2=>2,s,p);
 # plotSTA(801=>801,s,p);
 # plotSTA(802=>802,s,p);
-
-

nb/2022-09-15__Two-pass_conntest_ptp-then-cor.jl

@@ -2,6 +2,7 @@ module VoltoMapSim
 
 using MyToolbox: @reexport
 @reexport using MyToolbox
+@reexport using Sciplotlib
 @reexport using Distributions  # Sample from lognormal, exponential, ….
 @reexport using DataFrames
 
@@ -32,29 +33,17 @@ export calc_STA, to_ISIs, to_spiketimes!, shuffle_ISIs, test_connection
 include("eval.jl")
 export evaluate_conntest_perf, cached_conntest_eval
 
+include("plot.jl")
+export color_exc, color_inh, color_unconn
+export plotsig, plotSTA
+export rasterplot, histplot_fr
+export plot_detection_rates, plot_samples_and_means, add_α_line, extract
+export ydistplot, add_refline
 
-function __init__()
-    set_print_precision(3)
-end
 
-
-"""
-Custom plotting functions are in this separate submodule, so that the heavy PyPlot does not
-need to be loaded when plotting is not needed.
-"""
-module Plot
-using ..VoltoMapSim
 function __init__()
-    @require PyPlot = "d330b81b-6aea-500a-939a-2ce795aea3ee" begin
-        include("plot.jl")
-        export color_exc, color_inh, color_unconn
-        export plotsig, plotSTA
-        export rasterplot, histplot_fr
-        export plot_detection_rates, plot_samples_and_means, add_α_line, extract
-        export ydistplot, add_refline
-    end
+    set_print_precision(3)
 end
-end # module Plot
 
 
 end # module VoltoMapSim

pkg/Sciplotlib

@@ -1,4 +1,3 @@
-@reexport using Sciplotlib
 
 
 const color_exc = C0

pkg/VoltoMapSim/src/VoltoMapSim.jl

@@ -4,5 +4,6 @@
 # Needs
 #    Pkg.add(url="https://github.com/xzackli/PyPlot.jl")
 
-using PyPlot
+import PyPlot  # `import` instead of `using`, so we do not import all the names.
+
 PyPlot.delay_init_until_cell[] = true