Merge pull request #1546 from SpiNNakerManchester/mypy

typing of tests

Author: Christian-B

.github/workflows/python_actions.yml

@@ -32,6 +32,6 @@ jobs:
       coverage-package: spynnaker
       flake8-packages: spynnaker unittests spynnaker_integration_tests proxy_integration_tests
       pylint-packages: spynnaker
-      mypy-packages: unittests spynnaker_integration_tests proxy_integration_tests
-      mypy-full-packages: spynnaker
+      mypy-packages:  spynnaker_integration_tests proxy_integration_tests
+      mypy-full-packages: spynnaker unittests
       cfg-file: spynnaker

mypy.bash

@@ -25,5 +25,6 @@ man="../SpiNNMan/spinnman"
 pacman="../PACMAN/pacman"
 spalloc="../spalloc/spalloc_client"
 fec="../SpiNNFrontEndCommon/spinn_front_end_common"
+test_base="../TestBase/spinnaker_testbase"
 
-mypy --python-version 3.8 $utils $machine $man $pacman $spalloc $fec spynnaker
+mypy --python-version 3.8 $utils $machine $man $pacman $spalloc $fec $test_base spynnaker unittests

mypyd.bash

@@ -25,5 +25,6 @@ man="../SpiNNMan/spinnman"
 pacman="../PACMAN/pacman"
 spalloc="../spalloc/spalloc_client"
 fec="../SpiNNFrontEndCommon/spinn_front_end_common"
+test_base="../TestBase/spinnaker_testbase"
 
-mypy --python-version 3.8 --disallow-untyped-defs $utils $machine $man $pacman $spalloc $fec spynnaker
+mypy --python-version 3.8 --disallow-untyped-defs $utils $machine $man $pacman $spalloc $fec $test_base spynnaker unittests

pyproject.toml

@@ -17,5 +17,5 @@ requires = ["setuptools"]
 build-backend = "setuptools.build_meta"
 
 [[tool.mypy.overrides]]
-module = ["pyNN.*", "quantities", "neo", "scipy", "scipy.*", "lazyarray"]
+module = ["matplotlib", "matplotlib.*", "pyNN.*", "quantities", "neo", "scipy", "scipy.*", "lazyarray"]
 ignore_missing_imports = true

spynnaker/pyNN/data/spynnaker_data_writer.py

@@ -131,3 +131,9 @@ def _set_min_delay(self, min_delay: Optional[Union[int, float]]) -> None:
                 f'{self.get_simulation_time_step_ms()}')
 
         self.__spy_data._min_delay = min_delay
+
+    def _get_id_counter(self) -> int:
+        """
+        Testing method likely to change without notice!
+        """
+        return self.__spy_data._id_counter

spynnaker/pyNN/external_devices_models/push_bot/parameters/push_bot_retina_viewer.py

@@ -16,7 +16,7 @@
 from time import sleep
 from typing import Any, List
 
-from matplotlib import pyplot  # type: ignore[import]
+from matplotlib import pyplot
 import numpy
 
 from spinn_utilities.log import FormatAdapter

spynnaker/pyNN/models/neuron/connection_holder.py

@@ -24,7 +24,8 @@
     ConnectionsArray)
 
 _ItemType: TypeAlias = numpy.floating
-_Items: TypeAlias = Union[Tuple[NDArray[_ItemType], ...], NDArray[_ItemType]]
+_Items: TypeAlias = Union[Tuple[NDArray[_ItemType], ...], NDArray[_ItemType],
+                          Tuple[List[numpy.floating], ...]]
 
 
 def _is_listable(value: Any) -> TypeGuard[Sequence[Any]]:
@@ -205,7 +206,7 @@ def _get_data_items(self) -> _Items:
                     connections[order][self.__data_items_to_return[0]]
 
             # Return in a format which can be understood by a FromListConnector
-            items: List[Any] = []
+            items: List[List[numpy.floating]] = []
             # NB: The types in here are all wrong, but that's
             for data_item in data_items:
                 if _is_listable(data_item):
@@ -242,7 +243,8 @@ def _get_data_items(self) -> _Items:
         return self.__data_items
 
     def __getitem__(self, s: int) -> Union[
-            numpy.floating, NDArray[numpy.floating]]:
+            numpy.floating, NDArray[numpy.floating],
+            List[numpy.floating]]:
         data = self._get_data_items()
         return data[s]
 

spynnaker/pyNN/models/neuron/population_vertex.py

@@ -472,15 +472,14 @@ def get_max_atoms_per_dimension_per_core(self) -> Tuple[int, ...]:
     @overrides(PopulationApplicationVertex.
                set_max_atoms_per_dimension_per_core)
     def set_max_atoms_per_dimension_per_core(
-            self, new_value: Union[None, int, Tuple[int, ...]]) -> None:
-        if new_value is not None:
-            max_atoms = self.__synapse_dynamics.absolute_max_atoms_per_core
-            if numpy.prod(new_value) > max_atoms:
-                raise SpynnakerException(
-                    "In the current configuration, the maximum number of"
-                    " neurons for each dimension must be such that the total"
-                    " number of neurons per core is less than or equal to"
-                    f" {max_atoms}")
+            self, new_value: Union[int, Tuple[int, ...]]) -> None:
+        max_atoms = self.__synapse_dynamics.absolute_max_atoms_per_core
+        if numpy.prod(new_value) > max_atoms:
+            raise SpynnakerException(
+                "In the current configuration, the maximum number of"
+                " neurons for each dimension must be such that the total"
+                " number of neurons per core is less than or equal to"
+                f" {max_atoms}")
         super().set_max_atoms_per_dimension_per_core(new_value)
 
     @overrides(SupportsStructure.set_structure)

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

