Merge branch 'main' into hops

Author: gilbertmike

accelforge/mapper/FFM/_join_pmappings/join_pmappings.py

@@ -149,6 +149,7 @@ def prune_with_tolerance(
     objective_tolerance: float,
     resource_usage_tolerance: float,
     print_progress: bool = True,
+    is_last: bool = False,
 ):
     if objective_tolerance == 0 and resource_usage_tolerance == 0:
         return pmappings
@@ -175,6 +176,9 @@ def prune(einsum_name: EinsumName, pg: PmappingGroup):
         result[einsum_name].append(pg)
 
     new_n = sum(len(pg.mappings) for p in result.values() for pg in p)
+    if new_n == prev_n and not is_last:
+        return None
+
     if print_progress:
         print(f"Dirty joining uses {new_n / prev_n * 100:.2f}% of the pmappings")
 
@@ -215,7 +219,11 @@ def join_strategy_2(
                 objective_tolerance=threshold,
                 resource_usage_tolerance=resource_usage_tolerance,
                 print_progress=print_progress,
+                is_last=i == len(thresholds) - 1,
             )
+            if cur_compressed is None:
+                continue
+
             joined = join_pmappings(
                 cur_compressed,
                 spec,
@@ -940,13 +948,13 @@ def no_match_lookahead_error(
         #     f"\tCombining {sum(len(s) for s in left.values())}({len(left)}) x {sum(len(s) for s in right.values())}({len(right)}) -> {len(combined)}"
         # )
 
-        # nmappings = sum(len(s.mappings.data) for s in combined)
-        # for_einsum_text = f"for Einsum {right_einsum}"
-        # logger.info(f"\tNumber of groups {for_einsum_text}: {len(combined)}")
-        # # for c in combined:
-        # #     print(f"\t\t{c.compatibility}")
-        # logger.info(f"\tNumber of mappings {for_einsum_text}: {nmappings}")
-        # logger.info(
+        nmappings = sum(len(s.mappings.data) for s in combined)
+        for_einsum_text = f"for Einsum {right_einsum}"
+        # print(f"\tNumber of groups {for_einsum_text}: {len(combined)}")
+        # for c in combined:
+        #     print(f"\t\t{c.compatibility}")
+        # print(f"\tNumber of mappings {for_einsum_text}: {nmappings}")
+        # print(
         #     f"\tMappings per group {for_einsum_text}: {nmappings / len(combined)}"
         # )
         # logger.info(