Merge branch 'master' into current_sources

SpiNNakerManchester · Aug 27, 2021 · 87d8608 · 87d8608
2 parents f0e6f53 + 3a9484a
commit 87d8608
Show file tree

Hide file tree

Showing 33 changed files with 33 additions and 35 deletions.
diff --git a/examples/external_devices_examples/live_examples/spike_io.py b/examples/external_devices_examples/live_examples/spike_io.py
@@ -102,7 +102,7 @@ def receive_spikes(label, _time, neuron_ids):
 ############################################################
 
 # initial call to set up the front end (pynn requirement)
-Frontend.setup(timestep=1.0, min_delay=1.0, max_delay=144.0)
+Frontend.setup(timestep=1.0, min_delay=1.0)
 
 
 # neurons per population and the length of runtime in ms for the simulation,

diff --git a/examples/external_devices_examples/live_examples/spike_io_interactive_demo_with_c_vis.py b/examples/external_devices_examples/live_examples/spike_io_interactive_demo_with_c_vis.py
@@ -28,7 +28,7 @@ class PyNNScript(object):
     def __init__(self):
 
         # initial call to set up the front end (pynn requirement)
-        Frontend.setup(timestep=1.0, min_delay=1.0, max_delay=144.0)
+        Frontend.setup(timestep=1.0, min_delay=1.0)
 
         use_c_visualiser = False
         visualiser_port = 19996

diff --git a/examples/external_devices_examples/live_examples/synfire_if_curr_exp_live.py b/examples/external_devices_examples/live_examples/synfire_if_curr_exp_live.py
@@ -21,7 +21,7 @@
 import matplotlib.pyplot as plt
 
 # Define a synfire chain as usual
-p.setup(timestep=1.0, min_delay=1.0, max_delay=144.0)
+p.setup(timestep=1.0, min_delay=1.0)
 nNeurons = 200  # number of neurons in each population
 p.set_number_of_neurons_per_core(p.IF_curr_exp, nNeurons / 2)
 

diff --git a/examples/external_devices_examples/motor_example.py b/examples/external_devices_examples/motor_example.py
@@ -24,7 +24,7 @@
     import spynnaker8 as p
 
 # set up the tools
-p.setup(timestep=1.0, min_delay=1.0, max_delay=32.0)
+p.setup(timestep=1.0, min_delay=1.0)
 
 # set up the virtual chip coordinates for the motor
 connected_chip_coords = {'x': 0, 'y': 0}

diff --git a/examples/extra_models_examples/IF_cond_exp_stoc.py b/examples/extra_models_examples/IF_cond_exp_stoc.py
@@ -34,7 +34,7 @@
 from pyNN.utility.plotting import Figure, Panel
 import matplotlib.pyplot as plt
 
