Merge pull request #1522 from SpiNNakerManchester/temp

cleaner test for multiple energy
SpiNNakerManchester · Jan 3, 2025 · 8b0a841 · 8b0a841
2 parents 272da6f + 1b39e29
commit 8b0a841
Showing 1 changed file with 14 additions and 13 deletions.
diff --git a/spynnaker_integration_tests/test_power_monitoring/test_power_mon.py b/spynnaker_integration_tests/test_power_monitoring/test_power_mon.py
@@ -15,7 +15,6 @@
 import os
 import numpy
 import sqlite3
-import unittest
 import pyNN.spiNNaker as p
 from spinn_front_end_common.interface.provenance import ProvenanceReader
 from spinn_front_end_common.utilities.report_functions import EnergyReport
@@ -25,7 +24,7 @@
 
 n_neurons = 200  # number of neurons in each population
 neurons_per_core = n_neurons / 2
-run_times = [5000]
+run_times = [10, 20, 30]
 # parameters for population 1 first run
 input_class = p.SpikeSourcePoisson
 start_time = 0
@@ -52,19 +51,21 @@ def do_run(self):
         hist = numpy.histogram(spikes[:, 1], bins=[0, 5000, 10000])
         self.assertIsNotNone(hist, "must have a histogram")
         # Did we build the report file like we asked for in config file?
-        self.assertIn(EnergyReport._SUMMARY_FILENAME,
+        self.assertIn(EnergyReport.file_name(1),
+                      os.listdir(SpynnakerDataView.get_run_dir_path()))
+        self.assertIn(EnergyReport.file_name(2),
+                      os.listdir(SpynnakerDataView.get_run_dir_path()))
+        self.assertIn(EnergyReport.file_name(3),
                       os.listdir(SpynnakerDataView.get_run_dir_path()))
         # Did we output power provenance data, as requested?
-        num_chips = None
-        for row in self.query_provenance(
-                "SELECT the_value "
-                "FROM power_provenance "
-                "WHERE description = 'Num_chips' LIMIT 1"):
-            num_chips = row["the_value"]
-        self.assertIsNotNone(num_chips, "power provenance was not written")
+        exec_times = set()
+        with ProvenanceReader() as reader:
+            for row in reader.cursor().execute(
+                    "SELECT the_value "
+                    "FROM power_provenance "
+                    "WHERE description = 'Exec time (seconds)'"):
+                exec_times.add(row[0])
+        self.assertEqual(exec_times, set([0.01, 0.03, 0.06]))
 
-    @unittest.skip(
-        "https://github.com/SpiNNakerManchester/"
-        "SpiNNFrontEndCommon/issues/866")
     def test_power_monitoring(self):
         self.runsafe(self.do_run)