From e8a5a78dd16ec979c7a7bb1f5bd87e9b2909c32d Mon Sep 17 00:00:00 2001 From: Louis Verhaard Date: Mon, 2 Nov 2020 18:04:27 +0100 Subject: MLBEDSW-839: Code generation using external API Added external API to generate register command streams. Existing code generation has been refactored to make use of this API. Change-Id: Ibb4c2b167809869f16470b14da24f08a65c82b7b Signed-off-by: Louis Verhaard --- ethosu/vela/graph_optimiser.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'ethosu/vela/graph_optimiser.py') diff --git a/ethosu/vela/graph_optimiser.py b/ethosu/vela/graph_optimiser.py index 899da074..fb5235dc 100644 --- a/ethosu/vela/graph_optimiser.py +++ b/ethosu/vela/graph_optimiser.py @@ -31,6 +31,7 @@ from .ethos_u55_regs.ethos_u55_regs import resampling_mode from .numeric_util import clamp_sigmoid from .numeric_util import full_shape from .numeric_util import round_away_zero +from .operation import create_activation_function from .operation import create_avgpool_nop from .operation import NpuBlockType from .operation import Op @@ -413,7 +414,7 @@ def fixup_pack_input(op, arch, nng): def unfuse_activation_function(op, arch, nng): if op.type == Op.ConcatTFLite and op.run_on_npu and op.activation is not None: - act_op = Operation(op.activation, op.name + op.activation.name) + act_op = Operation(op.activation.op_type, op.name + op.activation.op_type.name) op.activation = None out_tens = op.outputs[0] intermediate_tens = out_tens.clone("_act_intermediate") @@ -641,7 +642,7 @@ def fixup_relus_with_differing_ifm_ofm_scaling(op, arch, nng): # Override this op with its own primary op (avgpool) relu_fused_op = create_avgpool_nop(op.name + "_avgpool") # And fuse the original activation function to it - relu_fused_op.activation = op.type + relu_fused_op.activation = create_activation_function(op.type) # Tidy up and assign the ifm and ofm to the new op ifm.consumer_list.remove(op) -- cgit v1.2.1