Merge pull request #1549 from SpiNNakerManchester/PopulationVertex

rename AbstractPopulationVertex PopulationVerte

Author: Christian-B

spynnaker/pyNN/__init__.py

@@ -472,7 +472,7 @@ def set_number_of_neurons_per_core(
     dimensions, it is recommended to set this to `None` here and then
     set the maximum on each Population.
 
-    :param type(AbstractPopulationVertex) neuron_type: neuron type
+    :param type(PopulationVertex) neuron_type: neuron type
     :param max_permitted: the number to set to
     :type max_permitted: int or tuple or None
     """

spynnaker/pyNN/external_devices/__init__.py

@@ -63,7 +63,7 @@
     SpikeInjector as ExternalDeviceSpikeInjector)
 from spynnaker.pyNN import protocols
 from spynnaker.pyNN.spinnaker import SpiNNaker
-from spynnaker.pyNN.models.neuron import AbstractPopulationVertex
+from spynnaker.pyNN.models.neuron import PopulationVertex
 
 
 # useful functions
@@ -184,13 +184,13 @@ def register_database_notification_request(
 
 
 def __vtx(population: Population) -> Tuple[
-        AbstractPopulationVertex, AbstractEthernetController, str]:
+        PopulationVertex, AbstractEthernetController, str]:
     vertex = population._vertex  # pylint: disable=protected-access
-    if isinstance(vertex, AbstractPopulationVertex):
+    if isinstance(vertex, PopulationVertex):
         v = vertex
     else:
         raise TypeError(
-            "Vertex must be an instance of AbstractPopulationVertex")
+            "Vertex must be an instance of PopulationVertex")
     if isinstance(vertex, AbstractEthernetController):
         c = vertex
     else:

spynnaker/pyNN/external_devices_models/external_device_lif_control.py

@@ -16,9 +16,9 @@
 from spinn_utilities.overrides import overrides
 from spinn_front_end_common.utilities.exceptions import ConfigurationException
 from spynnaker.pyNN.extra_algorithms.splitter_components import (
-    SplitterAbstractPopulationVertex)
+    SplitterPopulationVertex)
 from spynnaker.pyNN.models.neuron import (
-    AbstractPopulationVertex, AbstractPyNNNeuronModelStandard)
+    PopulationVertex, AbstractPyNNNeuronModelStandard)
 from spynnaker.pyNN.models.defaults import (
     default_initial_values, default_parameters)
 from spynnaker.pyNN.models.neuron.input_types import InputTypeCurrent
@@ -113,9 +113,9 @@ def create_vertex(
             max_expected_summed_weight: Optional[List[float]] = None,
             incoming_spike_buffer_size: Optional[int] = None,
             drop_late_spikes: Optional[bool] = None,
-            splitter: Optional[SplitterAbstractPopulationVertex] = None,
+            splitter: Optional[SplitterPopulationVertex] = None,
             seed: Optional[int] = None, n_colour_bits: Optional[int] = None,
-            n_steps_per_timestep: int = 1) -> AbstractPopulationVertex:
+            n_steps_per_timestep: int = 1) -> PopulationVertex:
         if n_neurons != len(self._devices):
             raise ConfigurationException(
                 "Number of neurons does not match number of "

spynnaker/pyNN/external_devices_models/external_device_lif_control_vertex.py

@@ -21,7 +21,7 @@
 from spinn_front_end_common.abstract_models import (
     AbstractVertexWithEdgeToDependentVertices, HasCustomAtomKeyMap)
 from spinn_front_end_common.utilities.exceptions import ConfigurationException
-from spynnaker.pyNN.models.neuron import AbstractPopulationVertex
+from spynnaker.pyNN.models.neuron import PopulationVertex
 from .abstract_ethernet_controller import AbstractEthernetController
 from .abstract_multicast_controllable_device import (
     AbstractMulticastControllableDevice)
@@ -32,11 +32,11 @@
     from spynnaker.pyNN.models.neuron import AbstractPyNNNeuronModel
     from .abstract_ethernet_translator import AbstractEthernetTranslator
     from spynnaker.pyNN.extra_algorithms.splitter_components import (
-        SplitterAbstractPopulationVertex)
+        SplitterPopulationVertex)
 
 
 class ExternalDeviceLifControlVertex(
-        AbstractPopulationVertex,
+        PopulationVertex,
         AbstractEthernetController,
         AbstractVertexWithEdgeToDependentVertices,
         HasCustomAtomKeyMap):
@@ -65,7 +65,7 @@ def __init__(
             max_expected_summed_weight: Optional[List[float]] = None,
             incoming_spike_buffer_size: Optional[int] = None,
             drop_late_spikes: Optional[bool] = None,
-            splitter: Optional[SplitterAbstractPopulationVertex] = None,
+            splitter: Optional[SplitterPopulationVertex] = None,
             seed: Optional[int] = None, n_colour_bits: Optional[int] = None):
         """
         :param list(AbstractMulticastControllableDevice) devices:
@@ -86,7 +86,7 @@ def __init__(
         :param float ring_buffer_sigma:
         :param int incoming_spike_buffer_size:
         :param splitter: splitter from application vertices to machine vertices
-        :type splitter: SplitterAbstractPopulationVertex or None
+        :type splitter: SplitterPopulationVertex or None
         :param int n_colour_bits: The number of colour bits to use
         """
         # pylint: disable=too-many-arguments
@@ -164,7 +164,7 @@ def get_atom_key_map(
         device = self.__devices[partition_id]
         return [(index, device.device_control_key)]
 
-    @overrides(AbstractPopulationVertex.get_fixed_key_and_mask)
+    @overrides(PopulationVertex.get_fixed_key_and_mask)
     def get_fixed_key_and_mask(
             self, partition_id: str) -> Optional[BaseKeyAndMask]:
         return BaseKeyAndMask(

spynnaker/pyNN/extra_algorithms/delay_support_adder.py

@@ -24,7 +24,7 @@
     ProjectionApplicationEdge, DelayedApplicationEdge,
     DelayAfferentApplicationEdge)
 from spynnaker.pyNN.models.utility_models.delays import DelayExtensionVertex
-from spynnaker.pyNN.models.neuron import AbstractPopulationVertex
+from spynnaker.pyNN.models.neuron import PopulationVertex
 
 
 def delay_support_adder() -> Tuple[
@@ -55,7 +55,7 @@ def __init__(self) -> None:
         self._app_to_delay_map: Dict[
             ApplicationEdgePartition, DelayExtensionVertex] = dict()
         self._delay_post_edge_map: Dict[
-            Tuple[DelayExtensionVertex, AbstractPopulationVertex, str],
+            Tuple[DelayExtensionVertex, PopulationVertex, str],
             DelayedApplicationEdge] = dict()
         self._new_edges: List[Tuple[ApplicationEdge, str]] = list()
         self._new_vertices: List[DelayExtensionVertex] = list()

spynnaker/pyNN/extra_algorithms/splitter_components/__init__.py

@@ -14,19 +14,18 @@
 
 from .abstract_spynnaker_splitter_delay import AbstractSpynnakerSplitterDelay
 from .spynnaker_splitter_selector import spynnaker_splitter_selector
-from .splitter_abstract_pop_vertex import SplitterAbstractPopulationVertex
-from .splitter_abstract_pop_vertex_fixed import (
-    SplitterAbstractPopulationVertexFixed)
 from .splitter_delay_vertex_slice import SplitterDelayVertexSlice
-from .splitter_abstract_pop_vertex_neurons_synapses import (
-    SplitterAbstractPopulationVertexNeuronsSynapses)
 from .splitter_poisson_delegate import SplitterPoissonDelegate
+from .splitter_population_vertex import SplitterPopulationVertex
+from .splitter_population_vertex_fixed import SplitterPopulationVertexFixed
+from .splitter_population_vertex_neurons_synapses import (
+    SplitterPopulationVertexNeuronsSynapses)
 from .abstract_supports_one_to_one_sdram_input import (
     AbstractSupportsOneToOneSDRAMInput)
 
 __all__ = [
-    'AbstractSpynnakerSplitterDelay', 'SplitterAbstractPopulationVertex',
-    'SplitterDelayVertexSlice', 'spynnaker_splitter_selector',
-    'SplitterAbstractPopulationVertexNeuronsSynapses',
-    'SplitterPoissonDelegate', 'AbstractSupportsOneToOneSDRAMInput',
-    'SplitterAbstractPopulationVertexFixed']
+    'AbstractSpynnakerSplitterDelay', 'AbstractSupportsOneToOneSDRAMInput',
+    'SplitterDelayVertexSlice', 'SplitterPoissonDelegate',
+    'SplitterPopulationVertex', 'SplitterPopulationVertexFixed',
+    'SplitterPopulationVertexNeuronsSynapses',
+    'spynnaker_splitter_selector']

…mponents/splitter_abstract_pop_vertex.py …components/splitter_population_vertex.pyspynnaker/pyNN/extra_algorithms/splitter_components/splitter_abstract_pop_vertex.py renamed to spynnaker/pyNN/extra_algorithms/splitter_components/splitter_population_vertex.py spynnaker/pyNN/extra_algorithms/splitter_components/splitter_abstract_pop_vertex.py renamed to spynnaker/pyNN/extra_algorithms/splitter_components/splitter_population_vertex.py

@@ -20,7 +20,7 @@
 from pacman.model.partitioner_splitters import AbstractSplitterCommon
 from pacman.utilities.algorithm_utilities\
     .partition_algorithm_utilities import get_multidimensional_slices
-from spynnaker.pyNN.models.neuron import AbstractPopulationVertex
+from spynnaker.pyNN.models.neuron import PopulationVertex
 from .abstract_spynnaker_splitter_delay import AbstractSpynnakerSplitterDelay
 
 
@@ -29,11 +29,11 @@
 MAX_RING_BUFFER_BITS = 14
 
 
-class SplitterAbstractPopulationVertex(
-        AbstractSplitterCommon[AbstractPopulationVertex],
+class SplitterPopulationVertex(
+        AbstractSplitterCommon[PopulationVertex],
         AbstractSpynnakerSplitterDelay):
     """
-    Abstract base class of splitters for :py:class:`AbstractPopulationVertex`.
+    Abstract base class of splitters for :py:class:`PopulationVertex`.
     """
     __slots__ = ("_max_delay", "__slices")
 
@@ -45,12 +45,12 @@ def __init__(self, max_delay: Optional[int]) -> None:
     @final
     @overrides(AbstractSplitterCommon.set_governed_app_vertex)
     def set_governed_app_vertex(
-            self, app_vertex: AbstractPopulationVertex) -> None:
-        if not isinstance(app_vertex, AbstractPopulationVertex):
+            self, app_vertex: PopulationVertex) -> None:
+        if not isinstance(app_vertex, PopulationVertex):
             raise PacmanConfigurationException(
                 f"The vertex {app_vertex} cannot be supported by the "
                 f"{self.__class__.__name__} as the only vertex "
-                "supported by this splitter is a AbstractPopulationVertex. "
+                "supported by this splitter is a PopulationVertex. "
                 "Please use the correct splitter for your vertex and try "
                 "again.")
         super().set_governed_app_vertex(app_vertex)

…ts/splitter_abstract_pop_vertex_fixed.py …ents/splitter_population_vertex_fixed.pyspynnaker/pyNN/extra_algorithms/splitter_components/splitter_abstract_pop_vertex_fixed.py renamed to spynnaker/pyNN/extra_algorithms/splitter_components/splitter_population_vertex_fixed.py spynnaker/pyNN/extra_algorithms/splitter_components/splitter_abstract_pop_vertex_fixed.py renamed to spynnaker/pyNN/extra_algorithms/splitter_components/splitter_population_vertex_fixed.py

@@ -49,17 +49,18 @@
 from spynnaker.pyNN.models.neuron.population_machine_common import (
     PopulationMachineCommon)
 
-from .splitter_abstract_pop_vertex import SplitterAbstractPopulationVertex
+from .splitter_population_vertex import SplitterPopulationVertex
 from .abstract_spynnaker_splitter_delay import AbstractSpynnakerSplitterDelay
 
 # The maximum number of bits for the ring buffer index that are likely to
-# fit in DTCM (14-bits = 16,384 16-bit ring buffer entries = 32Kb DTCM
+# fit in DTCM (14-bits = 16,384 16-bit ring
+# buffer entries = 32Kb DTCM
 MAX_RING_BUFFER_BITS = 14
 
 
-class SplitterAbstractPopulationVertexFixed(SplitterAbstractPopulationVertex):
+class SplitterPopulationVertexFixed(SplitterPopulationVertex):
     """
-    Handles the splitting of the :py:class:`AbstractPopulationVertex`
+    Handles the splitting of the :py:class:`PopulationVertex`
     using fixed slices.
     """
 
@@ -308,13 +309,13 @@ def __get_synapse_constant_sdram(
                            self.governed_app_vertex.incoming_projections))
         return sdram
 
-    @overrides(SplitterAbstractPopulationVertex.
+    @overrides(SplitterPopulationVertex.
                reset_called)  # type: ignore[has-type]
     def reset_called(self) -> None:
         super().reset_called()
         self.__expect_delay_extension = None
 
-    @overrides(SplitterAbstractPopulationVertex._update_max_delay)
+    @overrides(SplitterPopulationVertex._update_max_delay)
     def _update_max_delay(self) -> None:
         # Find the maximum delay from incoming synapses
         self._max_delay, self.__expect_delay_extension = \

…_abstract_pop_vertex_neurons_synapses.py …er_population_vertex_neurons_synapses.pyspynnaker/pyNN/extra_algorithms/splitter_components/splitter_abstract_pop_vertex_neurons_synapses.py renamed to spynnaker/pyNN/extra_algorithms/splitter_components/splitter_population_vertex_neurons_synapses.py spynnaker/pyNN/extra_algorithms/splitter_components/splitter_abstract_pop_vertex_neurons_synapses.py renamed to spynnaker/pyNN/extra_algorithms/splitter_components/splitter_population_vertex_neurons_synapses.py

@@ -78,7 +78,7 @@
 
 from .splitter_poisson_delegate import SplitterPoissonDelegate
 from .abstract_spynnaker_splitter_delay import AbstractSpynnakerSplitterDelay
-from .splitter_abstract_pop_vertex import SplitterAbstractPopulationVertex
+from .splitter_population_vertex import SplitterPopulationVertex
 from .abstract_supports_one_to_one_sdram_input import (
     AbstractSupportsOneToOneSDRAMInput)
 
@@ -92,10 +92,10 @@
 _MAX_CORES = 15
 
 
-class SplitterAbstractPopulationVertexNeuronsSynapses(
-        SplitterAbstractPopulationVertex, AbstractSupportsOneToOneSDRAMInput):
+class SplitterPopulationVertexNeuronsSynapses(
+        SplitterPopulationVertex, AbstractSupportsOneToOneSDRAMInput):
     """
-    Splits an :py:class:`AbstractPopulationVertex` so that there are separate
+    Splits an :py:class:`PopulationVertex` so that there are separate
     neuron cores each being fed by one or more synapse cores.  Incoming
     one-to-one Poisson cores are also added here if they meet the criteria.
     """
@@ -818,7 +818,7 @@ def __proj_dependent_synapse_sdram(self) -> MultiRegionSDRAM:
                 BYTES_PER_WORD))
         return sdram
 
-    @overrides(SplitterAbstractPopulationVertex._update_max_delay)
+    @overrides(SplitterPopulationVertex._update_max_delay)
     def _update_max_delay(self) -> None:
         # Find the maximum delay from incoming synapses
         self._max_delay, needs_delay_extension = \

spynnaker/pyNN/extra_algorithms/splitter_components/spynnaker_splitter_selector.py

@@ -22,14 +22,14 @@
 from spynnaker.pyNN.models.abstract_models import (
     AbstractAcceptsIncomingSynapses)
 from spynnaker.pyNN.data import SpynnakerDataView
-from spynnaker.pyNN.models.neuron import AbstractPopulationVertex
+from spynnaker.pyNN.models.neuron import PopulationVertex
 from spynnaker.pyNN.models.spike_source import (
     SpikeSourceArrayVertex, SpikeSourcePoissonVertex)
-from .splitter_abstract_pop_vertex_fixed import (
-    SplitterAbstractPopulationVertexFixed)
+from .splitter_population_vertex_fixed import (
+    SplitterPopulationVertexFixed)
 from .splitter_poisson_delegate import SplitterPoissonDelegate
-from .splitter_abstract_pop_vertex_neurons_synapses import (
-    SplitterAbstractPopulationVertexNeuronsSynapses)
+from .splitter_population_vertex_neurons_synapses import (
+    SplitterPopulationVertexNeuronsSynapses)
 from .abstract_spynnaker_splitter_delay import AbstractSpynnakerSplitterDelay
 
 PROGRESS_BAR_NAME = "Adding Splitter selectors where appropriate"
@@ -43,8 +43,8 @@ def spynnaker_splitter_selector() -> None:
     """
     Add a splitter to every vertex that doesn't already have one.
 
-    The default for :py:class:`AbstractPopulationVertex` is the
-    :py:class:`SplitterAbstractPopulationVertexFixed`.
+    The default for :py:class:`PopulationVertex` is the
+    :py:class:`SplitterPopulationVertexFixed`.
     The default for external device splitters are
     :py:class:`~pacman.model.partitioner_splitters.SplitterExternalDevice`.
     The default for the rest is the
@@ -71,12 +71,12 @@ def spynnaker_vertex_selector(app_vertex: ApplicationVertex) -> None:
         application vertex to give a splitter object to
     """
     if not app_vertex.has_splitter:
-        if isinstance(app_vertex, AbstractPopulationVertex):
+        if isinstance(app_vertex, PopulationVertex):
             if app_vertex.combined_core_capable:
-                app_vertex.splitter = SplitterAbstractPopulationVertexFixed()
+                app_vertex.splitter = SplitterPopulationVertexFixed()
             else:
                 app_vertex.splitter = (
-                    SplitterAbstractPopulationVertexNeuronsSynapses(
+                    SplitterPopulationVertexNeuronsSynapses(
                         app_vertex.n_synapse_cores_required))
         elif isinstance(app_vertex, ApplicationSpiNNakerLinkVertex):
             app_vertex.splitter = SplitterExternalDevice()