Merge pull request #286 from SpiNNakerManchester/allow_different_part…

…itions Allow different partitions
SpiNNakerManchester · Oct 14, 2024 · d9231af · d9231af
2 parents 4980aa5 + 048ec72
commit d9231af
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 11 deletions.
diff --git a/gfe_examples/Conways/partitioned_example_a_no_vis_no_buffer/conways_basic_cell.py b/gfe_examples/Conways/partitioned_example_a_no_vis_no_buffer/conways_basic_cell.py
@@ -104,8 +104,8 @@ def generate_machine_data_specification(
             label="results")
 
         # write key needed to transmit with
-        key = FecDataView.get_routing_infos().get_first_key_from_pre_vertex(
-            self, self.PARTITION_ID)
+        r_infos = FecDataView.get_routing_infos()
+        key = r_infos.get_single_key_from(self)
 
         spec.switch_write_focus(DataRegions.TRANSMISSIONS)
         spec.write_value(int(key is not None))

diff --git a/gfe_examples/Conways/partitioned_example_b_no_vis_buffer/conways_basic_cell.py b/gfe_examples/Conways/partitioned_example_b_no_vis_buffer/conways_basic_cell.py
@@ -113,8 +113,8 @@ def generate_machine_data_specification(
              FecDataView.get_max_run_time_steps()])
 
         # write key needed to transmit with
-        key = FecDataView.get_routing_infos().get_first_key_from_pre_vertex(
-            self, self.PARTITION_ID)
+        r_infos = FecDataView.get_routing_infos()
+        key = r_infos.get_single_key_from(self)
 
         spec.switch_write_focus(DataRegions.TRANSMISSIONS)
         spec.write_value(int(key is not None))

diff --git a/gfe_examples/live_io/live_io.py b/gfe_examples/live_io/live_io.py
@@ -71,7 +71,7 @@ def receive(label, time, keys):
 front_end.add_socket_address(None, None, conn.local_port)
 
 # Add a sender
-eieio_params = EIEIOParameters(injection_partition_id=sender_partition)
+eieio_params = EIEIOParameters()
 sender = ReverseIPTagMulticastSourceMachineVertex(
     n_keys=n_sender_keys, label="Sender",
     eieio_params=eieio_params)

diff --git a/gfe_examples/live_io/live_io_vertex.py b/gfe_examples/live_io/live_io_vertex.py
@@ -69,8 +69,8 @@ def generate_machine_data_specification(
         spec.switch_write_focus(DataRegions.KEY_DATA)
 
         routing_infos = FecDataView().get_routing_infos()
-        r_info = routing_infos.get_routing_info_from_pre_vertex(
-            placement.vertex, self.__send_partition)
+        r_info = routing_infos.get_single_info_from(
+            placement.vertex)
         if r_info is None:
             spec.write_value(0)
             spec.write_value(0)

diff --git a/gfe_examples/sync_test/sync_test_vertex.py b/gfe_examples/sync_test/sync_test_vertex.py
@@ -82,9 +82,8 @@ def generate_data_specification(
             spec.write_value(0)
         else:
             routing_info = FecDataView.get_routing_infos()
-            key = routing_info.get_first_key_from_pre_vertex(
+            key = routing_info.get_key_from(
                 self, SEND_PARTITION)
-            assert key is not None
             spec.write_value(key)
 
         # End-of-Spec:

diff --git a/gfe_examples/template/template_vertex.py b/gfe_examples/template/template_vertex.py
@@ -111,7 +111,7 @@ def _reserve_app_memory_regions(self, spec):
     def _write_app_memory_regions(self, spec, iptags):
         # Get the key, assuming all outgoing edges use the same key
         routing_info = FecDataView.get_routing_infos()
-        key = routing_info.get_first_key_from_pre_vertex(self, PARTITION_ID)
+        key = routing_info.get_single_key_from(self)
 
         # Write the transmission region
         spec.switch_write_focus(DataRegions.TRANSMISSION)

diff --git a/gfe_integration_tests/test_rte/run_vertex.py b/gfe_integration_tests/test_rte/run_vertex.py
@@ -27,7 +27,7 @@ class RunVertex(
         AbstractGeneratesDataSpecification):
 
     def __init__(self, aplx_file, executable_type):
-        super().__init__(ConstantSDRAM(0))
+        super().__init__(ConstantSDRAM(SIMULATION_N_BYTES))
         self._aplx_file = aplx_file
         self._executable_type = executable_type