diff options
| author | Diqing Zhong <diqing.zhong@arm.com> | 2020-12-09 15:22:40 +0100 |
|---|---|---|
| committer | patrik.gustavsson <patrik.gustavsson@arm.com> | 2020-12-14 06:58:24 +0000 |
| commit | 94457b175b8646bce089c9924e99686587de8992 (patch) | |
| tree | ef83eac89ff7f828c5a517c1ba48b2358ffc8bb1 /ethosu/vela/graph_optimiser.py | |
| parent | 9bfe0f86ea525055954b160a3c678024743030ec (diff) | |
| download | ethos-u-vela-94457b175b8646bce089c9924e99686587de8992.tar.gz | |
Revert "Revert "MLMBED-3450: Do not convert batched fully connected to conv""
- We have combined estimates for conv and fc, add the fix back
Change-Id: I49a29c716189b37b387df4b46efab5f4e6125994
Signed-off-by: Diqing Zhong <diqing.zhong@arm.com>
Diffstat (limited to 'ethosu/vela/graph_optimiser.py')
| -rw-r--r-- | ethosu/vela/graph_optimiser.py | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/ethosu/vela/graph_optimiser.py b/ethosu/vela/graph_optimiser.py index d0d3d7c8..13f08f26 100644 --- a/ethosu/vela/graph_optimiser.py +++ b/ethosu/vela/graph_optimiser.py @@ -317,7 +317,7 @@ def fixup_fully_connected_input(op, arch, nng): return op -def convert_batched_fc_to_conv(op, arch, nng): +def convert_batched_fc_shape(op, arch, nng): if op.type == Op.FullyConnected: ifm = op.inputs[0] ofm = op.outputs[0] @@ -327,20 +327,6 @@ def convert_batched_fc_to_conv(op, arch, nng): batching_split = {4: (2, 2), 8: (2, 4), 16: (4, 4)} h, w = batching_split.get(n, (1, n)) - # Convert to convolution - op.name += "_conv" - op.type = Op.Conv2DBias - op.attrs = { - "dilation": (1, 1, 1, 1), - "dilation_h_factor": 1, - "dilation_w_factor": 1, - "padding": b"SAME", - "stride_h": 1, - "stride_w": 1, - "strides": (1, 1, 1, 1), - "is_converted_fc": True, - } - prev_op = ifm.ops[0] desired_shape = [1, h, w, ifm.shape[-1]] if len(ifm.consumer_list) == 1 and prev_op is not None and prev_op.type == Op.Reshape: @@ -381,7 +367,7 @@ def convert_batched_fc_to_conv(op, arch, nng): else: op.outputs[0].set_all_shapes(desired_shape) else: - # Add rehape op to the output + # Add reshape op to the output op.set_output_tensor(create_reshape_tensor(ofm, desired_shape, False)) return op @@ -1096,7 +1082,7 @@ def optimise_graph_a(nng, arch, verbose_graph=False): convert_conv_to_fc, convert_softmax, fixup_fully_connected_input, - convert_batched_fc_to_conv, + convert_batched_fc_shape, fixup_pack_input, unfuse_activation_function, fixup_conv2d_backprop, |