Merge pull request #428 from SpiNNakerManchester/constraints

Constraints
SpiNNakerManchester · Mar 31, 2022 · 4ef3f23 · 4ef3f23
2 parents e50b18c + da7a002
commit 4ef3f23
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/pacman/operations/placer_algorithms/radial_placer.py b/pacman/operations/placer_algorithms/radial_placer.py
@@ -65,7 +65,9 @@ def _run(self, machine_graph, machine, plan_n_timesteps):
             If something goes wrong with the placement
         """
         # check that the algorithm can handle the constraints
-        self._check_constraints(machine_graph.vertices)
+        self._check_constraints(
+            machine_graph.vertices,
+            additional_placement_constraints={SameChipAsConstraint})
 
         placements = Placements()
         vertices = sort_vertices_by_known_constraints(machine_graph.vertices)
@@ -87,11 +89,10 @@ def _run(self, machine_graph, machine, plan_n_timesteps):
 
     def _check_constraints(
             self, vertices, additional_placement_constraints=None):
-        placement_constraints = {
-            RadialPlacementFromChipConstraint, SameChipAsConstraint
-        }
         if additional_placement_constraints is not None:
-            placement_constraints.update(additional_placement_constraints)
+            placement_constraints = additional_placement_constraints
+        else:
+            placement_constraints = {}
         ResourceTracker.check_constraints(
             vertices, additional_placement_constraints=placement_constraints)
 

diff --git a/unittests/operations_tests/placer_algorithms_tests/test_same_chip_constraint.py b/unittests/operations_tests/placer_algorithms_tests/test_same_chip_constraint.py
@@ -17,13 +17,13 @@
 import unittest
 from spinn_machine import virtual_machine
 from pacman.config_setup import unittest_setup
-from pacman.exceptions import PacmanAlreadyPlacedError
 from pacman.model.graphs.machine import MachineGraph, SimpleMachineVertex
 from pacman.model.resources import ResourceContainer
 from pacman.model.constraints.placer_constraints import SameChipAsConstraint
 from pacman.model.routing_info import DictBasedMachinePartitionNKeysMap
 from pacman.operations.placer_algorithms import (
     connective_based_placer, one_to_one_placer, radial_placer, spreader_placer)
+from pacman.exceptions import PacmanInvalidParameterException
 
 
 class TestSameChipConstraint(unittest.TestCase):
@@ -84,11 +84,8 @@ def _do_test(self, placer):
                         "Vertex was not placed on the same chip as requested")
 
     def test_connective_based(self):
-        try:
+        with self.assertRaises(PacmanInvalidParameterException):
             self._do_test("ConnectiveBasedPlacer")
-        except PacmanAlreadyPlacedError:
-            raise unittest.SkipTest(
-                "https://github.com/SpiNNakerManchester/PACMAN/issues/406")
 
     def test_one_to_one(self):
         self._do_test("OneToOnePlacer")