Merge pull request #478 from SpiNNakerManchester/reduce_overhead_data…

…_spec Reduce overhead data spec
SpiNNakerManchester · Nov 11, 2022 · 2cac744 · 2cac744
2 parents 0ad8bb0 + 17b4811
commit 2cac744
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 175 deletions.
diff --git a/pacman/operations/routing_info_allocator_algorithms/zoned_routing_info_allocator.py b/pacman/operations/routing_info_allocator_algorithms/zoned_routing_info_allocator.py
@@ -218,20 +218,19 @@ def __calculate_zones(self):
                 continue
             max_keys = 0
             for machine_vertex in machine_vertices:
-                if ((identifier, machine_vertex) not in
-                        self.__fixed_partitions):
-                    n_keys = machine_vertex.get_n_keys_for_partition(
-                        identifier)
-                    max_keys = max(max_keys, n_keys)
+                n_keys = machine_vertex.get_n_keys_for_partition(
+                    identifier)
+                max_keys = max(max_keys, n_keys)
 
             if max_keys > 0:
                 atom_bits = self.__bits_needed(max_keys)
-                self.__n_bits_atoms = max(self.__n_bits_atoms, atom_bits)
-                machine_bits = self.__bits_needed(len(machine_vertices))
-                self.__n_bits_machine = max(
-                    self.__n_bits_machine, machine_bits)
-                self.__n_bits_atoms_and_mac = max(
-                    self.__n_bits_atoms_and_mac, machine_bits + atom_bits)
+                if (identifier, pre) not in self.__fixed_partitions:
+                    self.__n_bits_atoms = max(self.__n_bits_atoms, atom_bits)
+                    machine_bits = self.__bits_needed(len(machine_vertices))
+                    self.__n_bits_machine = max(
+                        self.__n_bits_machine, machine_bits)
+                    self.__n_bits_atoms_and_mac = max(
+                        self.__n_bits_atoms_and_mac, machine_bits + atom_bits)
                 self.__atom_bits_per_app_part[pre, identifier] = atom_bits
             else:
                 self.__atom_bits_per_app_part[pre, identifier] = 0

diff --git a/pacman/utilities/algorithm_utilities/__init__.py b/pacman/utilities/algorithm_utilities/__init__.py
@@ -12,7 +12,3 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-from .element_allocator_algorithm import ElementAllocatorAlgorithm
-
-__all__ = ["ElementAllocatorAlgorithm"]
diff --git a/pacman/utilities/algorithm_utilities/element_allocator_algorithm.py b/pacman/utilities/algorithm_utilities/element_allocator_algorithm.py
diff --git a/unittests/operations_tests/routing_info_algorithms_tests/test_zoned_routing_allocator.py b/unittests/operations_tests/routing_info_algorithms_tests/test_zoned_routing_allocator.py
@@ -184,7 +184,9 @@ def create_graphs_only_fixed():
         label="out_mac_vertex", app_vertex=out_app_vertex)
     out_app_vertex.remember_machine_vertex(out_mac_vertex)
 
-    mac_vertex = TestMacVertex(label="mac_vertex", app_vertex=app_vertex)
+    mac_vertex = TestMacVertex(
+        label="mac_vertex", app_vertex=app_vertex,
+        n_keys_required={"Part0": 2, "Part1": 1})
     app_vertex.remember_machine_vertex(mac_vertex)
 
     PacmanDataView.add_edge(