Merge branch 'master' into list_map

Author: Christian-B

fec_integration_tests/interface/interface_functions/test_database_interface.py

@@ -26,8 +26,8 @@
 from pacman.model.resources import ConstantSDRAM
 from pacman.model.placements import Placements, Placement
 from pacman.model.routing_info import (
-    RoutingInfo, MachineVertexRoutingInfo, AppVertexRoutingInfo)
-from pacman.model.routing_info.base_key_and_mask import BaseKeyAndMask
+    RoutingInfo,
+    GlobalAppVertexRoutingInfo, GlobalMachineVertexRoutingInfo, BaseKeyAndMask)
 from pacman.model.tags.tags import Tags
 from pacman.model.partitioner_splitters import AbstractSplitterCommon
 from pacman.model.graphs.common.slice import Slice
@@ -106,14 +106,15 @@ def _add_rinfo(
         app_vertex: ApplicationVertex, partition_id: str,
         routing_info: RoutingInfo, base_key: int, app_mask: int, mac_mask: int,
         m_vertex_shift: int) -> None:
-    routing_info.add_routing_info(AppVertexRoutingInfo(
-        BaseKeyAndMask(base_key, app_mask), partition_id, app_vertex,
-        mac_mask, 1, 1))
+    bkma = BaseKeyAndMask(base_key, app_mask)
+    routing_info.add_routing_info(GlobalAppVertexRoutingInfo(
+        bkma, partition_id, app_vertex, len(app_vertex.machine_vertices),
+        mac_mask))
     for i, m_vertex in enumerate(app_vertex.machine_vertices):
-        routing_info.add_routing_info(MachineVertexRoutingInfo(
-            BaseKeyAndMask(
-                base_key | i << m_vertex_shift, app_mask | mac_mask),
-            partition_id, m_vertex, i))
+        m_key = base_key | i << m_vertex_shift
+        bkmm = BaseKeyAndMask(m_key, app_mask | mac_mask)
+        routing_info.add_routing_info(GlobalMachineVertexRoutingInfo(
+            bkmm, partition_id, m_vertex, i, app_mask))
 
 
 def _place_vertices(app_vertexes: List[ApplicationVertex],

spinn_front_end_common/interface/abstract_spinnaker_base.py

@@ -76,7 +76,7 @@
 from pacman.operations.router_compressors.ordered_covering_router_compressor \
     import ordered_covering_compressor
 from pacman.operations.routing_info_allocator_algorithms.\
-    zoned_routing_info_allocator import (flexible_allocate, global_allocate)
+    zoned_routing_info_allocator import ZonedRoutingInfoAllocator
 from pacman.operations.routing_table_generators import (
     basic_routing_table_generator, merged_routing_table_generator)
 from pacman.operations.tag_allocator_algorithms import basic_tag_allocator
@@ -1017,41 +1017,7 @@ def _report_tag_allocations(self) -> None:
             tag_allocator_report()
 
     @final
-    def _execute_global_allocate(
-            self, extra_allocations: Iterable[
-                Tuple[ApplicationVertex, str]]) -> None:
-        """
-        Runs, times and logs the Global Zoned Routing Info Allocator.
-
-        Sets "routing_info" is called
-
-        .. note::
-            Calling of this method is based on the configuration
-            info_allocator value
-        """
-        with FecTimer("Global allocate", TimerWork.OTHER):
-            self._data_writer.set_routing_infos(
-                global_allocate(extra_allocations))
-
-    @final
-    def _execute_flexible_allocate(
-            self, extra_allocations: Iterable[
-                Tuple[ApplicationVertex, str]]) -> None:
-        """
-        Runs, times and logs the Zoned Routing Info Allocator.
-
-        Sets "routing_info" is called
-
-        .. note::
-            Calling of this method is based on the configuration
-            info_allocator value
-        """
-        with FecTimer("Zoned routing info allocator", TimerWork.OTHER):
-            self._data_writer.set_routing_infos(
-                flexible_allocate(extra_allocations))
-
-    @final
-    def _do_info_allocator(self) -> None:
+    def _execute_info_allocator(self) -> None:
         """
         Runs, times and logs one of the info allocators.
 
@@ -1067,14 +1033,20 @@ def _do_info_allocator(self) -> None:
         """
         name = get_config_str("Mapping", "info_allocator")
         if name == "GlobalZonedRoutingInfoAllocator":
-            return self._execute_global_allocate([])
+            logger.warning("GlobalZonedRoutingInfoAllocator is deprecated. "
+                           "Please change cfg Mapping info_allocator to "
+                           "ZonedRoutingInfoAllocator")
+            name = "ZonedRoutingInfoAllocator"
         if name == "ZonedRoutingInfoAllocator":
-            return self._execute_flexible_allocate([])
-        if "," in name:
+            with FecTimer("Zoned routing info allocator", TimerWork.OTHER):
+                self._data_writer.set_routing_infos(
+                    ZonedRoutingInfoAllocator().allocate())
+        elif "," in name:
             raise ConfigurationException(
                 "Only a single algorithm is supported for info_allocator")
-        raise ConfigurationException(
-            f"Unexpected cfg setting info_allocator: {name}")
+        else:
+            raise ConfigurationException(
+                f"Unexpected cfg setting info_allocator: {name}")
 
     def _report_router_info(self) -> None:
         """
@@ -1280,7 +1252,7 @@ def _stage_mapping(self, total_run_time: Optional[float],
         self._execute_basic_tag_allocator()
         self._report_tag_allocations()
 
-        self._do_info_allocator()
+        self._execute_info_allocator()
         self._report_router_info()
         self._do_routing_table_generator()
         self._report_uncompressed_routing_table()