merge

.coveragerc

@@ -14,3 +14,12 @@
 
 [run]
 branch = True
+
+[report]
+# Coverage should ignore overloads; they're not real code
+exclude_lines =
+    @overload
+    \.\.\.$
+    raise\s+NotImplementedError
+    if\s+TYPE_CHECKING:
+    #\s*(pragma|PRAGMA)[:\s]?\s*(no|NO)\s*(cover|COVER)

.github/workflows/python_actions.yml

@@ -40,6 +40,8 @@ jobs:
 
     - name: Install pip, etc
       uses: ./support/actions/python-tools
+    - name: Install mypy
+      run: pip install mypy
     - name: Install Spinnaker Dependencies
       uses: ./support/actions/install-spinn-deps
       with:
@@ -65,6 +67,8 @@ jobs:
       with: 
         package: spinn_machine
         language: en_GB
+    - name: Lint with mypy
+      run: mypy spinn_machine
 
   validate:
     runs-on: ubuntu-latest

setup.cfg

@@ -57,6 +57,7 @@ include =
 [options.package_data]
 * =
         spinn_machine.cfg
+        py.typed
 
 [options.extras_require]
 test =

spinn_machine/__init__.py

@@ -79,6 +79,7 @@
 from .chip import Chip
 from .core_subset import CoreSubset
 from .core_subsets import CoreSubsets
+from .frozen_core_subsets import FrozenCoreSubsets
 from .link import Link
 from .machine import Machine
 from .multicast_routing_entry import MulticastRoutingEntry
@@ -90,6 +91,6 @@
 
 
 __all__ = ["Chip", "CoreSubset", "CoreSubsets", "FixedRouteEntry",
-           "Link", "Machine", "MulticastRoutingEntry",
+           "FrozenCoreSubsets", "Link", "Machine", "MulticastRoutingEntry",
            "Processor", "Router", "SpiNNakerTriadGeometry",
            "virtual_machine"]

spinn_machine/chip.py

@@ -11,10 +11,12 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
+from typing import (
+    Any, Collection, Dict, Iterable, Iterator, Optional, Tuple)
 from spinn_utilities.ordered_set import OrderedSet
 from spinn_machine.data import MachineDataView
 from .processor import Processor
+from .router import Router
 
 standard_processors = {}
 
@@ -40,10 +42,13 @@ class Chip(object):
     )
 
     # pylint: disable=too-many-arguments, wrong-spelling-in-docstring
-    def __init__(self, x, y, n_processors, router, sdram, nearest_ethernet_x,
-                 nearest_ethernet_y, ip_address=None,
-                 tag_ids=None, down_cores=None, parent_link=None,
-                 v_to_p_map=None):
+    def __init__(self, x: int, y: int, n_processors: int, router: Router,
+                 sdram: int, nearest_ethernet_x: int, nearest_ethernet_y: int,
+                 ip_address: Optional[str] = None,
+                 tag_ids: Optional[Iterable[int]] = None,
+                 down_cores: Optional[Collection[int]] = None,
+                 parent_link: Optional[int] = None,
+                 v_to_p_map: Optional[bytes] = None):
         """
         :param int x: the x-coordinate of the chip's position in the
             two-dimensional grid of chips
@@ -52,7 +57,7 @@ def __init__(self, x, y, n_processors, router, sdram, nearest_ethernet_x,
         :param int n_processors:
             the number of processors including monitor processors.
         :param ~spinn_machine.Router router: a router for the chip
-        :param ~spinn_machine.SDRAM sdram: an SDRAM for the chip
+        :param int sdram: an SDRAM for the chip
         :param ip_address:
             the IP address of the chip, or ``None`` if no Ethernet attached
         :type ip_address: str or None
@@ -83,17 +88,19 @@ def __init__(self, x, y, n_processors, router, sdram, nearest_ethernet_x,
         self._sdram = sdram
         self._ip_address = ip_address
         if tag_ids is not None:
-            self._tag_ids = tag_ids
+            self._tag_ids = OrderedSet(tag_ids)
         elif self._ip_address is None:
-            self._tag_ids = []
+            self._tag_ids = OrderedSet()
         else:
             self._tag_ids = self._IPTAG_IDS
         self._nearest_ethernet_x = nearest_ethernet_x
         self._nearest_ethernet_y = nearest_ethernet_y
         self._parent_link = parent_link
         self._v_to_p_map = v_to_p_map
 
-    def __generate_processors(self, n_processors, down_cores):
+    def __generate_processors(
+            self, n_processors: int,
+            down_cores: Optional[Collection[int]]) -> Dict[int, Processor]:
         n_non_user = MachineDataView.get_machine_version().n_non_user_cores
         if down_cores is None:
             if n_processors not in standard_processors:
@@ -120,7 +127,7 @@ def __generate_processors(self, n_processors, down_cores):
                     MachineDataView.get_machine_version().n_non_user_cores)
             return processors
 
-    def is_processor_with_id(self, processor_id):
+    def is_processor_with_id(self, processor_id: int) -> bool:
         """
         Determines if a processor with the given ID exists in the chip.
         Also implemented as ``__contains__(processor_id)``
