Reduce overhead

pacman/model/constraints/key_allocator_constraints/__init__.py

@@ -15,14 +15,8 @@
 
 from .abstract_key_allocator_constraint import AbstractKeyAllocatorConstraint
 from .contiguous_key_range_constraint import ContiguousKeyRangeContraint
-from .fixed_key_field_constraint import FixedKeyFieldConstraint
 from .fixed_key_and_mask_constraint import FixedKeyAndMaskConstraint
-from .fixed_mask_constraint import FixedMaskConstraint
-from .share_key_constraint import ShareKeyConstraint
 
 __all__ = ["AbstractKeyAllocatorConstraint",
            "ContiguousKeyRangeContraint",
-           "FixedKeyFieldConstraint",
-           "FixedKeyAndMaskConstraint",
-           "FixedMaskConstraint",
-           "ShareKeyConstraint"]
+           "FixedKeyAndMaskConstraint"]

pacman/model/constraints/key_allocator_constraints/fixed_key_and_mask_constraint.py

@@ -30,30 +30,21 @@ class FixedKeyAndMaskConstraint(AbstractKeyAllocatorConstraint):
         # The key and mask combinations to fix
         "_keys_and_masks",
 
-        #  Optional function which will be called to translate the
-        # keys_and_masks list into individual keys If missing, the keys will
-        # be generated by iterating through the keys_and_masks list directly.
-        #  The function parameters are:
-        #           An iterable of keys and masks
-        #           A machine edge
-        #           Number of keys to generate (may be None)
-        "_key_list_function"
+        # The identifier of the partition to which this applies, or None
+        # if only one partition is expected
+        "_partition"
 
     ]
 
-    def __init__(self, keys_and_masks, key_list_function=None):
+    def __init__(self, keys_and_masks, partition=None):
         """
         :param iterable(BaseKeyAndMask) keys_and_masks:
             The key and mask combinations to fix
-        :param key_list_function: Optional function which will be called to\
-            translate the `keys_and_masks` list into individual keys. If\
-            missing, the keys will be generated by iterating through the \
-            `keys_and_masks` list directly. The function parameters are:
-            * An iterable of keys and masks
-            * A machine edge
-            * Number of keys to generate (may be None)
-        :type key_list_function: callable(iterable(tuple(
-            BaseKeyAndMask, MachineEdge, int)), iterable(int))
+        :param partition:
+            The identifier of the partition to which this constraint applies,
+            or None if it applies to all partitions (meaning there is only
+            one partition expected)
+        :type partition: str or None
         """
         for keys_and_mask in keys_and_masks:
             if not isinstance(keys_and_mask, BaseKeyAndMask):
@@ -62,7 +53,7 @@ def __init__(self, keys_and_masks, key_list_function=None):
                     "a key_and_mask object")
 
         self._keys_and_masks = keys_and_masks
-        self._key_list_function = key_list_function
+        self._partition = partition
 
     @property
     def keys_and_masks(self):
@@ -74,26 +65,31 @@ def keys_and_masks(self):
         return self._keys_and_masks
 
     @property
-    def key_list_function(self):
-        """ A function to call to generate the keys
+    def partition(self):
+        """ The identifier of the partition to which this constraint applies,
+            or None if it applies to the only expected partition
 
-        :return: A python function, or None if the default function can be used
-        :rtype: callable(iterable(tuple(BaseKeyAndMask, MachineEdge, int)),
-            iterable(int))
+        :rtype: str or None
         """
-        return self._key_list_function
+        return self._partition
+
+    def applies_to_partition(self, partition):
+        """ Determine if this applies to the given partition identifier or not
+
+        :param str partition: The identifier of the partition to check
+        :rtype: bool
+        """
+        return self._partition is None or self._partition == partition
 
     def __repr__(self):
         return (
             "FixedKeyAndMaskConstraint("
-            "keys_and_masks={}, key_list_function={})".format(
-                self._keys_and_masks, self.key_list_function))
+            "keys_and_masks={}, partition={})".format(
+                self._keys_and_masks, self._partition))
 
     def __eq__(self, other):
         if not isinstance(other, FixedKeyAndMaskConstraint):
             return False
-        if other.key_list_function != self._key_list_function:
-            return False
         if len(self._keys_and_masks) != len(other.keys_and_masks):
             return False
         return all(km in other.keys_and_masks for km in self._keys_and_masks)
@@ -102,6 +98,4 @@ def __ne__(self, other):
         return not self.__eq__(other)
 
     def __hash__(self):
-        return (
-            frozenset(self._keys_and_masks),
-            self._key_list_function).__hash__()
+        return frozenset(self._keys_and_masks).__hash__()

pacman/model/constraints/partitioner_constraints/__init__.py

@@ -14,7 +14,5 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from .abstract_partitioner_constraint import AbstractPartitionerConstraint
-from .same_atoms_as_vertex_constraint import SameAtomsAsVertexConstraint
 
-__all__ = ["AbstractPartitionerConstraint",
-           "SameAtomsAsVertexConstraint"]
+__all__ = ["AbstractPartitionerConstraint"]

pacman/model/constraints/placer_constraints/__init__.py

@@ -14,13 +14,6 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from .abstract_placer_constraint import AbstractPlacerConstraint
-from .board_constraint import BoardConstraint
 from .chip_and_core_constraint import ChipAndCoreConstraint
-from .radial_placement_from_chip_constraint import (
-    RadialPlacementFromChipConstraint)
-from .same_chip_as_constraint import SameChipAsConstraint
 
-__all__ = ["AbstractPlacerConstraint", "BoardConstraint",
-           "ChipAndCoreConstraint",
-           "RadialPlacementFromChipConstraint",
-           "SameChipAsConstraint"]
+__all__ = ["AbstractPlacerConstraint", "ChipAndCoreConstraint"]