-sim.setup(timestep=1.0, min_delay=1.0, max_delay=4.0)
+sim.setup(timestep=1.0, min_delay=1.0)
 
 stoc_cell = sim.Population(1, sim.extra_models.IFCondExpStoc(**{
     'i_offset': 0.1,

diff --git a/examples/extra_models_examples/IF_curr_delta.py b/examples/extra_models_examples/IF_curr_delta.py
@@ -22,7 +22,7 @@
 from pyNN.utility.plotting import Figure, Panel
 import matplotlib.pyplot as plt
 
-sim.setup(timestep=0.1, min_delay=0.1, max_delay=4.0)
+sim.setup(timestep=0.1, min_delay=0.1)
 
 delta_cell = sim.Population(1, sim.extra_models.IFCurDelta(**{
     'i_offset': 0.1,

diff --git a/examples/extra_models_examples/IF_curr_exp_ca2_adaptive.py b/examples/extra_models_examples/IF_curr_exp_ca2_adaptive.py
@@ -38,7 +38,7 @@
 T = 250
 
 # Setup simulator
-sim.setup(timestep=dt, min_delay=1.0, max_delay=4.0)
+sim.setup(timestep=dt, min_delay=1.0)
 
 # Create population of neurons
 cell = sim.Population(N, sim.extra_models.IFCurrExpCa2Adaptive(**{

diff --git a/examples/extra_models_examples/stdp_associative_memory.py b/examples/extra_models_examples/stdp_associative_memory.py
@@ -22,7 +22,7 @@
 import matplotlib.pyplot as plt
 from pyNN.random import NumpyRNG, RandomDistribution
 
-p.setup(timestep=1.0, min_delay=1.0, max_delay=15.0)
+p.setup(timestep=1.0, min_delay=1.0)
 p.set_number_of_neurons_per_core(p.IF_curr_exp, 100)
 
 nSourceNeurons = 1  # number of input (excitatory) neurons

diff --git a/examples/extra_models_examples/stdp_triplet.py b/examples/extra_models_examples/stdp_triplet.py
@@ -55,7 +55,7 @@ def generate_fixed_frequency_test_data(
                'v_rest': -65.0, 'v_thresh': -55.4}
 
 # SpiNNaker setup
-sim.setup(timestep=1.0, min_delay=1.0, max_delay=10.0)
+sim.setup(timestep=1.0, min_delay=1.0)
 
 # Sweep times and frequencies
 projections = []

diff --git a/examples/extra_models_examples/synfire_if_curr_dual_exp.py b/examples/extra_models_examples/synfire_if_curr_dual_exp.py
@@ -21,7 +21,7 @@
 import matplotlib.pyplot as plt
 
 runtime = 5000
-p.setup(timestep=1.0, min_delay=1.0, max_delay=144.0)
+p.setup(timestep=1.0, min_delay=1.0)
 nNeurons = 200  # number of neurons in each population
 p.set_number_of_neurons_per_core(p.IF_curr_exp, nNeurons / 2)
 

diff --git a/examples/extra_models_examples/vogel_2011/vogels_2011.py b/examples/extra_models_examples/vogel_2011/vogels_2011.py
@@ -133,7 +133,7 @@ def _build_network(self, uses_stdp, slow_down):
 
         # SpiNNaker setup
         sim.setup(
-            timestep=1.0, min_delay=1.0, max_delay=10.0,
+            timestep=1.0, min_delay=1.0,
             time_scale_factor=slow_down, n_boards_required=N_BOARDS)
 
         # Reduce number of neurons to simulate on each core

diff --git a/examples/extra_models_examples/vogel_2011/vogels_2011_live.py b/examples/extra_models_examples/vogel_2011/vogels_2011_live.py
@@ -40,7 +40,7 @@
 NUM_EXCITATORY = 2000
 
 # SpiNNaker setup
-sim.setup(timestep=1.0, min_delay=1.0, max_delay=10.0, time_scale_factor=6)
+sim.setup(timestep=1.0, min_delay=1.0, time_scale_factor=6)
 
 # Reduce number of neurons to simulate on each core
 sim.set_number_of_neurons_per_core(sim.IF_curr_exp, 100)

diff --git a/examples/if_curr_delta.py b/examples/if_curr_delta.py
@@ -22,7 +22,7 @@
 from pyNN.utility.plotting import Figure, Panel
 import matplotlib.pyplot as plt
 
-sim.setup(timestep=1.0, min_delay=1.0, max_delay=4.0)
+sim.setup(timestep=1.0, min_delay=1.0)
 
 delta_cell = sim.Population(1, sim.IF_curr_delta(**{
     'i_offset': 0.1,

diff --git a/examples/partitioner_examples/splitter_usage.py b/examples/partitioner_examples/splitter_usage.py
@@ -26,7 +26,7 @@
 weight_to_spike = 2.0  # weight to spike
 delay = 17  # delay (above delay extension point)
 
-p.setup(timestep=1.0, min_delay=1.0, max_delay=1.0)
+p.setup(timestep=1.0, min_delay=1.0)
 p.set_number_of_neurons_per_core(p.IF_curr_exp, int(n_neurons / 2))
 
 neuron = p.Population(

diff --git a/examples/pynnBrunnel.py b/examples/pynnBrunnel.py
@@ -130,7 +130,7 @@ def poisson_generator(rate, rng, t_start=0.0, t_stop=1000.0, array=True,
 print("Rate is: %f HZ" % (p_rate / 1000))
 
 # Neural Parameters
-pynn.setup(timestep=0.1, min_delay=0.1, max_delay=12.8)
+pynn.setup(timestep=0.1, min_delay=0.1)
 
 if simulator_Name == "spiNNaker":
 

diff --git a/examples/simple_STDP.py b/examples/simple_STDP.py
@@ -54,7 +54,7 @@
 
 # === Set up the simulator ==================================================
 
-sim.setup(timestep=0.1, min_delay=delay, max_delay=delay)
+sim.setup(timestep=0.1, min_delay=delay)
 
 # === Build the network =====================================================
 

diff --git a/examples/split_examples/pynnBrunnelSplit.py b/examples/split_examples/pynnBrunnelSplit.py
@@ -132,7 +132,7 @@ def poisson_generator(rate, rng, t_start=0.0, t_stop=1000.0, array=True,
 print("Rate is: %f HZ" % (p_rate / 1000))
 
 # Neural Parameters
-pynn.setup(timestep=0.1, time_scale_factor=1, min_delay=0.1, max_delay=12.8)
+pynn.setup(timestep=0.1, time_scale_factor=1, min_delay=0.1)
 
 if simulator_Name == "spiNNaker":
 

diff --git a/examples/split_examples/va_benchmark_split.py b/examples/split_examples/va_benchmark_split.py
@@ -124,8 +124,7 @@
     extra["file"] = "VAbenchmarks.xml"
 
 node_id = p.setup(
-    timestep=dt, min_delay=delay, max_delay=delay,
-    db_name='va_benchmark.sqlite', **extra)
+    timestep=dt, min_delay=delay, db_name='va_benchmark.sqlite', **extra)
 
 if simulator_name == 'spiNNaker':
     p.set_number_of_neurons_per_core(p.IF_curr_exp, 100)      # this will set

diff --git a/examples/stdp_curve.py b/examples/stdp_curve.py
@@ -49,7 +49,7 @@
                }
 
 # SpiNNaker setup
-sim.setup(timestep=1.0, min_delay=1.0, max_delay=10.0)
+sim.setup(timestep=1.0, min_delay=1.0)
 
 # -------------------------------------------------------------------
 # Experiment loop

diff --git a/examples/stdp_curve_cond.py b/examples/stdp_curve_cond.py
@@ -49,7 +49,7 @@
                }
 
 # SpiNNaker setup
-sim.setup(timestep=1.0, min_delay=1.0, max_delay=10.0)
+sim.setup(timestep=1.0, min_delay=1.0)
 
 # -------------------------------------------------------------------
 # Experiment loop

diff --git a/examples/stdp_example.py b/examples/stdp_example.py
@@ -51,7 +51,7 @@
 import matplotlib.pyplot as plt
 
 # SpiNNaker setup
-sim.setup(timestep=1.0, min_delay=1.0, max_delay=10.0)
+sim.setup(timestep=1.0, min_delay=1.0)
 
 # +-------------------------------------------------------------------+
 # | General Parameters                                                |

diff --git a/examples/stdp_example_cond.py b/examples/stdp_example_cond.py
@@ -51,7 +51,7 @@
 import matplotlib.pyplot as plt
 
 # SpiNNaker setup
-sim.setup(timestep=1.0, min_delay=1.0, max_delay=10.0)
+sim.setup(timestep=1.0, min_delay=1.0)
 
 # +-------------------------------------------------------------------+
 # | General Parameters                                                |

diff --git a/examples/stdp_example_get_plastic_params.py b/examples/stdp_example_get_plastic_params.py
@@ -49,7 +49,7 @@
     import spynnaker8 as sim
 
 # SpiNNaker setup
-sim.setup(timestep=1.0, min_delay=1.0, max_delay=10.0)
+sim.setup(timestep=1.0, min_delay=1.0)
 
 # +-------------------------------------------------------------------+
 # | General Parameters                                                |

diff --git a/examples/stdp_pairing.py b/examples/stdp_pairing.py
@@ -16,7 +16,7 @@
 import spynnaker8 as sim
 
 # SpiNNaker setup
-sim.setup(timestep=1.0, min_delay=1.0, max_delay=10.0)
+sim.setup(timestep=1.0, min_delay=1.0)
 
 # +-------------------------------------------------------------------+
 # | General Parameters                                                |

diff --git a/examples/structural_plasticity_with_stdp_2d.py b/examples/structural_plasticity_with_stdp_2d.py
@@ -36,7 +36,7 @@
 from pyNN.utility.plotting import Figure, Panel
 
 # SpiNNaker setup
-sim.setup(timestep=1.0, min_delay=1.0, max_delay=14)
+sim.setup(timestep=1.0, min_delay=1.0)
 # +---------------------------------------------------------------------------+
 # | General Parameters                                                        |
 # +---------------------------------------------------------------------------+

diff --git a/examples/structural_plasticity_without_stdp_2d.py b/examples/structural_plasticity_without_stdp_2d.py
@@ -36,7 +36,7 @@
 from pyNN.utility.plotting import Figure, Panel
 
 # SpiNNaker setup
-sim.setup(timestep=1.0, min_delay=1.0, max_delay=14)
+sim.setup(timestep=1.0, min_delay=1.0)
 # +---------------------------------------------------------------------------+
 # | General Parameters                                                        |
 # +---------------------------------------------------------------------------+

diff --git a/examples/synfire_if_cond_exp.py b/examples/synfire_if_cond_exp.py
@@ -21,7 +21,7 @@
 import matplotlib.pyplot as plt
 
 runtime = 5000
-p.setup(timestep=1.0, min_delay=1.0, max_delay=144.0)
+p.setup(timestep=1.0, min_delay=1.0)
 nNeurons = 200  # number of neurons in each population
 p.set_number_of_neurons_per_core(p.IF_curr_exp, nNeurons / 2)
 

diff --git a/examples/synfire_if_curr_exp.py b/examples/synfire_if_curr_exp.py
@@ -21,7 +21,7 @@
 import matplotlib.pyplot as plt
 
 runtime = 5000
-p.setup(timestep=1.0, min_delay=1.0, max_delay=144.0)
+p.setup(timestep=1.0, min_delay=1.0)
 nNeurons = 200  # number of neurons in each population
 p.set_number_of_neurons_per_core(p.IF_curr_exp, nNeurons / 2)
 

diff --git a/examples/synfire_if_curr_exp_get_weights.py b/examples/synfire_if_curr_exp_get_weights.py
@@ -19,7 +19,7 @@
 import spynnaker8 as p
 
 runtime = 5000
-p.setup(timestep=1.0, min_delay=1.0, max_delay=144.0)
+p.setup(timestep=1.0, min_delay=1.0)
 nNeurons = 200  # number of neurons in each population
 p.set_number_of_neurons_per_core(p.IF_curr_exp, nNeurons / 2)
 

diff --git a/examples/synfire_if_curr_exp_large_array.py b/examples/synfire_if_curr_exp_large_array.py
@@ -21,7 +21,7 @@
 import matplotlib.pyplot as plt
 
 run_time = 6000
-p.setup(timestep=1.0, min_delay=1.0, max_delay=144.0)
+p.setup(timestep=1.0, min_delay=1.00)
 nNeurons = 10  # number of neurons in each population
 
 cell_params_lif = {'cm': 0.25,

diff --git a/examples/synfire_if_curr_exp_random.py b/examples/synfire_if_curr_exp_random.py
@@ -22,7 +22,7 @@
 
 from pyNN.random import RandomDistribution
 
-p.setup(timestep=1.0, min_delay=1.0, max_delay=144.0)
+p.setup(timestep=1.0, min_delay=1.0)
 nNeurons = 200  # number of neurons in each population
 max_delay = 50
 run_time = max_delay * nNeurons

diff --git a/examples/synfire_izk_curr_exp.py b/examples/synfire_izk_curr_exp.py
@@ -21,7 +21,7 @@
 import matplotlib.pyplot as plt
 
 runtime = 500
-p.setup(timestep=1.0, min_delay=1.0, max_delay=144.0)
+p.setup(timestep=1.0, min_delay=1.0)
 nNeurons = 200  # number of neurons in each population
 p.set_number_of_neurons_per_core(p.Izhikevich, nNeurons / 2)
 

diff --git a/examples/va_benchmark.py b/examples/va_benchmark.py
@@ -122,8 +122,7 @@
     extra["file"] = "VAbenchmarks.xml"
 
 node_id = p.setup(
-    timestep=dt, min_delay=delay, max_delay=delay,
-    db_name='va_benchmark.sqlite', **extra)
+    timestep=dt, min_delay=delay, db_name='va_benchmark.sqlite', **extra)
 
 if simulator_name == 'spiNNaker':
     p.set_number_of_neurons_per_core(p.IF_curr_exp, 100)      # this will set