Merge pull request #145 from SpiNNakerManchester/check_binaries_called

Check binaries called

Author: Christian-B

examples/extra_models_examples/vogels_2011.py

@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 import os
+from typing import Optional
 import pyNN.spiNNaker as sim
 import numpy
 import matplotlib.pyplot as pylab
@@ -41,6 +42,12 @@ class Vogels2011(object):
     To reproduce the experiment from their paper
     """
 
+    def __init__(self, split: bool = False):
+        if split:
+            self._n_synapse_cores: Optional[int] = 1
+        else:
+            self._n_synapse_cores = None
+
     # Population parameters
     MODEL = sim.IF_curr_exp
     CELL_PARAMETERS = {
@@ -119,7 +126,8 @@ def _build_network(self, uses_stdp, slow_down):
         # Create excitatory and inhibitory populations of neurons
         ex_pop = sim.Population(
             self.NUM_EXCITATORY, self.MODEL(**self.CELL_PARAMETERS),
-            label="excit_pop", seed=rng_seed)
+            label="excit_pop", seed=rng_seed,
+            n_synapse_cores=self._n_synapse_cores)
         in_pop = sim.Population(
             self.NUM_INHIBITORY, self.MODEL(**self.CELL_PARAMETERS),
             label="inhib_pop", seed=rng_seed)
@@ -344,8 +352,24 @@ def plot(
         pylab.show()
 
 
-x = Vogels2011()
-result_weights, static, plastic = x.run(
-    SLOWDOWN_STATIC, SLOWDOWN_PLASTIC, EXTRACT_WEIGHTS)
-if GENERATE_PLOT:
-    x.plot(result_weights, static, plastic)
+def run_script(*, split: bool = False) -> None:
+    """
+    Runs the example script
+
+    :param split: If True will split the Populations that receive data
+        into synapse and neuron cores.
+        This requires more cores but allows more spikes to be received.
+    """
+    x = Vogels2011(split)
+    result_weights, static, plastic = x.run(
+        SLOWDOWN_STATIC, SLOWDOWN_PLASTIC, EXTRACT_WEIGHTS)
+    if GENERATE_PLOT:
+        x.plot(result_weights, static, plastic)
+
+# combined binaries [IF_curr_exp_stdp_mad_vogels_2011_additive.aplx]
+# split binaries [IF_curr_exp_neuron.aplx,
+# synapses_stdp_mad_vogels_2011_additive.aplx]
+
+
+if __name__ == "__main__":
+    run_script(split=True)

examples/if_curr_alpha.py

@@ -15,52 +15,75 @@
 import pyNN.utility.plotting as plot
 import matplotlib.pyplot as plt
 
-p.setup(0.1)
-runtime = 50
-populations = []
-title = "PyNN0.8 alpha synapse testing"
 
-pop_src1 = p.Population(1, p.SpikeSourceArray,
-                        {'spike_times': [[5, 15, 20, 30]]}, label="src1")
+def run_script(*, split: bool = True) -> None:
+    """
+    Runs the example script
 
-populations.append(p.Population(1, p.IF_curr_alpha, {}, label="test"))
+    The default setting cause this script to split.
 
