diff options
| author | patrik.gustavsson <patrik.gustavsson@arm.com> | 2020-12-21 16:56:26 +0000 |
|---|---|---|
| committer | patrik.gustavsson <patrik.gustavsson@arm.com> | 2020-12-21 16:56:26 +0000 |
| commit | df0a5905177f3a1b836076bc3f9f39b2e86f1794 (patch) | |
| tree | b5151d0f12428e47d64b1fb2ce4f2f8c19304a0d /ethosu/vela/pass_packing.py | |
| parent | bf31d647dc5df47410ee577b12427ddf076d816b (diff) | |
| download | ethos-u-vela-df0a5905177f3a1b836076bc3f9f39b2e86f1794.tar.gz | |
Revert "MLBEDSW-3645 4D class for op ifm/ofm shapes"
This reverts commit bf31d647dc5df47410ee577b12427ddf076d816b.
Reason for revert: <INSERT REASONING HERE>
Change-Id: I7b6c585b7658f94dbaa916c2b6bfe9fb463b8d37
Diffstat (limited to 'ethosu/vela/pass_packing.py')
| -rw-r--r-- | ethosu/vela/pass_packing.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/ethosu/vela/pass_packing.py b/ethosu/vela/pass_packing.py index 8f6660c2..095a78d4 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, op.ofm_shapes[0].clone()) + build_pass((op,), ofm_tensor) - def build_pass(start_ops_to_process, ofm_tensor=None, ofm_shapes=None): + def build_pass(start_ops_to_process, ofm_tensor=None): reverse_ops_list = [] curr_flags = PassFlags.Empty npu_block_type = NpuBlockType.Default @@ -416,7 +416,8 @@ def pack_into_passes(nng, arch, verbose_packing=False): ps.ifm_shapes.append(ps.primary_op.ifm_shapes[0]) ps.ofm_tensor = ofm_tensor - ps.ofm_shapes.append(ofm_shapes) + if ps.primary_op is not None: + ps.ofm_shapes.append(ps.primary_op.ofm_shapes[0]) assert ps.placement != PassPlacement.Npu or ps.ofm_tensor is not None ps.weight_tensor = ps.get_primary_op_ifm_weights()[1] @@ -452,11 +453,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.set_ifm_ofm_shapes() + avgpool_op.ifm_shapes = op.ifm_shapes + avgpool_op.ofm_shapes = op.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 |