@@ -28,7 +28,7 @@
 from spynnaker.pyNN.exceptions import SynapticConfigurationException
 from spynnaker.pyNN.models.neuron.synapse_dynamics.types import (
     NUMPY_CONNECTORS_DTYPE)
-from spynnaker.pyNN.types import Weight_Delay_In_Types as _Weight
+from spynnaker.pyNN.types import Weight_Delay_In_Types as _InTypes
 from spynnaker.pyNN.utilities.utility_calls import get_n_bits
 
 from .abstract_static_synapse_dynamics import AbstractStaticSynapseDynamics
@@ -58,8 +58,9 @@ class SynapseDynamicsStatic(
         "__pad_to_length"]
 
     def __init__(
-            self, weight: _Weight = StaticSynapse.default_parameters['weight'],
-            delay: Optional[float] = None,
+            self, weight: _InTypes = StaticSynapse.default_parameters[
+                'weight'],
+            delay: _InTypes = None,
             pad_to_length: Optional[int] = None):
 
         """

spynnaker/pyNN/models/neuron/synapse_io.py

@@ -16,7 +16,7 @@
 from typing import List, Optional, Tuple, Union, TYPE_CHECKING
 
 import numpy
-from numpy import floating, integer, uint32
+from numpy import integer, uint32
 from numpy.typing import NDArray
 
 from pacman.model.graphs.application import ApplicationVertex
@@ -33,6 +33,7 @@
     AbstractPlasticSynapseDynamics)
 from spynnaker.pyNN.models.neuron.synapse_dynamics.types import (
     NUMPY_CONNECTORS_DTYPE, ConnectionsArray)
+from spynnaker.pyNN.types import WeightScales
 
 from .master_pop_table import MasterPopTableAsBinarySearch
 
@@ -217,7 +218,7 @@ def _get_allowed_row_length(
 def get_synapses(
         connections: ConnectionsArray, synapse_info: SynapseInformation,
         n_delay_stages: int, n_synapse_types: int,
-        weight_scales: NDArray[floating], app_edge: ProjectionApplicationEdge,
+        weight_scales: WeightScales, app_edge: ProjectionApplicationEdge,
         max_row_info: MaxRowInfo, gen_undelayed: bool, gen_delayed: bool,
         max_atoms_per_core: int) -> Tuple[_RowData, _RowData]:
     """
@@ -233,8 +234,7 @@ def get_synapses(
         The number of delay stages in total to be represented
     :param int n_synapse_types:
         The number of synapse types in total to be represented
-    :param list(float) weight_scales:
-        The scaling of the weights for each synapse type
+    :param weight_scales: The scaling of the weights for each synapse type
     :param ~pacman.model.graphs.application.ApplicationEdge app_edge:
         The incoming machine edge that the synapses are on
     :param MaxRowInfo max_row_info:
@@ -391,7 +391,7 @@ def _get_row_data(
 def convert_to_connections(
         synapse_info: SynapseInformation, post_vertex_slice: Slice,
         n_pre_atoms: int, max_row_length: int, n_synapse_types: int,
-        weight_scales: NDArray[floating], data: Union[bytes, NDArray, None],
+        weight_scales: WeightScales, data: Union[bytes, NDArray, None],
         delayed: bool, post_vertex_max_delay_ticks: int,
         max_atoms_per_core: int) -> ConnectionsArray:
     """
@@ -407,7 +407,7 @@ def convert_to_connections(
         The length of each row in the data
     :param int n_synapse_types:
         The number of synapse types in total
-    :param list(float) weight_scales:
+    :param weight_scales:
         The weight scaling of each synapse type
     :param bytearray data:
         The raw data containing the synapses
@@ -461,7 +461,7 @@ def convert_to_connections(
 def read_all_synapses(
         data: NDArray[uint32], delayed_data: NDArray[uint32],
         synapse_info: SynapseInformation, n_synapse_types: int,
-        weight_scales: NDArray[floating], post_vertex_slice: Slice,
+        weight_scales: WeightScales, post_vertex_slice: Slice,
         n_pre_atoms: int, post_vertex_max_delay_ticks: int,
         max_row_info: MaxRowInfo, max_atoms_per_core: int
         ) -> ConnectionsArray:
@@ -477,7 +477,7 @@ def read_all_synapses(
         The synapse info that generated the synapses
     :param int n_synapse_types:
         The total number of synapse types available
-    :param list(float) weight_scales:
+    :param weight_scales:
         A weight scale for each synapse type
     :param int n_pre_atoms: The number of atoms in the pre-vertex
     :param ~pacman.model.graphs.common.Slice post_vertex_slice:
@@ -638,13 +638,13 @@ def _read_plastic_data(
 
 
 def _rescale_connections(
-        connections: ConnectionsArray, weight_scales: NDArray[floating],
+        connections: ConnectionsArray, weight_scales: WeightScales,
         synapse_info: SynapseInformation) -> ConnectionsArray:
     """
     Scale the connection data into machine values.
 
     :param ~numpy.ndarray connections: The connections to be rescaled
-    :param list(float) weight_scales: The weight scale of each synapse type
+    :param weight_scales: The weight scale of each synapse type
     :param SynapseInformation synapse_info:
         The synapse information of the connections
     """