@@ -131,7 +138,7 @@ def is_processor_with_id(self, processor_id):
         """
         return processor_id in self._p
 
-    def get_processor_with_id(self, processor_id):
+    def get_processor_with_id(self, processor_id: int) -> Optional[Processor]:
         """
         Return the processor with the specified ID, or ``None`` if the
         processor does not exist.
@@ -142,12 +149,10 @@ def get_processor_with_id(self, processor_id):
             or ``None`` if no such processor
         :rtype: Processor or None
         """
-        if processor_id in self._p:
-            return self._p[processor_id]
-        return None
+        return self._p.get(processor_id)
 
     @property
-    def x(self):
+    def x(self) -> int:
         """
         The X-coordinate of the chip in the two-dimensional grid of chips.
 
@@ -156,7 +161,7 @@ def x(self):
         return self._x
 
     @property
-    def y(self):
+    def y(self) -> int:
         """
         The Y-coordinate of the chip in the two-dimensional grid of chips.
 
@@ -165,7 +170,7 @@ def y(self):
         return self._y
 
     @property
-    def processors(self):
+    def processors(self) -> Iterator[Processor]:
         """
         An iterable of available processors.
 
@@ -194,7 +199,7 @@ def get_monitor_ids(self):
                 yield processor.processor_id
 
     @property
-    def n_processors(self):
+    def n_processors(self) -> int:
         """
         The total number of processors.
 
@@ -203,7 +208,7 @@ def n_processors(self):
         return len(self._p)
 
     @property
-    def n_user_processors(self):
+    def n_user_processors(self) -> int:
         """
         The total number of processors that are not monitors.
 
@@ -212,7 +217,7 @@ def n_user_processors(self):
         return self._n_user_processors
 
     @property
-    def router(self):
+    def router(self) -> Router:
         """
         The router object associated with the chip.
 
@@ -221,16 +226,16 @@ def router(self):
         return self._router
 
     @property
-    def sdram(self):
+    def sdram(self) -> int:
         """
         The SDRAM associated with the chip.
 
-        :rtype: SDRAM
+        :rtype: int
         """
         return self._sdram
 
     @property
-    def ip_address(self):
+    def ip_address(self) -> Optional[str]:
         """
         The IP address of the chip, or ``None`` if there is no Ethernet
         connected to the chip.
@@ -240,7 +245,7 @@ def ip_address(self):
         return self._ip_address
 
     @property
-    def nearest_ethernet_x(self):
+    def nearest_ethernet_x(self) -> int:
         """
         The X-coordinate of the nearest Ethernet chip.
 
@@ -249,7 +254,7 @@ def nearest_ethernet_x(self):
         return self._nearest_ethernet_x
 
     @property
-    def nearest_ethernet_y(self):
+    def nearest_ethernet_y(self) -> int:
         """
         The Y-coordinate of the nearest Ethernet chip.
 
