Skip to content

Commit 1a38588

Browse files
rowleyarowleya
committed
Fix more split examples
1 parent 0bb589b commit 1a38588

4 files changed

Lines changed: 21 additions & 50 deletions

File tree

‎learning/split/spynnaker.cfg‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎learning/split/stdp_split.py‎

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,38 +15,29 @@
1515
import pyNN.utility.plotting as plot
1616
import matplotlib.pyplot as plt
1717
import pyNN.spiNNaker as sim
18-
from spynnaker.pyNN.extra_algorithms.splitter_components import (
19-
SplitterPopulationVertexNeuronsSynapses, SplitterPoissonDelegate)
2018

2119
n_neurons = 192
2220
simtime = 5000
2321

2422
sim.setup(timestep=1.0)
2523
sim.set_number_of_neurons_per_core(sim.IF_curr_exp, 64)
24+
sim.set_number_of_synapse_cores(sim.IF_curr_exp, 1)
25+
sim.set_allow_delay_extensions(sim.IF_curr_exp, False)
2626

27-
pre_splitter = SplitterPopulationVertexNeuronsSynapses(1, 128, False)
28-
pre_pop = sim.Population(
29-
n_neurons, sim.IF_curr_exp(), label="Pre", additional_parameters={
30-
"splitter": pre_splitter})
31-
post_splitter = SplitterPopulationVertexNeuronsSynapses(1, 128, False)
32-
post_pop = sim.Population(
33-
n_neurons, sim.IF_curr_exp(), label="Post", additional_parameters={
34-
"splitter": post_splitter})
27+
pre_pop = sim.Population(n_neurons, sim.IF_curr_exp(), label="Pre")
28+
post_pop = sim.Population(n_neurons, sim.IF_curr_exp(), label="Post")
3529
pre_noise = sim.Population(
36-
n_neurons, sim.SpikeSourcePoisson(rate=10.0), label="Noise_Pre",
37-
additional_parameters={"splitter": SplitterPoissonDelegate()})
30+
n_neurons, sim.SpikeSourcePoisson(rate=10.0), label="Noise_Pre")
3831
post_noise = sim.Population(
39-
n_neurons, sim.SpikeSourcePoisson(rate=10.0), label="Noise_Post",
40-
additional_parameters={"splitter": SplitterPoissonDelegate()})
32+
n_neurons, sim.SpikeSourcePoisson(rate=10.0), label="Noise_Post")
4133

4234
pre_pop.record("spikes")
4335
post_pop.record("spikes")
4436

4537
training = sim.Population(
4638
n_neurons,
4739
sim.SpikeSourcePoisson(rate=10.0, start=1500.0, duration=1500.0),
48-
label="Training",
49-
additional_parameters={"splitter": SplitterPoissonDelegate()})
40+
label="Training")
5041

5142
sim.Projection(pre_noise, pre_pop, sim.OneToOneConnector(),
5243
synapse_type=sim.StaticSynapse(weight=2.0))

‎learning/split/struct_pl_split.py‎

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -16,37 +16,28 @@
1616
import numpy
1717
import pyNN.utility.plotting as plot
1818
import pyNN.spiNNaker as sim
19-
from spynnaker.pyNN.extra_algorithms.splitter_components import (
20-
SplitterPopulationVertexNeuronsSynapses, SplitterPoissonDelegate)
2119

2220
n_neurons = 64
2321
simtime = 5000
2422

2523
sim.setup(timestep=1.0)
24+
sim.set_number_of_synapse_cores(sim.IF_curr_exp, 1)
25+
sim.set_allow_delay_extensions(sim.IF_curr_exp, False)
2626

