Merge branch 'no_tma' into roc_part

# Conflicts:
#	spinn_front_end_common/abstract_models/impl/tdma_aware_application_vertex.py

spinn_front_end_common/abstract_models/impl/__init__.py

@@ -14,7 +14,5 @@
 
 from .machine_allocation_controller import MachineAllocationController
 from .machine_data_specable_vertex import MachineDataSpecableVertex
-from .tdma_aware_application_vertex import TDMAAwareApplicationVertex
 
-__all__ = ["MachineAllocationController", "MachineDataSpecableVertex",
-           "TDMAAwareApplicationVertex"]
+__all__ = ["MachineAllocationController", "MachineDataSpecableVertex"]

spinn_front_end_common/interface/abstract_spinnaker_base.py

@@ -88,8 +88,7 @@
     insert_chip_power_monitors_to_graphs,
     insert_extra_monitor_vertices_to_graphs, split_lpg_vertices,
     load_app_images, load_fixed_routes, load_sys_images,
-    local_tdma_builder, locate_executable_start_type,
-    machine_generator,
+    locate_executable_start_type, machine_generator,
     placements_provenance_gatherer, profile_data_gatherer,
     read_routing_tables_from_machine, router_provenance_gatherer,
     routing_setup, routing_table_loader,
@@ -953,13 +952,6 @@ def _report_partitioner(self):
                 return
             partitioner_report()
 
-    def _execute_local_tdma_builder(self):
-        """
-        Runs times and logs the LocalTDMABuilder.
-        """
-        with FecTimer("Local TDMA builder", TimerWork.OTHER):
-            local_tdma_builder()
-
     def _execute_application_placer(self, system_placements):
         """
         Runs, times and logs the Application Placer.
@@ -1395,7 +1387,6 @@ def _do_mapping(self, total_run_time):
         self._execute_insert_extra_monitor_vertices(system_placements)
 
         self._report_partitioner()
-        self._execute_local_tdma_builder()
         self._do_placer(system_placements)
         self._report_placements_with_application_graph()
         self._json_placements()

spinn_front_end_common/interface/interface_functions/__init__.py

@@ -41,7 +41,6 @@
 from .split_lpg_vertices import split_lpg_vertices
 from .load_executable_images import load_app_images, load_sys_images
 from .load_fixed_routes import load_fixed_routes
-from .local_tdma_builder import local_tdma_builder
 from .locate_executable_start_type import locate_executable_start_type
 from .machine_generator import machine_generator
 from .create_notification_protocol import create_notification_protocol
@@ -74,7 +73,7 @@
     "insert_extra_monitor_vertices_to_graphs",
     "split_lpg_vertices",
     "load_app_images", "load_fixed_routes", "load_sys_images",
-    "local_tdma_builder", "locate_executable_start_type",
+    "locate_executable_start_type",
     "machine_generator", "placements_provenance_gatherer",
     "profile_data_gatherer",
     "read_routing_tables_from_machine", "router_provenance_gatherer",