[FFM] Bugfix for incorrect reservations coming out of model

Author: gilbertmike

accelforge/mapper/FFM/_make_pmappings/make_pmappings_from_templates/make_pmappings_from_templates.py

@@ -69,7 +69,6 @@ def shift_reservations_by_null_loop_indices(
     if len(mappings.columns) != len(mappings.columns.unique()):
         shift_reservations_by_null_loop_indices(prev, null_loop_indices)
         raise ValueError(f"Duplicate columns: {mappings.columns}")
-    assert len(mappings.columns) == len(mappings.columns.unique())
     return mappings
 
 

accelforge/mapper/FFM/_make_pmappings/make_pmappings_from_templates/run_model.py

@@ -123,7 +123,7 @@ def run_model(
         if memory not in job.memories_track_all:
             continue
         running_total = 0
-        for n_loop in n_loop_options:
+        for n_loop in sorted(n_loop_options):
             if n_loop in occupancies:
                 running_total += occupancies[n_loop]
                 df[nameloop2col(memory, n_loop)] = (