SpiNNakerManchester · rowleya · Nov 5, 2021 · Aug 3, 2021 · Aug 4, 2021 · Aug 5, 2021
diff --git a/spynnaker/pyNN/abstract_spinnaker_common.py b/spynnaker/pyNN/abstract_spinnaker_common.py
diff --git a/spynnaker/pyNN/spynnaker.cfg b/spynnaker/pyNN/spynnaker.cfg
@@ -1,6 +1,4 @@
 [Reports]
-# If reportsEnabled is false, no text reports are written.
-writeSynapticReport = False
 # Note: graphviz is required to draw the graph
 write_network_graph = False
 # Unless specified write_network_graph is ignored for large graphs
@@ -38,13 +36,8 @@ drop_late_spikes = True
 transfer_overhead_clocks = 200
 
 [Mapping]
-# Algorithms below - format is  <algorithm_name>,<>
-
-application_to_machine_graph_algorithms = SplitterReset,DelaySupportAdder,SpynnakerSplitterSelector,SpYNNakerSplitterPartitioner
-machine_graph_to_machine_algorithms = EdgeToNKeysMapper,SpreaderPlacer,NerRouteTrafficAware,BasicTagAllocator,ProcessPartitionConstraints,ZonedRoutingInfoAllocator,BasicRoutingTableGenerator,RouterCollisionPotentialReport
-machine_graph_to_virtual_machine_algorithms = EdgeToNKeysMapper,SpreaderPlacer,NerRouteTrafficAware,BasicTagAllocator,ProcessPartitionConstraints,ZonedRoutingInfoAllocator,BasicRoutingTableGenerator,PairCompressor
-loading_algorithms = PairOnChipRouterCompression
-#loading_algorithms = SpynnakerMachineBitFieldPairRouterCompressor
+# Setting delay_support_adder to None will skip the adder
+delay_support_adder = DelaySupportAdder
 
 [Buffers]
 # Host and port on which to receive buffer requests

diff --git a/spynnaker8/__init__.py b/spynnaker8/__init__.py
@@ -149,7 +149,7 @@
     'external_devices', 'extra_models',
     # Stuff that we define
     'end', 'setup', 'run', 'run_until', 'run_for', 'num_processes', 'rank',
-    'reset', 'set_number_of_neurons_per_core', 'get_projections_data',
+    'reset', 'set_number_of_neurons_per_core',
     'Projection',
     'get_current_time', 'create', 'connect', 'get_time_step', 'get_min_delay',
     'get_max_delay', 'initialize', 'list_standard_models', 'name',
@@ -255,26 +255,11 @@ def distance(src, tgt, mask=None, scale_factor=1.0, offset=0.0,
         src, tgt, mask, scale_factor, offset, periodic_boundaries)
 
 
