From 43f8f6424cb942f27599258607ea36c9a852f5ef Mon Sep 17 00:00:00 2001 From: Patrik Gustavsson Date: Fri, 20 Nov 2020 15:08:44 +0100 Subject: Revert "MLMBED-3450: Do not convert batched fully connected to conv" This reverts commit 15a8e803844b286fe9533e1cf703c76a77b090a8. Signed-off-by: Patrik Gustavsson Change-Id: I64169443f473c9ba42551281ad6ac4b45856f420 --- ethosu/vela/test/test_graph_optimiser.py | 61 -------------------------------- 1 file changed, 61 deletions(-) delete mode 100644 ethosu/vela/test/test_graph_optimiser.py (limited to 'ethosu/vela/test/test_graph_optimiser.py') diff --git a/ethosu/vela/test/test_graph_optimiser.py b/ethosu/vela/test/test_graph_optimiser.py deleted file mode 100644 index 62a1b763..00000000 --- a/ethosu/vela/test/test_graph_optimiser.py +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright (C) 2020 Arm Limited or its affiliates. All rights reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# -# Licensed under the Apache License, Version 2.0 (the License); you may -# not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an AS IS BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# Description: -# Unit tests for graph_optimiser -import numpy as np - -from ethosu.vela.graph_optimiser import convert_batched_fc_shape -from ethosu.vela.operation import Op -from ethosu.vela.tensor import create_const_tensor -from ethosu.vela.tensor import Tensor -from ethosu.vela.test import testutil - - -def test_convert_batched_fc(): - """Tests shape conversion of batched fully connected""" - shape = [4, 8] - ifm = create_const_tensor("test_in", shape, np.uint8, np.zeros(shape)) - weights = create_const_tensor("weight_in", shape, np.uint8, np.zeros(shape)) - ofm = Tensor(ifm.shape, np.uint8, "test_out") - op = testutil.create_op(Op.FullyConnected, [ifm, weights], ofm) - ifm.consumer_list.append(op) - - prev_op = op.clone() - conv_op = convert_batched_fc_shape(op, None, None) - - assert conv_op.ifm != prev_op.ifm - assert conv_op.ofm != prev_op.ofm - assert conv_op.type == Op.FullyConnected - assert len(conv_op.ifm.shape) == 4 - assert conv_op.ifm.shape == conv_op.ofm.shape - assert conv_op.ifm.ops[0].type == Op.Reshape - - shape = [1, 8] - ifm.shape = shape - weights.shape = shape - ofm.shape = shape - op = testutil.create_op(Op.FullyConnected, [ifm, weights], ofm) - ifm.consumer_list.append(op) - - prev_op = op.clone() - conv_op = convert_batched_fc_shape(op, None, None) - - assert conv_op.ifm == prev_op.ifm - assert conv_op.ofm == prev_op.ofm - assert conv_op.type == Op.FullyConnected - assert len(conv_op.ifm.shape) == 2 - assert conv_op.ifm.shape == conv_op.ofm.shape -- cgit v1.2.1