Merge branch 'master' into spike_filter

Author: rowleya

setup.cfg

@@ -52,6 +52,7 @@ install_requires =
         lazyarray
         # below may fail for read the docs
         csa
+        h5py != 3.16.0;platform_system=='Windows'
 
 [options.packages.find]
 include =

spynnaker/pyNN/__init__.py

@@ -74,7 +74,6 @@
     PoolDenseConnector)
 # synapse structures
 from spynnaker.pyNN.models.neuron.synapse_dynamics import (
-    AbstractStaticSynapseDynamics,
     SynapseDynamicsStatic as StaticSynapse)
 
 # plastic stuff
@@ -149,6 +148,8 @@
 
 # big stuff
 from spynnaker.pyNN.spinnaker import SpiNNaker
+from spynnaker.pyNN.models.neuron.synapse_dynamics import (
+    AbstractSynapseDynamics)
 
 from spynnaker._version import __version__  # NOQA
 from spynnaker._version import __version_name__  # NOQA
@@ -357,7 +358,7 @@ def Projection(
         presynaptic_population: Population,
         postsynaptic_population: Population,
         connector: AbstractConnector,
-        synapse_type: Optional[AbstractStaticSynapseDynamics] = None,
+        synapse_type: Optional[AbstractSynapseDynamics] = None,
         source: None = None, receptor_type: str = "excitatory",
         space: Optional[Space] = None, label: Optional[str] = None,
         download_synapses: bool = False,

spynnaker/pyNN/config_setup.py

@@ -22,6 +22,7 @@
     fec_cfg_paths_skipped)
 
 from spynnaker.pyNN.data.spynnaker_data_writer import SpynnakerDataWriter
+from spynnaker.pyNN.models.neuron import AbstractPyNNNeuronModel
 
 SPYNNAKER_CFG = "spynnaker.cfg"
 
@@ -43,6 +44,7 @@ def unittest_setup() -> None:
     clear_cfg_files(True)
     add_spynnaker_cfg()
     SpynnakerDataWriter.mock()
+    AbstractPyNNNeuronModel.reset_all()
 
 
 def add_spynnaker_cfg() -> None:

spynnaker/pyNN/external_devices/__init__.py

@@ -21,7 +21,7 @@
     accuracy to gain performance.
 """
 import os
-from typing import Optional, Tuple
+from typing import Any, Dict, Optional, Tuple
 from spinn_utilities.socket_address import SocketAddress
 from spinnman.messages.eieio import EIEIOType
 from spinn_front_end_common.abstract_models import (
@@ -206,7 +206,8 @@ def EthernetControlPopulation(
         n_neurons: int, model: _CellTypeArg, label: Optional[str] = None,
         local_host: Optional[str] = None, local_port: Optional[int] = None,
         database_notify_port_num: Optional[int] = None,
-        database_ack_port_num: Optional[int] = None) -> Population:
+        database_ack_port_num: Optional[int] = None,
+        **additional_kwargs: Dict[str, Any]) -> Population:
     # pylint: disable=invalid-name
     """
     Create a PyNN population that can be included in a network to
@@ -226,6 +227,8 @@ def EthernetControlPopulation(
     :param database_notify_port_num:
         The optional port to which notifications from the database
         notification protocol are to be sent
+    :param additional_kwargs:
+        A nicer way of allowing additional things to the Population
     :return:
         A pyNN Population which can be used as the target of a Projection.
 
@@ -235,7 +238,8 @@ def EthernetControlPopulation(
     :raises TypeError: If an invalid model class is used.
     """
     # pylint: disable=global-statement
-    population = Population(n_neurons, model, label=label)
+    population = Population(n_neurons, model, label=label,
+                            **additional_kwargs)
     vertex, aec, vertex_label = __vtx(population)
     translator = aec.get_message_translator()
     live_packet_gather_label = "EthernetControlReceiver"
@@ -273,7 +277,8 @@ def EthernetControlPopulation(
 def EthernetSensorPopulation(
         device: AbstractEthernetSensor, local_host: Optional[str] = None,
         database_notify_port_num: Optional[int] = None,
-        database_ack_port_num: Optional[int] = None) -> Population:
+        database_ack_port_num: Optional[int] = None,
+        **additional_kwargs: Dict[str, Any]) -> Population:
     # pylint: disable=invalid-name
     """
     Create a pyNN population which can be included in a network to
@@ -289,6 +294,8 @@ def EthernetSensorPopulation(
     :param database_notify_port_num:
         The optional port to which notifications from the database
         notification protocol are to be sent
+    :param additional_kwargs:
+        A nicer way of allowing additional things to the Population
     :return:
         A pyNN Population which can be used as the source of a Projection.
 
@@ -304,7 +311,8 @@ def EthernetSensorPopulation(
     population = Population(
         device.get_n_neurons(), SpikeInjector(notify=False),
         label=device.get_injector_label(),
-        additional_parameters=injector_params)
+        additional_parameters=injector_params,
+        **additional_kwargs)
     if isinstance(device, AbstractSendMeMulticastCommandsVertex):
         cmd_conn = EthernetCommandConnection(
             device.get_translator(), [device], local_host,

spynnaker/pyNN/models/abstract_pynn_model.py

@@ -40,6 +40,14 @@ class AbstractPyNNModel(AbstractProvidesDefaults, metaclass=AbstractBase):
     _max_atoms_per_core: Dict[type, Optional[Tuple[int, ...]]] = defaultdict(
         lambda: None)
 
+    _model_created = False
+
+    # Using new as most super classes do not call the init
+    def __new__(cls, *args: Any, **kwargs: Any) -> "AbstractPyNNModel":
+        _ = (args, kwargs)
+        AbstractPyNNModel._model_created = True
+        return super(AbstractPyNNModel, cls).__new__(cls)
+
     @classmethod
     def verify_may_set(cls, param: str) -> None:
         """ If a Population has been created, this method will raise an
@@ -51,13 +59,18 @@ def verify_may_set(cls, param: str) -> None:
             in the Population constructor instead.
         """
         SpynnakerDataView.check_user_can_act()
-        if SpynnakerDataView.get_n_populations() == 0:
-            return
-        raise SpynnakerException(
-            "Global set is not supported after a Population has been "
-            "created. Either move it above the creation of all Populations "
-            f"or provide {param} during the creation of each Population it "
-            "applies to.")
+        if SpynnakerDataView.get_n_populations() > 0:
+            raise SpynnakerException(
+                "Global set is not supported after a Population has been "
+                "created. Either move it above the creation of all "
+                f"Populations or provide {param} during the creation of each "
+                "Population it applies to.")
+        if AbstractPyNNModel._model_created:
+            raise SpynnakerException(
+                "Global set is not supported after a Model has been "
+                "created. Either move it above the creation of all "
+                f"Models or provide {param} during the creation of each "
+                "Population it applies to.")
 
     @classmethod
     def set_model_max_atoms_per_dimension_per_core(
@@ -115,6 +128,7 @@ def reset_all(cls) -> None:
         Reset the maximum values for all classes.
         """
         AbstractPyNNModel._max_atoms_per_core.clear()
+        AbstractPyNNModel._model_created = False
 
     @classproperty
     def absolute_max_atoms_per_core(  # pylint: disable=no-self-argument

spynnaker/pyNN/models/neuron/plasticity/stdp/weight_dependence/weight_dependence_additive.py

@@ -104,10 +104,6 @@ def write_parameters(
                 data=self.__w_max * global_weight_scale,
                 data_type=DataType.S1615)
 
-            # pylint: disable=wrong-spelling-in-comment
-            # Based on http://data.andrewdavison.info/docs/PyNN/_modules/pyNN
-            #                /standardmodels/synapses.html
-            # Pre-multiply A+ and A- by Wmax
             spec.write_value(
                 data=self.A_plus * global_weight_scale,
                 data_type=DataType.S1615)

spynnaker/pyNN/models/neuron/plasticity/stdp/weight_dependence/weight_dependence_additive_triplet.py

@@ -127,10 +127,6 @@ def write_parameters(
             spec.write_value(data=self.__w_max * global_weight_scale,
                              data_type=DataType.S1615)
 
-            # pylint: disable=wrong-spelling-in-comment
-            # Based on http://data.andrewdavison.info/docs/PyNN/_modules/pyNN
-            #                /standardmodels/synapses.html
-            # Pre-multiply A+ and A- by Wmax
             spec.write_value(
                 data=self.A_plus * self.__w_max * global_weight_scale,
                 data_type=DataType.S1615)

spynnaker/pyNN/models/neuron/population_vertex.py

@@ -523,12 +523,8 @@ def combined_binary_exists(self) -> bool:
         # so easier to assume they exist
         if get_config_bool("Machine", "virtual_board"):
             return True
-        try:
-            SpynnakerDataView().get_executable_path(
-                self.combined_binary_file_name)
-            return True
-        except KeyError:
-            return False
+        return SpynnakerDataView().check_executable_path(
+            self.combined_binary_file_name)
 
     @property
     def split_binaries_exist(self) -> bool:
@@ -539,14 +535,11 @@ def split_binaries_exist(self) -> bool:
         # so easier to assume they exist
         if get_config_bool("Machine", "virtual_board"):
             return True
-        try:
-            SpynnakerDataView().get_executable_path(
-                self.neuron_core_binary_file_name)
-            SpynnakerDataView().get_executable_path(
-                self.synapse_core_binary_file_name)
-            return True
-        except KeyError:
+        if not SpynnakerDataView().check_executable_path(
+                self.neuron_core_binary_file_name):
             return False
+        return SpynnakerDataView().check_executable_path(
+            self.synapse_core_binary_file_name)
 
     @property
     def use_combined_core(self) -> bool:

spynnaker/pyNN/models/neuron/synapse_dynamics/synapse_dynamics_structural_static.py

@@ -212,6 +212,7 @@ def set_connections(
         if not isinstance(synapse_info.synapse_dynamics,
                           AbstractSynapseDynamicsStructural):
             return
+        self.__connections = dict()
         collector = self.__connections.setdefault(
             (app_edge.post_vertex, post_vertex_slice.lo_atom), [])
         collector.append((connections, app_edge, synapse_info))

spynnaker/pyNN/models/neuron/synapse_dynamics/synapse_dynamics_structural_stdp.py

@@ -223,6 +223,7 @@ def set_connections(
         if not isinstance(synapse_info.synapse_dynamics,
                           AbstractSynapseDynamicsStructural):
             return
+        self.__connections = dict()
         collector = self.__connections.setdefault(
             (app_edge.post_vertex, post_vertex_slice.lo_atom), [])
         collector.append((connections, app_edge, synapse_info))