Merge branch 'master' of https://github.com/SpiNNakerManchester/PACMAN

SpiNNakerManchester · Apr 2, 2015 · c8cf9c2 · c8cf9c2
2 parents 856172e + 1d3965c
commit c8cf9c2
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 8 deletions.
diff --git a/pacman/model/partitionable_graph/fixed_route_partitionable_edge.py b/pacman/model/partitionable_graph/fixed_route_partitionable_edge.py
@@ -34,7 +34,17 @@ def is_partitionable_edge(self):
         """
         return True
 
-    def create_subedge(self, pre_subvertex, post_subvertex, label=None):
+    def create_subedge(self, pre_subvertex, post_subvertex, label=None,
+                       constraints=None):
+        """
+        method to create a fixed route partitioned edge from a fixed route
+         partitionable edge
+        :param pre_subvertex: the soruce subvertex
+        :param post_subvertex: the destination partitioned subvertex
+        :param label: the label associated with the partitioned edge
+        :param constraints: any contraints needed for the partitioned edge
+        :return: the FixedRoutePartitionedEdge
+        """
         if not isinstance(pre_subvertex, PartitionedVertex):
             raise exceptions.PacmanInvalidParameterException(
                 "pre_subvertex", str(pre_subvertex),
@@ -47,4 +57,5 @@ def create_subedge(self, pre_subvertex, post_subvertex, label=None):
         if label is None and self.label is not None:
             label = self.label
 
-        return FixedRoutePartitionedEdge(pre_subvertex, post_subvertex, label)
+        return FixedRoutePartitionedEdge(pre_subvertex, post_subvertex, label,
+                                         constraints)
diff --git a/pacman/model/partitioned_graph/fixed_route_partitioned_edge.py b/pacman/model/partitioned_graph/fixed_route_partitioned_edge.py
@@ -7,7 +7,8 @@ class FixedRoutePartitionedEdge(AbstractPartitionedEdge):
         vertices on either side of the edge
     """
 
-    def __init__(self, pre_subvertex, post_subvertex, label=None):
+    def __init__(self, pre_subvertex, post_subvertex, label=None,
+                 constraints=None):
         """
 
         :param pre_subvertex: the subvertex at the start of the subedge
@@ -18,10 +19,13 @@ def __init__(self, pre_subvertex, post_subvertex, label=None):
                     :py:class:`pacman.model.partitioned_graph.partitioned_vertex.PartitionedVertex`
         :param label: The name of the edge
         :type label: str
+        :param constraints: constraints for the partituioned edge
+        :type constraints: iterable of
+        pacman.model.constraints.abstract_constraints.abstract_Constraint.AbstractConstraint
         :raise None: Raises no known exceptions
         """
         AbstractPartitionedEdge.__init__(self, pre_subvertex, post_subvertex,
-                                         label)
+                                         constraints, label)
 
     def is_partitioned_edge(self):
         """ helper method for is instance

diff --git a/pacman/model/partitioned_graph/multi_cast_partitioned_edge.py b/pacman/model/partitioned_graph/multi_cast_partitioned_edge.py
@@ -7,7 +7,8 @@ class MultiCastPartitionedEdge(AbstractPartitionedEdge):
         vertices on either side of the edge
     """
 
-    def __init__(self, pre_subvertex, post_subvertex, label=None):
+    def __init__(self, pre_subvertex, post_subvertex, label=None,
+                 constraints=None):
         """
 
         :param pre_subvertex: the subvertex at the start of the subedge
@@ -18,10 +19,13 @@ def __init__(self, pre_subvertex, post_subvertex, label=None):
                     :py:class:`pacman.model.partitioned_graph.subvertex.PartitionedVertex`
         :param label: The name of the edge
         :type label: str
+        :param constraints: constraitns for this edge
+        :type constraints: iterable of :
+        pacman.model.constraints.abstract_constraints.abstract_constraint.AbstractConstraint
         :raise None: Raises no known exceptions
         """
         AbstractPartitionedEdge.__init__(self, pre_subvertex, post_subvertex,
-                                         label)
+                                         constraints, label)
 
     def is_partitioned_edge(self):
         """ helper method for is instance

diff --git a/pacman/model/placements/placement.py b/pacman/model/placements/placement.py
@@ -1,3 +1,8 @@
+"""
+Placement file
+"""
+
+
 class Placement(object):
     """ Represents a placement of a subvertex on a specific processor on a\
         specific chip in the machine

diff --git a/...llocator_algorithms/malloc_based_routing_allocator/malloc_based_routing_info_allocator.py b/...llocator_algorithms/malloc_based_routing_allocator/malloc_based_routing_info_allocator.py
@@ -177,10 +177,11 @@ def _do_allocation(self, index, base_key, n_keys):
         if free_space_slot.start_address > base_key:
             raise PacmanRouteInfoAllocationException(
                 "Trying to allocate a key in the wrong slot!")
-        if n_keys == 0 or ((n_keys % 2) != 0):
+        # TODO check with rowley over this check. as it kills the heat demo
+        """if n_keys == 0 or ((n_keys % 2) != 0):
             raise PacmanRouteInfoAllocationException(
                 "Trying to allocate {} keys, which is not a power of 2"
-                .format(n_keys))
+                .format(n_keys))"""
 
         # Check if there is enough space to allocate
         space = self._check_allocation(index, base_key, n_keys)