@@ -258,15 +263,15 @@ def nearest_ethernet_y(self):
         return self._nearest_ethernet_y
 
     @property
-    def tag_ids(self):
+    def tag_ids(self) -> Iterable[int]:
         """
         The tag IDs supported by this chip.
 
         :rtype: iterable(int)
         """
         return self._tag_ids
 
-    def get_first_none_monitor_processor(self):
+    def get_first_none_monitor_processor(self) -> Optional[Processor]:
         """
         Get the first processor in the list which is not a monitor core.
 
@@ -278,7 +283,7 @@ def get_first_none_monitor_processor(self):
         return None
 
     @property
-    def parent_link(self):
+    def parent_link(self) -> Optional[int]:
         """
         The link down which the parent is found in the tree of chips rooted
         at the machine root chip (probably 0, 0 in most cases).  This will
@@ -288,7 +293,7 @@ def parent_link(self):
         """
         return self._parent_link
 
-    def get_physical_core_id(self, virtual_p):
+    def get_physical_core_id(self, virtual_p: int) -> Optional[int]:
         """
         Get the physical core ID from a virtual core ID.
 
@@ -300,7 +305,7 @@ def get_physical_core_id(self, virtual_p):
             return None
         return self._v_to_p_map[virtual_p]
 
-    def get_physical_core_string(self, virtual_p):
+    def get_physical_core_string(self, virtual_p: int) -> str:
         """
         Get a string that can be appended to a core to show the physical
         core, or an empty string if not possible.
@@ -313,7 +318,7 @@ def get_physical_core_string(self, virtual_p):
             return ""
         return f" (ph: {physical_p})"
 
-    def __iter__(self):
+    def __iter__(self) -> Iterator[Tuple[int, Processor]]:
         """
         Get an iterable of processor identifiers and processors
 
@@ -324,7 +329,7 @@ def __iter__(self):
         """
         return iter(self._p.items())
 
-    def __len__(self):
+    def __len__(self) -> int:
         """
         The number of processors associated with this chip.
 
@@ -333,17 +338,17 @@ def __len__(self):
         """
         return len(self._p)
 
-    def __getitem__(self, processor_id):
+    def __getitem__(self, processor_id: int) -> Processor:
         if processor_id in self._p:
             return self._p[processor_id]
         # Note difference from get_processor_with_id(); this is to conform to
         # standard Python semantics
         raise KeyError(processor_id)
 
-    def __contains__(self, processor_id):
+    def __contains__(self, processor_id: int) -> bool:
         return self.is_processor_with_id(processor_id)
 
-    def __str__(self):
+    def __str__(self) -> str:
         return (
             f"[Chip: x={self._x}, y={self._y}, "
             f"sdram={self.sdram // (1024 * 1024)} MB, "
@@ -352,14 +357,14 @@ def __str__(self):
             f"nearest_ethernet={self._nearest_ethernet_x}:"
             f"{self._nearest_ethernet_y}]")
 
-    def __repr__(self):
+    def __repr__(self) -> str:
         return self.__str__()
 
-    def __eq__(self, other):
+    def __eq__(self, other: Any) -> bool:
         # Equality just on X,Y; that's most useful
         if not isinstance(other, Chip):
             return NotImplemented
         return self._x == other.x and self._y == other.y
 
-    def __hash__(self):
+    def __hash__(self) -> int:
         return self._x * 256 + self._y

spinn_machine/config_setup.py

@@ -21,7 +21,7 @@
 BASE_CONFIG_FILE = "spinn_machine.cfg"
 
 
-def unittest_setup():
+def unittest_setup() -> None:
     """
     Resets the configurations so only the local default configuration is
     included.
@@ -34,7 +34,7 @@ def unittest_setup():
     MachineDataWriter.mock()
 
 
-def add_spinn_machine_cfg():
+def add_spinn_machine_cfg() -> None:
     """
     Add the local configuration and all dependent configuration files.
     """