Merge branch 'master' into no_java_skip

Author: Christian-B

spinn_front_end_common/interface/abstract_spinnaker_base.py

@@ -99,8 +99,7 @@
     reload_dsg_regions, energy_provenance_reporter,
     load_application_data_specs, load_system_data_specs,
     graph_binary_gatherer, graph_data_specification_writer,
-    graph_provenance_gatherer, hbp_allocator,
-    insert_chip_power_monitors_to_graphs,
+    hbp_allocator, insert_chip_power_monitors_to_graphs,
     insert_extra_monitor_vertices_to_graphs, split_lpg_vertices,
     load_app_images, load_fixed_routes, load_sys_images,
     locate_executable_start_type,
@@ -1751,15 +1750,11 @@ def _execute_dsg_region_reloader(self) -> None:
                 return
             reload_dsg_regions()
 
-    def _execute_graph_provenance_gatherer(self) -> None:
+    def _execute_graph_provenance(self) -> None:
         """
-        Runs, times and log the GraphProvenanceGatherer if requested.
+        Runs, times and log and graph provenance if needed
         """
-        with FecTimer("Graph provenance gatherer", TimerWork.OTHER) as timer:
-            if timer.skip_if_cfg_false("Reports",
-                                       "read_graph_provenance_data"):
-                return
-            graph_provenance_gatherer()
+        # Will be overridden by sPyNNaker
 
     def _execute_placements_provenance_gatherer(self) -> None:
         """
@@ -1818,7 +1813,7 @@ def _do_read_provenance(self) -> None:
         """
         Runs, times and log the methods that gather provenance.
         """
-        self._execute_graph_provenance_gatherer()
+        self._execute_graph_provenance()
         self._execute_placements_provenance_gatherer()
         self._execute_profile_data_gatherer()
 

spinn_front_end_common/interface/interface_functions/__init__.py

@@ -28,7 +28,6 @@
 from .graph_binary_gatherer import graph_binary_gatherer
 from .graph_data_specification_writer import (
     graph_data_specification_writer)
-from .graph_provenance_gatherer import graph_provenance_gatherer
 from .hbp_allocator import hbp_allocator
 from .load_data_specification import (
     load_application_data_specs, load_system_data_specs,
@@ -64,7 +63,6 @@
     "load_system_data_specs", "load_using_advanced_monitors",
     "FindApplicationChipsUsed",
     "graph_binary_gatherer", "graph_data_specification_writer",
-    "graph_provenance_gatherer",
     "hbp_allocator",
     "insert_chip_power_monitors_to_graphs",
     "insert_extra_monitor_vertices_to_graphs",

spinn_front_end_common/interface/interface_functions/graph_provenance_gatherer.py

@@ -12,8 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from .abstract_provides_local_provenance_data import (
-    AbstractProvidesLocalProvenanceData)
 from .abstract_provides_provenance_data_from_machine import (
     AbstractProvidesProvenanceDataFromMachine)
 from .fec_timer import FecTimer
@@ -26,8 +24,7 @@
 from .timer_category import TimerCategory
 from .timer_work import TimerWork
 
-__all__ = ("AbstractProvidesLocalProvenanceData", "FecTimer",
-           "GlobalProvenance",
+__all__ = ("FecTimer", "GlobalProvenance",
            "AbstractProvidesProvenanceDataFromMachine", "LogStoreDB",
            "ProvenanceReader", "ProvenanceWriter",
            "ProvidesProvenanceDataFromMachineImpl",

spinn_front_end_common/interface/provenance/__init__.py

@@ -71,8 +71,6 @@ path_network_specification_report = network_specification.rpt
 # provenance goes into the database
 read_router_provenance_data = Debug
 @read_router_provenance_data = Reads router provenance and writes it into the [database](path_data_database)
-read_graph_provenance_data = Debug
-@read_graph_provenance_data = Reads graph provenance and writes it into the [database](path_data_database)
 read_placements_provenance_data = Debug
 @read_placements_provenance_data = Reads placements provenance and writes it into the [database](path_data_database)
 read_profile_data = Debug

spinn_front_end_common/interface/provenance/abstract_provides_local_provenance_data.py

@@ -136,7 +136,7 @@ def add_application_vertices(self) -> None:
         for vertex in FecDataView.iterate_vertices():
             vertex_id = self.__insert(
                 "INSERT INTO Application_vertices(vertex_label) VALUES(?)",
-                vertex.label)
+                str(vertex.label))
             self.__vertex_to_id[vertex] = vertex_id
             for m_vertex in vertex.machine_vertices:
                 m_vertex_id = self.__add_machine_vertex(m_vertex)