merged in master

Author: Christian-B

spynnaker/pyNN/models/neural_projections/projection_application_edge.py

@@ -17,8 +17,6 @@
 from typing_extensions import TypeGuard
 from spinn_utilities.overrides import overrides
 from pacman.model.graphs.application import ApplicationEdge
-from spinn_front_end_common.interface.provenance import (
-    AbstractProvidesLocalProvenanceData)
 from spynnaker.pyNN.exceptions import SynapticConfigurationException
 from spynnaker.pyNN.models.utility_models.delays import DelayExtensionVertex
 from spynnaker.pyNN.models.common.population_application_vertex import (
@@ -112,8 +110,7 @@ def are_dynamics_neuromodulation(
     return isinstance(synapse_dynamics, _Dynamics.neuromodulation())
 
 
-class ProjectionApplicationEdge(
-        ApplicationEdge, AbstractProvidesLocalProvenanceData):
+class ProjectionApplicationEdge(ApplicationEdge):
     """
     An edge which terminates on an :py:class:`PopulationVertex`.
     """
@@ -197,8 +194,12 @@ def n_delay_stages(self) -> int:
         return cast(DelayExtensionVertex,
                     self.__delay_edge.pre_vertex).n_delay_stages
 
-    @overrides(AbstractProvidesLocalProvenanceData.get_local_provenance_data)
     def get_local_provenance_data(self) -> None:
+        """
+        Calls get_provenance_data on the connectors
+
+        This calls get_provenance_data on the connector used.
+        """
         for synapse_info in self.synapse_information:
             synapse_info.connector.get_provenance_data(synapse_info)
 

spynnaker/pyNN/spinnaker.py

@@ -26,8 +26,7 @@
 
 
 from spinn_utilities.log import FormatAdapter
-from spinn_utilities.config_holder import (
-    get_config_bool, get_config_str_or_none)
+from spinn_utilities.config_holder import get_config_bool
 from spinn_utilities.overrides import overrides
 
 from spinn_front_end_common.interface.abstract_spinnaker_base import (
@@ -36,7 +35,6 @@
     add_spinnaker_template)
 from spinn_front_end_common.interface.provenance import (
     FecTimer, GlobalProvenance, TimerCategory, TimerWork)
-from spinn_front_end_common.utilities.exceptions import ConfigurationException
 
 from spynnaker import _version
 from spynnaker.pyNN import model_binaries
@@ -54,6 +52,7 @@
     finish_connection_holders)
 from spynnaker.pyNN.extra_algorithms.splitter_components import (
     spynnaker_splitter_selector)
+from spynnaker.pyNN.models.neural_projections import ProjectionApplicationEdge
 from spynnaker.pyNN.utilities.neo_buffer_database import NeoBufferDatabase
 
 
@@ -395,6 +394,17 @@ def _do_provenance_reports(self) -> None:
         AbstractSpinnakerBase._do_provenance_reports(self)
         self._report_redundant_packet_count()
 
+    @overrides(AbstractSpinnakerBase._execute_graph_provenance)
+    def _execute_graph_provenance(self) -> None:
+        with FecTimer("Graph provenance", TimerWork.OTHER) as timer:
+            if timer.skip_if_cfg_false("Reports",
+                                       "read_graph_provenance_data"):
+                return
+            for partition in self._data_writer.iterate_partitions():
+                for edge in partition.edges:
+                    if isinstance(edge, ProjectionApplicationEdge):
+                        edge.get_local_provenance_data()
+
     def _report_redundant_packet_count(self) -> None:
         with FecTimer("Redundant packet count report",
                       TimerWork.REPORT) as timer:
@@ -413,20 +423,15 @@ def _execute_splitter_selector(self) -> None:
     def _execute_delay_support_adder(self) -> None:
         """
         Runs, times and logs the DelaySupportAdder if required.
+                # Check for option removed Jan 2026
         """
-        name = get_config_str_or_none("Mapping", "delay_support_adder")
-        if name is None:
-            return
         with FecTimer("DelaySupportAdder", TimerWork.OTHER):
-            if name == "DelaySupportAdder":
-                d_vertices, d_edges = delay_support_adder()
-                for vertex in d_vertices:
-                    self.__writer.add_vertex(vertex)
-                for edge, partition_id in d_edges:
-                    self.__writer.add_edge(edge, partition_id)
-                return
-            raise ConfigurationException(
-                f"Unexpected cfg setting delay_support_adder: {name}")
+            d_vertices, d_edges = delay_support_adder()
+            for vertex in d_vertices:
+                self.__writer.add_vertex(vertex)
+            for edge, partition_id in d_edges:
+                self.__writer.add_edge(edge, partition_id)
+            return
 
     @overrides(AbstractSpinnakerBase.reset)
     def reset(self) -> None:

spynnaker/pyNN/spynnaker.cfg

@@ -15,6 +15,9 @@ write_network_graph = Debug
 @write_network_graph = Draws a grpah of the network using graphviz (Which most be installed)
 path_network_graph = network_graph.gv
 
+read_graph_provenance_data = Debug
+@read_graph_provenance_data = Reads graph provenance and writes it into the [database](path_data_database)
+
 network_graph_format = None
 @network_graph_format = Format to use to [draw](write_network_graph) a large graph
     Unless specified [draw](write_network_graph) is disabled for large graphs
@@ -60,13 +63,6 @@ n_colour_bits = 4
 error_on_non_spynnaker_pynn = True
 @error_on_non_spynnaker_pynn = Whether to error or just warn on non-spynnaker-compatible PyNN
 
-[Mapping]
-delay_support_adder = DelaySupportAdder
-@delay_support_adder = Algorthm for adding Delay verteices.</br>
-    Currently supported options:
-    * DelaySupportAdder: Adds the standard Delays Vertcies if needed
-    * None: will skip the adder (Not Recommended) </br></br>
-
 [Recording]
 @ = Section for the sending of live spikes.