-def get_projections_data(projection_data):
-    """
-    :param projection_data: the projection to attributes mapping
-    :type projection_data:
-        dict(~.Projection, list(int) or tuple(int) or None)
-    :return: a extracted data object with get method for getting the data
-    :rtype: ExtractedData
-    """
-    return globals_variables.get_simulator().get_projections_data(
-        projection_data)
-
-
 def setup(timestep=_pynn_control.DEFAULT_TIMESTEP,
           min_delay=_pynn_control.DEFAULT_MIN_DELAY,
           max_delay=None,
           graph_label=None,
-          database_socket_addresses=None, extra_algorithm_xml_paths=None,
-          extra_mapping_inputs=None, extra_mapping_algorithms=None,
-          extra_pre_run_algorithms=None, extra_post_run_algorithms=None,
-          extra_load_algorithms=None, time_scale_factor=None,
+          database_socket_addresses=None, time_scale_factor=None,
           n_chips_required=None, n_boards_required=None, **extra_params):
     """ The main method needed to be called to make the PyNN 0.8 setup. Needs\
         to be called before any other function
@@ -294,21 +279,6 @@ def setup(timestep=_pynn_control.DEFAULT_TIMESTEP,
         for the database notification protocol
     :type database_socket_addresses:
         iterable(~spinn_utilities.socket_address.SocketAddress)
-    :param extra_algorithm_xml_paths:
-        list of paths to where other XML are located
-    :type extra_algorithm_xml_paths: list(str) or None
-    :param extra_mapping_inputs: other inputs used by the mapping process
-    :type extra_mapping_inputs: dict(str, Any) or None
-    :param extra_mapping_algorithms:
-        other algorithms to be used by the mapping process
-    :type extra_mapping_algorithms: list(str) or None
-    :param extra_pre_run_algorithms: extra algorithms to use before a run
-    :type extra_pre_run_algorithms: list(str) or None
-    :param extra_post_run_algorithms: extra algorithms to use after a run
-    :type extra_post_run_algorithms: list(str) or None
-    :param extra_load_algorithms:
-        extra algorithms to use within the loading phase
-    :type extra_load_algorithms: list(str) or None
     :param time_scale_factor: multiplicative factor to the machine time step
         (does not affect the neuron models accuracy)
     :type time_scale_factor: int or None
@@ -358,12 +328,6 @@ def setup(timestep=_pynn_control.DEFAULT_TIMESTEP,
     # create the main object for all stuff related software
     SpiNNaker(
         database_socket_addresses=database_socket_addresses,
-        extra_algorithm_xml_paths=extra_algorithm_xml_paths,
-        extra_mapping_inputs=extra_mapping_inputs,
-        extra_mapping_algorithms=extra_mapping_algorithms,
-        extra_pre_run_algorithms=extra_pre_run_algorithms,
-        extra_post_run_algorithms=extra_post_run_algorithms,
-        extra_load_algorithms=extra_load_algorithms,
         time_scale_factor=time_scale_factor, timestep=timestep,
         min_delay=min_delay, graph_label=graph_label,
         n_chips_required=n_chips_required,

diff --git a/spynnaker8/spinnaker.py b/spynnaker8/spinnaker.py
@@ -35,9 +35,6 @@ class SpiNNaker(AbstractSpiNNakerCommon, pynn_control.BaseState):
 
     def __init__(
             self, database_socket_addresses,
-            extra_algorithm_xml_paths, extra_mapping_inputs,
-            extra_mapping_algorithms, extra_pre_run_algorithms,
-            extra_post_run_algorithms, extra_load_algorithms,
             time_scale_factor, min_delay, graph_label,
             n_chips_required=None, n_boards_required=None, timestep=0.1,
             hostname=None):
@@ -58,21 +55,6 @@ def __init__(
         # main pynn interface inheritance
         pynn_control.BaseState.__init__(self)
 
-        # handle the extra load algorithms and the built in ones
-        built_in_extra_load_algorithms = list()
-        if extra_load_algorithms is not None:
-            built_in_extra_load_algorithms.extend(extra_load_algorithms)
-
-        # handle extra xmls and the ones needed by default
-        built_in_extra_xml_paths = list()
-        if extra_algorithm_xml_paths is not None:
-            built_in_extra_xml_paths.extend(extra_algorithm_xml_paths)
-
-        # handle the extra mapping inputs and the built in ones
-        built_in_extra_mapping_inputs = dict()
-        if extra_mapping_inputs is not None:
-            built_in_extra_mapping_inputs.update(extra_mapping_inputs)
-
         front_end_versions = [("sPyNNaker8_version", _version.__version__)]
         front_end_versions.append(("pyNN_version", pynn_version))
         front_end_versions.append(("quantities_version", quantities_version))
@@ -82,12 +64,6 @@ def __init__(
         # SpiNNaker setup
         super(SpiNNaker, self).__init__(
             database_socket_addresses=database_socket_addresses,
-            user_extra_algorithm_xml_path=built_in_extra_xml_paths,
-            user_extra_mapping_inputs=built_in_extra_mapping_inputs,
-            extra_mapping_algorithms=extra_mapping_algorithms,
-            user_extra_algorithms_pre_run=extra_pre_run_algorithms,
-            extra_post_run_algorithms=extra_post_run_algorithms,
-            extra_load_algorithms=built_in_extra_load_algorithms,
             graph_label=graph_label, n_chips_required=n_chips_required,
             n_boards_required=n_boards_required,
             hostname=hostname, min_delay=min_delay,

diff --git a/spynnaker_integration_tests/test_auto_pause_and_resume_tests/too_little_memory/spynnaker.cfg b/spynnaker_integration_tests/test_auto_pause_and_resume_tests/too_little_memory/spynnaker.cfg
@@ -3,6 +3,9 @@
 # 1 atom of IF_curr_exp recording for 1s
 max_sdram_allowed_per_chip = 507106
 
+enable_advanced_monitor_support = True
+enable_reinjection = True
+
 [Buffers]
 # Same as defaults but set here to show difference
 use_auto_pause_and_resume = True

diff --git a/spynnaker_integration_tests/test_debug_mode/check_debug.py b/spynnaker_integration_tests/test_debug_mode/check_debug.py
@@ -23,8 +23,8 @@
 from spinn_front_end_common.utilities.report_functions.\
     routing_table_from_machine_report import _FOLDER_NAME as \
     routing_tables_from_machine_report
-from spinn_front_end_common.utilities.report_functions.energy_report \
-    import EnergyReport
+# from spinn_front_end_common.utilities.report_functions.energy_report \
+#    import EnergyReport
 from spinn_front_end_common.utilities.report_functions.board_chip_report \
     import BoardChipReport
 from spinn_front_end_common.utility_models import \
@@ -44,8 +44,8 @@ def debug(self, run_zero):
         # pylint: disable=protected-access
         reports = [
             # write_energy_report
-            EnergyReport._DETAILED_FILENAME,
-            EnergyReport._SUMMARY_FILENAME,
+            # EnergyReport._DETAILED_FILENAME,
+            # EnergyReport._SUMMARY_FILENAME,
             # write_text_specs = False
             "data_spec_text_files",
             # write_router_reports

diff --git a/spynnaker_integration_tests/test_iobuf/test_cores_and_binaries_recorded/spynnaker.cfg b/spynnaker_integration_tests/test_iobuf/test_cores_and_binaries_recorded/spynnaker.cfg
@@ -5,4 +5,6 @@ extract_iobuf_from_binary_types = IF_curr_exp.aplx,reverse_iptag_multicast_sourc
 clear_iobuf_during_run = True
 
 [Mapping]
-machine_graph_to_machine_algorithms = OneToOnePlacer,NerRoute,BasicTagAllocator,EdgeToNKeysMapper,ProcessPartitionConstraints,MallocBasedRoutingInfoAllocator,BasicRoutingTableGenerator,RouterCollisionPotentialReport
+placer= OneToOnePlacer
+router = NerRoute
+info_allocator= MallocBasedRoutingInfoAllocator
diff --git a/spynnaker_integration_tests/test_iobuf/test_only_cores_recorded/spynnaker.cfg b/spynnaker_integration_tests/test_iobuf/test_only_cores_recorded/spynnaker.cfg
@@ -3,4 +3,6 @@ extract_iobuf = True
 extract_iobuf_from_cores = 0,0,1:0,0,3:1,1,1
 
 [Mapping]
-machine_graph_to_machine_algorithms = OneToOnePlacer,NerRoute,BasicTagAllocator,EdgeToNKeysMapper,ProcessPartitionConstraints,MallocBasedRoutingInfoAllocator,BasicRoutingTableGenerator,RouterCollisionPotentialReport
+placer= OneToOnePlacer
+router = NerRoute
+info_allocator= MallocBasedRoutingInfoAllocator
diff --git a/spynnaker_integration_tests/test_master_pop/spynnaker.cfg b/spynnaker_integration_tests/test_master_pop/spynnaker.cfg
@@ -5,4 +5,6 @@ extract_iobuf_from_binary_types = IF_curr_exp.aplx,reverse_iptag_multicast_sourc
 clear_iobuf_during_run = True
 
 [Mapping]
-machine_graph_to_machine_algorithms = KeyConstraintAdder,OneToOnePlacer,NerRoute,BasicTagAllocator,EdgeToNKeysMapper,ProcessPartitionConstraints,MallocBasedRoutingInfoAllocator,BasicRoutingTableGenerator,RouterCollisionPotentialReport
+placer= OneToOnePlacer
+router = NerRoute
+info_allocator= MallocBasedRoutingInfoAllocator
diff --git a/...integration_tests/test_master_pop/test_master_pop_merging_with_pop_and_delays_mergable.py b/...integration_tests/test_master_pop/test_master_pop_merging_with_pop_and_delays_mergable.py
@@ -12,21 +12,28 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-import os
 
 from spinnaker_testbase import BaseTestCase
 import spynnaker8 as sim
+from spinn_front_end_common.utilities import FecTimer
 from spinn_front_end_common.utilities.globals_variables import get_simulator
-from spynnaker_integration_tests import test_master_pop
+from .key_constraint_adder import KeyConstraintAdder
+
+
+def fancy_do_load(graph_changed):
+    with FecTimer("WEIRD", "KeyConstraintAdder"):
+        simulator = get_simulator()
+        adder = KeyConstraintAdder()
+        adder(simulator.machine_graph)
+    simulator.do_load_normal(graph_changed)
 
 
 def do_run():
     sim.setup(1.0)
     simulator = get_simulator()
-    simulator._xml_paths.append(
-        os.path.join(
-            os.path.dirname(test_master_pop.__file__),
-            "algorithms.xml"))
+    simulator.do_load_normal = simulator._do_load
+    simulator._do_load = fancy_do_load
+
     # Break up the pre population as that is where delays happen
     sim.set_number_of_neurons_per_core(sim.SpikeSourceArray, 50)
     pop1 = sim.Population(100, sim.SpikeSourceArray([1]), label="pop1")

diff --git a/spynnaker_integration_tests/test_onchip_compressor/test_host_bit_field/spynnaker.cfg b/spynnaker_integration_tests/test_onchip_compressor/test_host_bit_field/spynnaker.cfg
@@ -1,2 +1,5 @@
+[Reports]
+write_bit_field_compressor_report = True
+
 [Mapping]
-loading_algorithms = HostBasedBitFieldRouterCompressor,BitFieldCompressorReport
+compressor = HostBasedBitFieldRouterCompressor
diff --git a/spynnaker_integration_tests/test_onchip_compressor/test_ordered_covering/spynnaker.cfg b/spynnaker_integration_tests/test_onchip_compressor/test_ordered_covering/spynnaker.cfg
@@ -1,2 +1,2 @@
 [Mapping]
-loading_algorithms =  OrderedCoveringOnChipRouterCompression
+compressor =  OrderedCoveringOnChipRouterCompression
diff --git a/...er_integration_tests/test_onchip_compressor/test_ordered_covering_bit_field/spynnaker.cfg b/...er_integration_tests/test_onchip_compressor/test_ordered_covering_bit_field/spynnaker.cfg
@@ -1,2 +1,5 @@
+[Reports]
+write_bit_field_compressor_report = True
+
 [Mapping]
-loading_algorithms = SpynnakerMachineBitFieldOrderedCoveringCompressor,BitFieldCompressorReport
+compressor = SpynnakerMachineBitFieldOrderedCoveringCompressor
diff --git a/spynnaker_integration_tests/test_onchip_compressor/test_pair/spynnaker.cfg b/spynnaker_integration_tests/test_onchip_compressor/test_pair/spynnaker.cfg
@@ -1,2 +1,2 @@
 [Mapping]
-loading_algorithms = PairOnChipRouterCompression
+compressor = PairOnChipRouterCompression
diff --git a/spynnaker_integration_tests/test_onchip_compressor/test_pair_bit_field/spynnaker.cfg b/spynnaker_integration_tests/test_onchip_compressor/test_pair_bit_field/spynnaker.cfg
@@ -1,2 +1,5 @@
+[Reports]
+write_bit_field_compressor_report = True
+
 [Mapping]
-loading_algorithms = SpynnakerMachineBitFieldPairRouterCompressor,BitFieldCompressorReport
+compressor = SpynnakerMachineBitFieldPairRouterCompressor
diff --git a/..._integration_tests/test_onchip_compressor/test_pair_bit_field_with_settings/spynnaker.cfg b/..._integration_tests/test_onchip_compressor/test_pair_bit_field_with_settings/spynnaker.cfg
@@ -1,5 +1,8 @@
+[Reports]
+write_bit_field_compressor_report = True
+
 [Mapping]
-loading_algorithms = SpynnakerMachineBitFieldPairRouterCompressor,BitFieldCompressorReport
+compressor = SpynnakerMachineBitFieldPairRouterCompressor
 
 router_table_compression_with_bit_field_retry_count = 4
 router_table_compression_with_bit_field_acceptance_threshold = 10
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,6 +15,7 @@
 
 import os
 import numpy
+import unittest
 import spynnaker8 as p
 from spinnaker_testbase import BaseTestCase
 from spynnaker_integration_tests.scripts import SynfireRunner
@@ -64,5 +65,8 @@ def do_run(self):
             num_chips = row["the_value"]
         self.assertIsNotNone(num_chips, "power provenance was not written")
 
+    @unittest.skip(
+        "https://github.com/SpiNNakerManchester/"
+        "SpiNNFrontEndCommon/issues/866")
     def test_power_monitoring(self):
         self.runsafe(self.do_run)
diff --git a/spynnaker_integration_tests/test_routing_info_allocator/test_basic/spynnaker.cfg b/spynnaker_integration_tests/test_routing_info_allocator/test_basic/spynnaker.cfg
@@ -1,4 +1,4 @@
 [Mapping]
-# Algorithms below - format is  <algorithm_name>,<>
-
-machine_graph_to_machine_algorithms = EdgeToNKeysMapper,OneToOnePlacer,NerRoute,BasicTagAllocator,ProcessPartitionConstraints,MallocBasedRoutingInfoAllocator,BasicRoutingTableGenerator,RouterCollisionPotentialReport
+placer= OneToOnePlacer
+router = NerRoute
+info_allocator= MallocBasedRoutingInfoAllocator
diff --git a/spynnaker_integration_tests/test_routing_info_allocator/test_zoned/spynnaker.cfg b/spynnaker_integration_tests/test_routing_info_allocator/test_zoned/spynnaker.cfg
@@ -1,4 +1,3 @@
 [Mapping]
-# Algorithms below - format is  <algorithm_name>,<>
-
-machine_graph_to_machine_algorithms = EdgeToNKeysMapper,OneToOnePlacer,NerRoute,BasicTagAllocator,ProcessPartitionConstraints,ZonedRoutingInfoAllocator,BasicRoutingTableGenerator,RouterCollisionPotentialReport
+placer= OneToOnePlacer
+router = NerRoute
diff --git a/unittests/test_cfg_checker.py b/unittests/test_cfg_checker.py
@@ -30,11 +30,5 @@ def test_config_checks(self):
         spynnaker = os.path.join(parent, "spynnaker")
         spy8 = os.path.join(parent, "spynnaker8")
         spynnaker_it = os.path.join(parent, "spynnaker_integration_tests")
-        repeaters = [
-            "application_to_machine_graph_algorithms",
-            "machine_graph_to_machine_algorithms",
-            "machine_graph_to_virtual_machine_algorithms",
-            "loading_algorithms"]
         run_config_checks(
-            directories=[spynnaker, spy8, spynnaker_it, unittests],
-            repeaters=repeaters)
+            directories=[spynnaker, spy8, spynnaker_it, unittests])
diff --git a/unittests/test_using_virtual_board/test_index_based_probabliity_connector.py b/unittests/test_using_virtual_board/test_index_based_probabliity_connector.py
@@ -15,17 +15,13 @@
 
 import spynnaker8 as sim
 from spinnaker_testbase import BaseTestCase
-from spynnaker.pyNN.config_setup import unittest_setup
 
 WEIGHT = 5
 DELAY = 2
 
 
 class TestIndexBasedProbabilityConnector(BaseTestCase):
 
-    def setUp(self):
-        unittest_setup()
-
     def check_weights(self, projection, n, expression, allow_self_connections):
         weights = projection.get(["weight"], "list")
         pairs = [(s, d) for (s, d, _) in weights]

diff --git a/unittests/test_using_virtual_board/test_radial_placer/spynnaker.cfg b/unittests/test_using_virtual_board/test_radial_placer/spynnaker.cfg
@@ -12,6 +12,5 @@ version = None
 time_scale_factor = None
 
 [Mapping]
-machine_graph_to_virtual_machine_algorithms = RadialPlacer,NerRoute,BasicTagAllocator,EdgeToNKeysMapper,ProcessPartitionConstraints,MallocBasedRoutingInfoAllocator,BasicRoutingTableGenerator,MundyRouterCompressor
-machine_graph_to_machine_algorithms = RadialPlacer,nerRoute,BasicTagAllocator,EdgeToNKeysMapper,ProcessPartitionConstraints,MallocBasedRoutingInfoAllocator,BasicRoutingTableGenerator
+placer = RadialPlacer