Merge pull request #588 from SpiNNakerManchester/remove_vertex_union

use AbstractVertex rather than Union

pacman/model/partitioner_splitters/abstract_splitter_common.py

@@ -12,9 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 from typing import (
-    Iterable, Generic, Optional, Sequence, Tuple, TypeVar, Union)
+    Iterable, Generic, Optional, Sequence, Tuple, TypeVar)
 from spinn_utilities.abstract_base import AbstractBase, abstractmethod
 from pacman.exceptions import PacmanConfigurationException
+from pacman.model.graphs import AbstractVertex
 from pacman.model.graphs.application import ApplicationVertex
 from pacman.utilities.utility_objs import ChipCounter
 from pacman.model.graphs.common import Slice
@@ -150,8 +151,7 @@ def get_in_coming_vertices(
     def get_source_specific_in_coming_vertices(
             self, source_vertex: ApplicationVertex,
             partition_id: str) -> Sequence[Tuple[
-                MachineVertex, Sequence[
-                    Union[MachineVertex, ApplicationVertex]]]]:
+                MachineVertex, Sequence[AbstractVertex]]]:
         """
         Get machine post-vertices for a given source.
 
@@ -171,9 +171,6 @@ def get_source_specific_in_coming_vertices(
         :param str partition_id: The identifier of the incoming partition
         :return: A list of tuples of (target machine vertex, list of source
             machine or application vertices that should hit the target)
-        :rtype: list(tuple(~pacman.model.graphs.machine.MachineVertex,
-            list(~pacman.model.graphs.machine.MachineVertex or
-            ~pacman.model.graphs.application.ApplicationVertex)))
         """
         return [(m_vertex, [source_vertex])
                 for m_vertex in self.get_in_coming_vertices(partition_id)]

pacman/model/routing_info/vertex_routing_info.py

@@ -11,14 +11,13 @@
 # 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 Optional, Union
+from typing import Optional
 import numpy
 
 from spinn_utilities.abstract_base import abstractmethod, AbstractBase
 
 from pacman.exceptions import PacmanConfigurationException
-from pacman.model.graphs.application import ApplicationVertex
-from pacman.model.graphs.machine import MachineVertex
+from pacman.model.graphs import AbstractVertex
 
 from .base_key_and_mask import BaseKeyAndMask
 
@@ -106,7 +105,7 @@ def partition_id(self) -> str:
 
     @property
     @abstractmethod
-    def vertex(self) -> Union[ApplicationVertex, MachineVertex]:
+    def vertex(self) -> AbstractVertex:
         """
         The vertex of the information.
 

pacman/operations/router_algorithms/application_router.py

@@ -14,13 +14,14 @@
 
 from collections import deque, defaultdict
 from typing import (
-    Deque, Dict, Iterable, Iterator, List, Optional, Set, Tuple, Union)
+    Deque, Dict, Iterable, Iterator, List, Optional, Set, Tuple)
 from typing_extensions import TypeAlias
 from spinn_utilities.progress_bar import ProgressBar
 from spinn_utilities.typing.coords import XY
 from spinn_machine import Machine, RoutingEntry
 from pacman.data import PacmanDataView
 from pacman.exceptions import PacmanRoutingException
+from pacman.model.graphs import AbstractVertex
 from pacman.model.routing_table_by_partition import (
     MulticastRoutingTableByPartition)
 from pacman.utilities.algorithm_utilities.routing_algorithm_utilities import (
@@ -31,10 +32,9 @@
 from pacman.model.graphs.machine import MachineVertex, MulticastEdgePartition
 from pacman.model.graphs import AbstractEdgePartition
 
-_AnyVertex: TypeAlias = Union[ApplicationVertex, MachineVertex]
 _Node: TypeAlias = Tuple[int, XY]
 _OptInt: TypeAlias = Optional[int]
-_MappedSrc: TypeAlias = Tuple[_AnyVertex, _OptInt, _OptInt]
+_MappedSrc: TypeAlias = Tuple[AbstractVertex, _OptInt, _OptInt]
 
 
 class _Targets(object):
@@ -45,10 +45,10 @@ class _Targets(object):
 
     def __init__(self) -> None:
         self.__targets_by_source: Dict[
-            _AnyVertex, Tuple[List[int], List[int]]] = defaultdict(
+            AbstractVertex, Tuple[List[int], List[int]]] = defaultdict(
                 lambda: (list(), list()))
 
-    def ensure_source(self, source_vertex: _AnyVertex) -> None:
+    def ensure_source(self, source_vertex: AbstractVertex) -> None:
         """
         Ensure that a source exists, even if it targets nothing.
 