-populations[0].set(tau_syn_E=2)
-populations[0].set(tau_syn_I=4)
+    :param split: If True will split the Populations that receive data
+        into synapse and neuron cores.
+        This requires more cores but allows more spikes to be received.
+    """
+    p.setup(0.1)
+    runtime = 50
+    populations = []
+    title = "PyNN alpha synapse testing"
 
-# define the projections
-exc_proj = p.Projection(pop_src1, populations[0],
-                        p.OneToOneConnector(),
-                        p.StaticSynapse(weight=1, delay=1),
-                        receptor_type="excitatory")
-inh_proj = p.Projection(pop_src1, populations[0],
-                        p.OneToOneConnector(),
-                        p.StaticSynapse(weight=1, delay=10),
-                        receptor_type="inhibitory")
+    pop_src1 = p.Population(1, p.SpikeSourceArray,
+                            {'spike_times': [[5, 15, 20, 30]]}, label="src1")
+    if split:
+        # Due to the timestep of 0.1 by default
+        # this splits into synapses and neuron cores
+        populations.append(p.Population(1, p.IF_curr_alpha, {}, label="test"))
+    else:
+        # can be forced to not split this way
+        populations.append(p.Population(1, p.IF_curr_alpha, {}, label="test",
+                                        n_synapse_cores=0))
 
-populations[0].record("all")
-p.run(runtime)
+    populations[0].set(tau_syn_E=2)
+    populations[0].set(tau_syn_I=4)
 
-v = populations[0].get_data("v")
-gsyn_exc = populations[0].get_data("gsyn_exc")
-gsyn_inh = populations[0].get_data("gsyn_inh")
-spikes = populations[0].get_data("spikes")
+    # define the projections
+    p.Projection(
+        pop_src1, populations[0], p.OneToOneConnector(),
+        p.StaticSynapse(weight=1, delay=1), receptor_type="excitatory")
+    p.Projection(
+        pop_src1, populations[0], p.OneToOneConnector(),
+        p.StaticSynapse(weight=1, delay=10),  receptor_type="inhibitory")
 
-plot.Figure(
-    plot.Panel(v.segments[0].filter(name='v')[0],
-               ylabel="Membrane potential (mV)",
-               data_labels=[populations[0].label],
-               yticks=True, xlim=(0, runtime)),
-    plot.Panel(gsyn_exc.segments[0].filter(name='gsyn_exc')[0],
-               ylabel="gsyn excitatory (mV)",
-               data_labels=[populations[0].label],
-               yticks=True, xlim=(0, runtime)),
-    plot.Panel(gsyn_inh.segments[0].filter(name='gsyn_inh')[0],
-               ylabel="gsyn inhibitory (mV)",
-               data_labels=[populations[0].label],
-               yticks=True, xlim=(0, runtime)),
-    title=title,
-    annotations=f"Simulated with {p.name()}"
-)
-plt.show()
-p.end()
+    populations[0].record("all")
+    p.run(runtime)
+
+    v = populations[0].get_data("v")
+    gsyn_exc = populations[0].get_data("gsyn_exc")
+    gsyn_inh = populations[0].get_data("gsyn_inh")
+    spikes = populations[0].get_data("spikes")
+    print(spikes)
+
+    plot.Figure(
+        plot.Panel(v.segments[0].filter(name='v')[0],
+                   ylabel="Membrane potential (mV)",
+                   data_labels=[populations[0].label],
+                   yticks=True, xlim=(0, runtime)),
+        plot.Panel(gsyn_exc.segments[0].filter(name='gsyn_exc')[0],
+                   ylabel="gsyn excitatory (mV)",
+                   data_labels=[populations[0].label],
+                   yticks=True, xlim=(0, runtime)),
+        plot.Panel(gsyn_inh.segments[0].filter(name='gsyn_inh')[0],
+                   ylabel="gsyn inhibitory (mV)",
+                   data_labels=[populations[0].label],
+                   yticks=True, xlim=(0, runtime)),
+        title=title,
+        annotations=f"Simulated with {p.name()}"
+    )
+    plt.show()
+    p.end()
+
+# combined binaries [IF_curr_alpha.aplx]
+# split binaries [IF_curr_alpha_neuron.aplx, synapses.aplx]
+
+
+if __name__ == "__main__":
+    run_script()

integration_tests/test_scripts.py

@@ -96,8 +96,15 @@ def test_examples_external_devices_examples_live_examples_balanced_random_live_r
     def test_examples_external_devices_examples_pushbot_spinnaker_link_example(self):
         self.check_script("examples/external_devices_examples/pushbot_spinnaker_link_example.py")
 
-    def test_examples_if_curr_alpha(self):
-        self.check_script("examples/if_curr_alpha.py")
+    def test_examples_if_curr_alpha_combined(self):
+        from examples.if_curr_alpha import run_script
+        run_script(split=False)
+        self.check_binaries_used(["IF_curr_alpha.aplx"])
+
+    def test_examples_if_curr_alpha_split(self):
+        from examples.if_curr_alpha import run_script
+        run_script(split=True)
+        self.check_binaries_used(["IF_curr_alpha_neuron.aplx", "synapses.aplx"])
 
     def test_examples_stdp_example_izk(self):
         self.check_script("examples/stdp_example_izk.py")
@@ -150,19 +157,6 @@ def test_examples_stdp_example_get_plastic_params(self):
     def test_examples_extra_models_examples_LGN_Izhikevich(self):
         self.check_script("examples/extra_models_examples/LGN_Izhikevich.py")
 
-    def test_examples_extra_models_examples_vogel_2011_vogels_2011_live_combined(self):
-        from examples.extra_models_examples.vogel_2011.vogels_2011_live import run_script
-        run_script(split=False)
-        self.check_binaries_used(["IF_curr_exp_stdp_mad_vogels_2011_additive"])
-
-    def test_examples_extra_models_examples_vogel_2011_vogels_2011_live_split(self):
-        from examples.extra_models_examples.vogel_2011.vogels_2011_live import run_script
-        run_script(split=True)
-        self.check_binaries_used(["synapses_stdp_mad_vogels_2011_additive"])
-
-    # Not testing file due to: Unhandled main
-    # examples/extra_models_examples/vogel_2011/vogels_2011.py
-
     def test_examples_extra_models_examples_stdp_associative_memory(self):
         self.check_script("examples/extra_models_examples/stdp_associative_memory.py")
 
@@ -196,6 +190,26 @@ def test_examples_extra_models_examples_IF_curr_exp_sEMD_split(self):
     def test_examples_extra_models_examples_IF_curr_delta(self):
         self.check_script("examples/extra_models_examples/IF_curr_delta.py")
 
+    def test_examples_extra_models_examples_vogels_2011_live_combined(self):
+        from examples.extra_models_examples.vogels_2011_live import run_script
+        run_script(split=False)
+        self.check_binaries_used(["IF_curr_exp_stdp_mad_vogels_2011_additive"])
+
+    def test_examples_extra_models_examples_vogels_2011_live_split(self):
+        from examples.extra_models_examples.vogels_2011_live import run_script
+        run_script(split=True)
+        self.check_binaries_used(["synapses_stdp_mad_vogels_2011_additive"])
+
+    def test_examples_extra_models_examples_vogels_2011_combined(self):
+        from examples.extra_models_examples.vogels_2011 import run_script
+        run_script(split=False)
+        self.check_binaries_used(["IF_curr_exp_stdp_mad_vogels_2011_additive.aplx"])
+
+    def test_examples_extra_models_examples_vogels_2011_split(self):
+        from examples.extra_models_examples.vogels_2011 import run_script
+        run_script(split=True)
+        self.check_binaries_used(["IF_curr_exp_neuron.aplx", "synapses_stdp_mad_vogels_2011_additive.aplx"])
+
     def test_examples_extra_models_examples_stdp_example_izk_cond(self):
         self.check_script("examples/extra_models_examples/stdp_example_izk_cond.py")