Merge pull request #1663 from SpiNNakerManchester/categories

Energy Cleanup

Author: Christian-B

spynnaker/pyNN/spinnaker.py

@@ -325,13 +325,12 @@ def stop(self) -> None:
         """
         End running of the simulation. Notifying each Population of the end.
         """
+        super().stop()
+
         # pylint: disable=protected-access
-        FecTimer.start_category(TimerCategory.SHUTTING_DOWN)
         for population in self.__writer.iterate_populations():
             population._end()
 
-        super().stop()
-
     @staticmethod
     def register_binary_search_path(search_path: str) -> None:
         """
@@ -359,13 +358,17 @@ def _execute_synapse_expander(self) -> None:
         with FecTimer("Synapse expander", TimerWork.SYNAPSE) as timer:
             if timer.skip_if_virtual_board():
                 return
+            FecTimer.start_category(TimerCategory.DATA_SPEC_SYNAPSE)
             synapse_expander()
+            FecTimer.end_category(TimerCategory.DATA_SPEC_SYNAPSE)
 
     def _execute_neuron_expander(self) -> None:
         with FecTimer("Neuron expander", TimerWork.SYNAPSE) as timer:
             if timer.skip_if_virtual_board():
                 return
+            FecTimer.start_category(TimerCategory.DATA_SPEC_SYNAPSE)
             neuron_expander()
+            FecTimer.end_category(TimerCategory.DATA_SPEC_SYNAPSE)
 
     def _execute_finish_connection_holders(self) -> None:
         with FecTimer("Finish connection holders", TimerWork.OTHER):

spynnaker_integration_tests/test_power_monitoring/test_power_mon.py

@@ -37,10 +37,10 @@
 
 class TestPowerMonitoring(BaseTestCase):
 
-    def assert_report(self, n_run: int) -> None:
-        path = get_report_path("path_energy_report", n_run=n_run)
+    def assert_report(self) -> None:
+        path = get_report_path("path_energy_report")
         if not os.path.exists(path):
-            raise AssertionError(f"Unable to find report for run {n_run}")
+            raise AssertionError("Unable to find report")
 
     def do_run(self) -> None:
         synfire_run.do_run(n_neurons, neurons_per_core=neurons_per_core,
@@ -54,9 +54,7 @@ def do_run(self) -> None:
         self.assertIsNotNone(hist, "must have a histogram")
 
         # Did we build the report file like we asked for in config file?
-        self.assert_report(1)
-        self.assert_report(2)
-        self.assert_report(3)
+        self.assert_report()
 
         # Did we output power provenance data, as requested?
         exec_times = set()
@@ -66,7 +64,8 @@ def do_run(self) -> None:
                     "FROM power_provenance "
                     "WHERE description = 'Exec time (seconds)'"):
                 exec_times.add(row[0])
-        self.assertEqual(exec_times, set([0.01, 0.03, 0.06]))
+        # combined
+        self.assertEqual(exec_times, set([0.06]))
 
     def test_power_monitoring(self) -> None:
         self.runsafe(self.do_run)