Remove duplicate reservatsions. Only propagate backing reservations between splits

Author: tanner-andrulis

accelforge/frontend/mapping/mapping.py

@@ -759,7 +759,7 @@ def _consolidate_reservations(self) -> None:
                 found = False
                 for n in new_nodes[::-1]:
                     if isinstance(n, Reservation) and n.resource == node.resource:
-                        n.purposes.extend(node.purposes)
+                        n.purposes.extend(n2 for n2 in node.purposes if n2 not in n.purposes)
                         found = True
                         break
                     if isinstance(n, Loop):
@@ -797,10 +797,10 @@ def _elevate_tensor_holders_above_splits(self) -> None:
             new_nodes.append(node)
         self.nodes = EvalableList(new_nodes)
 
-    def _propagate_reservations_between_splits(self) -> None:
+    def _propagate_backing_reservations_between_splits(self) -> None:
         for node in self.nodes:
             if isinstance(node, MappingNodeWithChildren):
-                node._propagate_reservations_between_splits()
+                node._propagate_backing_reservations_between_splits()
 
         if not isinstance(self, Split):
             return
@@ -811,6 +811,9 @@ def _propagate_reservations_between_splits(self) -> None:
                 reservations1 = node1.get_nodes_of_type(Reservation)
                 reservations2 = node2.get_nodes_of_type(Reservation)
 
+                reservations1 = [r for r in reservations1 if r._backing]
+                reservations2 = [r for r in reservations2 if r._backing]
+
                 shared_reservations = []
                 for reservation1 in reservations1:
                     for reservation2 in reservations2:
@@ -1700,11 +1703,11 @@ def einsum_names(pmapping: Nested) -> str:
         mapping: Mapping = cls(nodes=pmappings[0].nodes)
         mapping._elevate_persistent_nodes_above_splits()
         mapping._elevate_tensor_holders_above_splits()
-        mapping._propagate_reservations_between_splits()
+        mapping._propagate_backing_reservations_between_splits()
         mapping._consolidate_tensor_holders()
         mapping._consolidate_reservations()
         mapping._move_tensor_holders_above_reservations()
-        mapping._remove_reservations_for_tolls()
+        # mapping._remove_reservations_for_tolls()
         return mapping
 
         # import mermaid as md