27-
pre_splitter = SplitterPopulationVertexNeuronsSynapses(1, 128, False)
28-
pre_pop = sim.Population(
29-
n_neurons, sim.IF_curr_exp(), label="Pre", additional_parameters={
30-
"splitter": pre_splitter})
31-
post_splitter = SplitterPopulationVertexNeuronsSynapses(1, 128, False)
32-
post_pop = sim.Population(
33-
n_neurons, sim.IF_curr_exp(), label="Post", additional_parameters={
34-
"splitter": post_splitter})
27+
pre_pop = sim.Population(n_neurons, sim.IF_curr_exp(), label="Pre")
28+
post_pop = sim.Population(n_neurons, sim.IF_curr_exp(), label="Post")
3529
pre_noise = sim.Population(
36-
n_neurons, sim.SpikeSourcePoisson(rate=10.0), label="Noise_Pre",
37-
additional_parameters={"splitter": SplitterPoissonDelegate()})
30+
n_neurons, sim.SpikeSourcePoisson(rate=10.0), label="Noise_Pre")
3831
post_noise = sim.Population(
39-
n_neurons, sim.SpikeSourcePoisson(rate=10.0), label="Noise_Post",
40-
additional_parameters={"splitter": SplitterPoissonDelegate()})
32+
n_neurons, sim.SpikeSourcePoisson(rate=10.0), label="Noise_Post")
4133

4234
pre_pop.record("spikes")
4335
post_pop.record("spikes")
4436

4537
training = sim.Population(
4638
n_neurons,
4739
sim.SpikeSourcePoisson(rate=10.0, start=1500.0, duration=1500.0),
48-
label="Training",
49-
additional_parameters={"splitter": SplitterPoissonDelegate()})
40+
label="Training")
5041

5142
sim.Projection(pre_noise, pre_pop, sim.OneToOneConnector(),
5243
synapse_type=sim.StaticSynapse(weight=2.0))

‎learning/split/struct_pl_stdp_split.py‎

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -16,38 +16,29 @@
1616
import numpy
1717
import pyNN.spiNNaker as sim
1818
import pyNN.utility.plotting as plot
19-
from spynnaker.pyNN.extra_algorithms.splitter_components import (
20-
SplitterPopulationVertexNeuronsSynapses, SplitterPoissonDelegate)
2119

2220
n_neurons = 192
2321
simtime = 5000
2422

2523
sim.setup(timestep=1.0)
24+
sim.set_number_of_synapse_cores(sim.IF_curr_exp, 1)
25+
sim.set_allow_delay_extensions(sim.IF_curr_exp, False)
2626

2727
sim.set_number_of_neurons_per_core(sim.IF_curr_exp, 64)
28-
pre_splitter = SplitterPopulationVertexNeuronsSynapses(1, 128, False)
29-
pre_pop = sim.Population(
30-
n_neurons, sim.IF_curr_exp(), label="Pre", additional_parameters={
31-
"splitter": pre_splitter})
32-
post_splitter = SplitterPopulationVertexNeuronsSynapses(1, 128, False)
33-
post_pop = sim.Population(
34-
n_neurons, sim.IF_curr_exp(), label="Post", additional_parameters={
35-
"splitter": post_splitter})
28+
pre_pop = sim.Population(n_neurons, sim.IF_curr_exp(), label="Pre")
29+
post_pop = sim.Population(n_neurons, sim.IF_curr_exp(), label="Post")
3630
pre_noise = sim.Population(
37-
n_neurons, sim.SpikeSourcePoisson(rate=10.0), label="Noise_Pre",
38-
additional_parameters={"splitter": SplitterPoissonDelegate()})
31+
n_neurons, sim.SpikeSourcePoisson(rate=10.0), label="Noise_Pre")
3932
post_noise = sim.Population(
40-
n_neurons, sim.SpikeSourcePoisson(rate=10.0), label="Noise_Post",
41-
additional_parameters={"splitter": SplitterPoissonDelegate()})
33+
n_neurons, sim.SpikeSourcePoisson(rate=10.0), label="Noise_Post")
4234

4335
pre_pop.record("spikes")
4436
post_pop.record("spikes")
4537

4638
training = sim.Population(
4739
n_neurons,
4840
sim.SpikeSourcePoisson(rate=10.0, start=1500.0, duration=1500.0),
49-
label="Training",
50-
additional_parameters={"splitter": SplitterPoissonDelegate()})
41+
label="Training")
5142

5243
sim.Projection(pre_noise, pre_pop, sim.OneToOneConnector(),
5344
synapse_type=sim.StaticSynapse(weight=2.0))

0 commit comments

Comments
 (0)