diff options
| author | Patrik Gustavsson <patrik.gustavsson@arm.com> | 2020-12-16 13:08:06 +0100 |
|---|---|---|
| committer | Patrik Gustavsson <patrik.gustavsson@arm.com> | 2020-12-21 07:34:05 +0100 |
| commit | bf31d647dc5df47410ee577b12427ddf076d816b (patch) | |
| tree | 85ddd620916565aa8565d072b764ca4918b405a1 /ethosu/vela/pass_packing.py | |
| parent | 2349d429d926e258e9a61d34c7fd97660ab9fb98 (diff) | |
| download | ethos-u-vela-bf31d647dc5df47410ee577b12427ddf076d816b.tar.gz | |
MLBEDSW-3645 4D class for op ifm/ofm shapes
Add 4D shape class for op Ifm/ofm shapes
Signed-off-by: Patrik Gustavsson <patrik.gustavsson@arm.com>
Change-Id: Ic0a98da9d2f9d085605e39a9ab5a26bad6e702a3
Diffstat (limited to 'ethosu/vela/pass_packing.py')
| -rw-r--r-- | ethosu/vela/pass_packing.py | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/ethosu/vela/pass_packing.py b/ethosu/vela/pass_packing.py index 095a78d4..8f6660c2 100644 --- a/ethosu/vela/pass_packing.py +++ b/ethosu/vela/pass_packing.py @@ -231,9 +231,9 @@ def pack_into_passes(nng, arch, verbose_packing=False): ofm_tensor = op.ofm if ofm_tensor is None: ofm_tensor = op.outputs[0] - build_pass((op,), ofm_tensor) + build_pass((op,), ofm_tensor, op.ofm_shapes[0].clone()) - def build_pass(start_ops_to_process, ofm_tensor=None): + def build_pass(start_ops_to_process, ofm_tensor=None, ofm_shapes=None): reverse_ops_list = [] curr_flags = PassFlags.Empty npu_block_type = NpuBlockType.Default @@ -416,8 +416,7 @@ def pack_into_passes(nng, arch, verbose_packing=False): ps.ifm_shapes.append(ps.primary_op.ifm_shapes[0]) ps.ofm_tensor = ofm_tensor - if ps.primary_op is not None: - ps.ofm_shapes.append(ps.primary_op.ofm_shapes[0]) + ps.ofm_shapes.append(ofm_shapes) assert ps.placement != PassPlacement.Npu or ps.ofm_tensor is not None ps.weight_tensor = ps.get_primary_op_ifm_weights()[1] @@ -453,11 +452,11 @@ def pack_into_passes(nng, arch, verbose_packing=False): avgpool_out = inp.clone("_avgpooled") avgpool_out.consumer_list.append(op) avgpool_op.set_output_tensor(avgpool_out) - avgpool_op.ifm_shapes = op.ifm_shapes - avgpool_op.ofm_shapes = op.ofm_shapes + avgpool_op.set_ifm_ofm_shapes() op.inputs[0] = avgpool_out op_list.insert(0, avgpool_op) + op.set_ifm_ofm_shapes() DebugDatabase.add_optimised(op, avgpool_op) return avgpool_op |