From 0dd21c79ac6ef588e23393064d25e402e16cc2dd Mon Sep 17 00:00:00 2001 From: Dwight Lidman Date: Tue, 24 Nov 2020 13:45:50 +0100 Subject: MLBEDSW-3558: Put FC on CPU when OFM != 2D This commit adds a constraint to FullyConnected ops in supported_operators.py that puts any such op on the CPU if tensor dimensions of the output(s) are not 2D. Signed-off-by: Dwight Lidman Change-Id: I8c898a780b40fc4a1383c09213f0696ea6699b7d --- ethosu/vela/test/test_supported_operators.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'ethosu/vela/test/test_supported_operators.py') diff --git a/ethosu/vela/test/test_supported_operators.py b/ethosu/vela/test/test_supported_operators.py index 72ccad24..f132eef7 100644 --- a/ethosu/vela/test/test_supported_operators.py +++ b/ethosu/vela/test/test_supported_operators.py @@ -122,6 +122,22 @@ def test_constraint_tens_quant_per_axis_is_supp(): assert support.is_operator_supported(op) +def test_constraint_fc_output_2d_not_supp(): + op = testutil.create_op_with_quant_tensors(Op.FullyConnected, [12, 1], [3, 2, 2, 1], weights_shape=[12, 1, 1, 1]) + assert not support.is_operator_supported(op) + op = testutil.create_op_with_quant_tensors(Op.FullyConnected, [12, 1, 1, 1], [1, 3, 4], weights_shape=[12, 1, 1, 1]) + assert not support.is_operator_supported(op) + op = testutil.create_op_with_quant_tensors(Op.FullyConnected, [1, 1, 1, 1], [1], weights_shape=[1, 1, 1, 1]) + assert not support.is_operator_supported(op) + + +def test_constraint_fc_output_2d_is_supp(): + op = testutil.create_op_with_quant_tensors(Op.FullyConnected, [4, 8, 8, 4], [32, 32], weights_shape=[4, 8, 8, 4]) + assert support.is_operator_supported(op) + op = testutil.create_op_with_quant_tensors(Op.FullyConnected, [1, 1024], [16, 64], weights_shape=[1, 1024]) + assert support.is_operator_supported(op) + + def test_constraint_faf(): # Fused activation functions, if set, must be a valid op type op = testutil.create_op_with_quant_tensors(Op.Relu, [1, 8, 8, 8], [1, 8, 8, 8]) -- cgit v1.2.1