comaniac commented on a change in pull request #4899: [Relay][Frontend][Keras]
NHWC import support.
URL: https://github.com/apache/incubator-tvm/pull/4899#discussion_r380299492
##########
File path: python/tvm/relay/frontend/keras.py
##########
@@ -234,18 +234,29 @@ def _convert_dense(inexpr, keras_layer, etab):
def _convert_convolution(inexpr, keras_layer, etab):
_check_data_format(keras_layer)
+ if etab.data_layout == 'NHWC':
+ kernel_layout = 'HWIO'
+ else:
+ kernel_layout = 'OIHW'
is_deconv = type(keras_layer).__name__ == 'Conv2DTranspose'
is_depthconv = type(keras_layer).__name__ == 'DepthwiseConv2D'
weightList = keras_layer.get_weights()
+ weight = weightList[0]
if is_deconv:
- kernel_h, kernel_w, n_filters, in_channels = weightList[0].shape
- weight = weightList[0].transpose([3, 2, 0, 1])
+ kernel_h, kernel_w, n_filters, in_channels = weight.shape
+ if kernel_layout == 'OIHW':
+ weight = weight.transpose([3, 2, 0, 1])
elif is_depthconv:
- kernel_h, kernel_w, in_channels, depth_mult = weightList[0].shape
- weight = weightList[0].transpose([2, 3, 0, 1])
+ kernel_h, kernel_w, in_channels, depth_mult = weight.shape
+ if kernel_layout == 'OIHW':
+ weight = weight.transpose([2, 3, 0, 1])
+ else:
+ kernel_layout = "HWOI"
Review comment:
This looks confusion at the first glance. It might be better to put all
`kernel_layout` determination related logic together.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