@@ -60,7 +60,8 @@ def ensure_source(self, source_vertex: _AnyVertex) -> None:
 
     def add_sources_for_target(
             self, core: _OptInt, link: _OptInt,
-            source_vertices: Iterable[_AnyVertex], partition_id: str) -> None:
+            source_vertices: Iterable[AbstractVertex],
+            partition_id: str) -> None:
         """
         Add a set of vertices that target a given core or link.
 
@@ -78,14 +79,17 @@ def add_sources_for_target(
                     self.__add_m_vertices(vertex, partition_id, core, link)
                 else:
                     self.__add_source(vertex, core, link)
-            else:
+            elif isinstance(vertex, MachineVertex):
                 if vertex.app_vertex in self.__targets_by_source:
                     self.__replace_app_vertex(vertex.app_vertex, partition_id)
                 self.__add_source(vertex, core, link)
+            else:
+                raise TypeError(f"Unexpected {vertex=}")
 
     def add_machine_sources_for_target(
             self, core: _OptInt, link: _OptInt,
-            source_vertices: Iterable[_AnyVertex], partition_id: str) -> None:
+            source_vertices: Iterable[AbstractVertex],
+            partition_id: str) -> None:
         """
         Add a set of machine vertices that target a given core or link.
 
@@ -102,10 +106,12 @@ def add_machine_sources_for_target(
                 if vertex in self.__targets_by_source:
                     self.__replace_app_vertex(vertex, partition_id)
                 self.__add_m_vertices(vertex, partition_id, core, link)
-            else:
+            elif isinstance(vertex, MachineVertex):
                 if vertex.app_vertex in self.__targets_by_source:
                     self.__replace_app_vertex(vertex.app_vertex, partition_id)
                 self.__add_source(vertex, core, link)
+            else:
+                raise TypeError(f"Unexpected {vertex=}")
 
     def __is_m_vertex(
             self, vertex: ApplicationVertex, partition_id: str) -> bool:
@@ -144,8 +150,8 @@ def __add_m_vertices(
         for vtx in vertex.splitter.get_out_going_vertices(partition_id):
             self.__add_source(vtx, core, link)
 
-    def __add_source(
-            self, source: _AnyVertex, core: _OptInt, link: _OptInt) -> None:
+    def __add_source(self, source: AbstractVertex, core: _OptInt,
+                     link: _OptInt) -> None:
         """
         :param source:
         :param core:
@@ -159,7 +165,7 @@ def __add_source(
 
     @property
     def targets_by_source(self) -> Iterable[
-            Tuple[_AnyVertex, Tuple[List[int], List[int]]]]:
+            Tuple[AbstractVertex, Tuple[List[int], List[int]]]]:
         """
         List of (source, (list of cores, list of links)) to target.
 
@@ -168,8 +174,8 @@ def targets_by_source(self) -> Iterable[
         """
         return self.__targets_by_source.items()
 
-    def get_targets_for_source(self, vertex: _AnyVertex) -> Tuple[
-            _AnyVertex, Tuple[List[int], List[int]]]:
+    def get_targets_for_source(self, vertex: AbstractVertex) -> Tuple[
+            AbstractVertex, Tuple[List[int], List[int]]]:
         """
         Get the cores and links for a specific source.
 
@@ -916,7 +922,7 @@ def _find_path(
 
 def _convert_a_route(
         routing_tables: MulticastRoutingTableByPartition,
-        source_vertex: _AnyVertex, partition_id: str,
+        source_vertex: AbstractVertex, partition_id: str,
         first_incoming_processor: _OptInt, first_incoming_link: _OptInt,
         first_route: RoutingTree, targets: Dict[XY, _Targets],
         use_source_for_targets: bool = False,
@@ -964,7 +970,7 @@ def _convert_a_route(
         if (x, y) in targets:
             chip_targets = targets[x, y]
             targets_by_source: Iterable[
-                Tuple[_AnyVertex, Tuple[List[int], List[int]]]]
+                Tuple[AbstractVertex, Tuple[List[int], List[int]]]]
             if use_source_for_targets:
                 targets_by_source = [
                     chip_targets.get_targets_for_source(source_vertex)]
@@ -978,8 +984,11 @@ def _convert_a_route(
             for (source, (add_cores, add_links)) in targets_by_source:
                 if isinstance(source, ApplicationVertex):
                     app_vertex_source = True
-                else:
+                elif isinstance(source, MachineVertex):
                     machine_vertex_sources.add(source)
+                else:
+                    raise TypeError(f"Unexpected vertex {source}")
+
                 entry = RoutingEntry(
                     link_ids=link_ids + add_links,
                     processor_ids=processor_ids + add_cores,
@@ -1016,7 +1025,7 @@ def _add_routing_entry(
         first_route: RoutingTree,
         routing_tables: MulticastRoutingTableByPartition,
         entry: RoutingEntry,
-        x: int, y: int, source: _AnyVertex, partition_id: str) -> None:
+        x: int, y: int, source: AbstractVertex, partition_id: str) -> None:
     try:
         routing_tables.add_path_entry(entry, x, y, source, partition_id)
     except Exception as e: