From 28db6e7d2c3d08cdf31d6a54f0a16393add4164b Mon Sep 17 00:00:00 2001 From: Luke Hutton Date: Tue, 21 Dec 2021 21:44:13 +0000 Subject: [PATCH 1/2] [microNPU] Remove remaining UnsupportedLayout checks In #9508 the decision was made to remove the UnsupportedLayout exception and the checks that throw it, this PR is cleaning up some that remained. Change-Id: I83bfe233381b83af886343c9569db753e33f9059 --- python/tvm/relay/backend/contrib/ethosu/legalize.py | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/python/tvm/relay/backend/contrib/ethosu/legalize.py b/python/tvm/relay/backend/contrib/ethosu/legalize.py index ede9cd46371e..776e750afee3 100644 --- a/python/tvm/relay/backend/contrib/ethosu/legalize.py +++ b/python/tvm/relay/backend/contrib/ethosu/legalize.py @@ -290,8 +290,6 @@ def callback( "OHWI": params.weights.shape[1:3], "HWOI": params.weights.shape[0:2], } - if str(params.weights.layout) not in kernel_size_map.keys(): - raise UnsupportedLayout(str(params.weights.layout)) activation_map = {"clip": "CLIP"} weight_to_ohwi_transform_map = {"HWIO": [3, 0, 1, 2]} weights_values = params.weights.values @@ -375,13 +373,9 @@ def callback( channels_map = { "NHWC": 3, } - if str(params.ofm.layout) not in channels_map.keys(): - raise UnsupportedLayout(str(params.ofm.layout)) kernel_shape_map = { "HWOI": params.weights.shape[0:2], } - if str(params.weights.layout) not in kernel_shape_map.keys(): - raise UnsupportedLayout(str(params.weights.layout)) weights_values = params.weights.values weights_values_ohwi = np.moveaxis(weights_values, [0, 1, 2, 3], [1, 2, 0, 3]) @@ -470,8 +464,6 @@ def callback( channels_map = { "NHWC": 3, } - if str(params.ofm.layout) not in channels_map.keys(): - raise UnsupportedLayout(str(params.ofm.layout)) activation_map = {"clip": "CLIP"} if params.activation: @@ -635,8 +627,6 @@ def callback( channels_map = { "NHWC": 3, } - if str(params.ofm.layout) not in channels_map.keys(): - raise UnsupportedLayout(str(params.ofm.layout)) activation_map = {"clip": "CLIP"} if params.activation: @@ -963,9 +953,6 @@ def callback( params = self.params_class(post.op.body) params.ifm.tensor = post.args[0] - if str(params.ofm.layout) != "NHWC": - raise UnsupportedLayout(str(params.ofm.layout)) - activation_map = {"clip": "CLIP"} if params.activation: activation = activation_map[params.activation.op.name] From 62a05052da013ad13ff7d1c8dfba38c4efe76106 Mon Sep 17 00:00:00 2001 From: Luke Hutton Date: Wed, 22 Dec 2021 09:52:05 +0000 Subject: [PATCH 2/2] fix lint Change-Id: I67c1a5371f0b2e51b6cd39435ef4073d8d17af51 --- python/tvm/relay/backend/contrib/ethosu/legalize.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/python/tvm/relay/backend/contrib/ethosu/legalize.py b/python/tvm/relay/backend/contrib/ethosu/legalize.py index 776e750afee3..cbd84aa3d350 100644 --- a/python/tvm/relay/backend/contrib/ethosu/legalize.py +++ b/python/tvm/relay/backend/contrib/ethosu/legalize.py @@ -624,9 +624,6 @@ def callback( params = self.params_class(post.op.body) params.ifm.tensor = post.args[1] if params.reversed_operands else post.args[0] params.ifm2.tensor = post.args[0] if params.reversed_operands else post.args[1] - channels_map = { - "NHWC": 3, - } activation_map = {"clip": "CLIP"} if params.activation: