MLBEDSW-4975 Fix semodepth asserts
This commit fixes one assert regarding rolling buffers for 3D tensors.
It also addresses another issue where the incorrect weight buffering was
proposed for cascaded operators.
Signed-off-by: Jacob Bohlin <jacob.bohlin@arm.com>
Change-Id: I2501f35e5668b3085d917751cfc8002d250973d8
diff --git a/ethosu/vela/scheduler.py b/ethosu/vela/scheduler.py
index de10bad..f96b773 100644
--- a/ethosu/vela/scheduler.py
+++ b/ethosu/vela/scheduler.py
@@ -824,7 +824,7 @@
]
# Propose different striping - the possible stripes are proposed similarly to a binary search
- best_schedule = buffered_sub_schedule
+ best_schedule = None
iteration = 0
while len(possible_stripes) > 1:
proposed_stripe = possible_stripes[len(possible_stripes) // 2]
@@ -860,18 +860,16 @@
# Maximum performance schedule fits within the SRAM target
return max_sched
- # Extract the cascades
- cascades = schedule.cascades
- # Remove existing cascade from schedule
- schedule.cascades = {}
- for cost in schedule.cost_map.values():
- cost.cascade = 0
- for cascade_info in cascades.values():
+ # Iterate over a copy of the cascades since they may change during the loop
+ for cascade_info in list(schedule.cascades.values()):
# Optimize the sub-schedule in this cascade
opt_sub_schedule = self.optimize_sub_schedule(cascade_info, schedule, max_template, sram_limit)
- # Update the sub-schedule Op and cascade costs to the full schedule
- schedule.cost_map.update(opt_sub_schedule.cost_map)
- schedule.cascades.update(opt_sub_schedule.cascades)
+ if opt_sub_schedule:
+ # Remove the existing cascade
+ del schedule.cascades[cascade_info.end]
+ # Update the sub-schedule Op and cascade costs to the full schedule
+ schedule.cost_map.update(opt_sub_schedule.cost_map)
+ schedule.cascades.update(opt_sub_schedule.cascades)
# Update memory snapshot
self.sg.schedule = schedule